Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gdm: gdm-3.12.2-r1.ebuild ChangeLog gdm-3.10.0.1-r1.ebuild
Date: Mon, 29 Sep 2014 11:52:49
Message-Id: 20140929115245.D910251C@oystercatcher.gentoo.org
1 pacho 14/09/29 11:52:45
2
3 Modified: ChangeLog
4 Added: gdm-3.12.2-r1.ebuild
5 Removed: gdm-3.10.0.1-r1.ebuild
6 Log:
7 Don't block SIGUSR1 (#524008 by Serge Gavrilov), drop old
8
9 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
10
11 Revision Changes Path
12 1.409 gnome-base/gdm/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.409&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.409&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.408&r2=1.409
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
21 retrieving revision 1.408
22 retrieving revision 1.409
23 diff -u -r1.408 -r1.409
24 --- ChangeLog 28 Jul 2014 16:25:33 -0000 1.408
25 +++ ChangeLog 29 Sep 2014 11:52:45 -0000 1.409
26 @@ -1,6 +1,15 @@
27 # ChangeLog for gnome-base/gdm
28 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.408 2014/07/28 16:25:33 pacho Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.409 2014/09/29 11:52:45 pacho Exp $
31 +
32 +*gdm-3.12.2-r1 (29 Sep 2014)
33 +
34 + 29 Sep 2014; Pacho Ramos <pacho@g.o>
35 + +files/gdm-3.12.2-SIGUSR1-blocking-1.patch,
36 + +files/gdm-3.12.2-SIGUSR1-blocking.patch, +gdm-3.12.2-r1.ebuild,
37 + -files/gdm-3.6.0-selinux-automagic.patch, -files/gdm-3.8.4-pam-systemd.patch,
38 + -gdm-3.10.0.1-r1.ebuild:
39 + Don't block SIGUSR1 (#524008 by Serge Gavrilov), drop old
40
41 28 Jul 2014; Pacho Ramos <pacho@g.o> -gdm-3.12.1.ebuild,
42 gdm-3.12.2.ebuild:
43
44
45
46 1.1 gnome-base/gdm/gdm-3.12.2-r1.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.12.2-r1.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.12.2-r1.ebuild?rev=1.1&content-type=text/plain
50
51 Index: gdm-3.12.2-r1.ebuild
52 ===================================================================
53 # Copyright 1999-2014 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.12.2-r1.ebuild,v 1.1 2014/09/29 11:52:45 pacho Exp $
56
57 EAPI="5"
58 GCONF_DEBUG="yes"
59 GNOME2_LA_PUNT="yes"
60
61 inherit autotools eutils gnome2 pam readme.gentoo systemd user
62
63 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
64 HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
65
66 SRC_URI="${SRC_URI}
67 branding? ( http://www.mail-archive.com/tango-artists@×××××××××××××××××.org/msg00043/tango-gentoo-v1.1.tar.gz )
68 "
69
70 LICENSE="
71 GPL-2+
72 branding? ( CC-Sampling-Plus-1.0 )
73 "
74
75 SLOT="0"
76 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
77 REQUIRED_USE="wayland? ( systemd )"
78 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
79
80 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
81 # nspr used by smartcard extension
82 # dconf, dbus and g-s-d are needed at install time for dconf update
83 # We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
84 COMMON_DEPEND="
85 app-text/iso-codes
86 >=dev-libs/glib-2.36:2
87 >=x11-libs/gtk+-2.91.1:3
88 >=gnome-base/dconf-0.20
89 >=gnome-base/gnome-settings-daemon-3.1.4
90 gnome-base/gsettings-desktop-schemas
91 >=media-libs/fontconfig-2.5.0
92 >=media-libs/libcanberra-0.4[gtk3]
93 sys-apps/dbus
94 >=sys-apps/accountsservice-0.6.12
95
96 x11-apps/sessreg
97 x11-base/xorg-server
98 x11-libs/libXi
99 x11-libs/libXau
100 x11-libs/libX11
101 x11-libs/libXdmcp
102 x11-libs/libXext
103 x11-libs/libXft
104 x11-libs/libXrandr
105 >=x11-misc/xdg-utils-1.0.2-r3
106
107 virtual/pam
108 systemd? ( >=sys-apps/systemd-186:0=[pam] )
109 !systemd? (
110 >=x11-base/xorg-server-1.14.3-r1
111 >=sys-auth/consolekit-0.4.5_p20120320-r2
112 !<sys-apps/openrc-0.12
113 )
114 sys-auth/pambase[systemd?]
115
116 audit? ( sys-process/audit )
117 introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
118 plymouth? ( sys-boot/plymouth )
119 selinux? ( sys-libs/libselinux )
120 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
121 xinerama? ( x11-libs/libXinerama )
122 "
123 # XXX: These deps are from session and desktop files in data/ directory
124 # fprintd is used via dbus by gdm-fingerprint-extension
125 # gnome-session-3.6 needed to avoid freezing with orca
126 RDEPEND="${COMMON_DEPEND}
127 >=gnome-base/gnome-session-3.6
128 >=gnome-base/gnome-shell-3.1.90
129 gnome-extra/polkit-gnome:0
130 x11-apps/xhost
131 x11-themes/gnome-icon-theme-symbolic
132
133 accessibility? (
134 >=app-accessibility/orca-3.10
135 app-accessibility/caribou
136 gnome-extra/mousetweaks )
137 fprint? (
138 sys-auth/fprintd
139 sys-auth/pam_fprint )
140
141 !gnome-extra/fast-user-switch-applet
142 "
143 DEPEND="${COMMON_DEPEND}
144 app-text/docbook-xml-dtd:4.1.2
145 >=dev-util/intltool-0.40.0
146 virtual/pkgconfig
147 x11-proto/inputproto
148 x11-proto/randrproto
149 test? ( >=dev-libs/check-0.9.4 )
150 xinerama? ( x11-proto/xineramaproto )
151 "
152
153 DOC_CONTENTS="
154 To make GDM start at boot, run:\n
155 # systemctl enable gdm.service\n
156 \n
157 For passwordless login to unlock your keyring, you need to install
158 sys-auth/pambase with USE=gnome-keyring and set an empty password
159 on your keyring. Use app-crypt/seahorse for that.\n
160 \n
161 You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
162 for smartcard support
163 "
164
165 pkg_setup() {
166 enewgroup gdm
167 enewgroup video # Just in case it hasn't been created yet
168 enewuser gdm -1 -1 /var/lib/gdm gdm,video
169
170 # For compatibility with certain versions of nvidia-drivers, etc., need to
171 # ensure that gdm user is in the video group
172 if ! egetent group video | grep -q gdm; then
173 # FIXME XXX: is this at all portable, ldap-safe, etc.?
174 # XXX: egetent does not have a 1-argument form, so we can't use it to
175 # get the list of gdm's groups
176 local g=$(groups gdm)
177 elog "Adding user gdm to video group"
178 usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
179 fi
180 }
181
182 src_prepare() {
183 # make custom session work, bug #216984, upstream bug #737578
184 epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
185
186 # ssh-agent handling must be done at xinitrc.d, bug #220603
187 epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
188
189 # Gentoo does not have a fingerprint-auth pam stack
190 epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
191
192 # Show logo when branding is enabled
193 use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
194
195 # Don't block SIGUSR1, bug #524008 (from 'master')
196 epatch "${FILESDIR}"/${PN}-3.12.2-SIGUSR1-blocking{,-1}.patch
197
198 eautoreconf
199
200 gnome2_src_prepare
201 }
202
203 src_configure() {
204 local myconf
205 # PAM is the only auth scheme supported
206 # even though configure lists shadow and crypt
207 # they don't have any corresponding code.
208 # --with-at-spi-registryd-directory= needs to be passed explicitly because
209 # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
210 # Xevie is obsolete, bug #482304
211 # --with-initial-vt=7 conflicts with plymouth, bug #453392
212 ! use plymouth && myconf="${myconf} --with-initial-vt=7"
213
214 gnome2_src_configure \
215 --with-run-dir=/run/gdm \
216 --localstatedir="${EPREFIX}"/var \
217 --disable-static \
218 --with-xdmcp=yes \
219 --enable-authentication-scheme=pam \
220 --with-default-pam-config=exherbo \
221 --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
222 --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
223 --without-xevie \
224 $(use_with audit libaudit) \
225 $(use_enable ipv6) \
226 $(use_with plymouth) \
227 $(use_with selinux) \
228 $(use_with systemd) \
229 $(use_with !systemd console-kit) \
230 $(use_enable systemd systemd-journal) \
231 $(systemd_with_unitdir) \
232 $(use_with tcpd tcp-wrappers) \
233 $(use_enable wayland wayland-support) \
234 $(use_with xinerama) \
235 ITSTOOL=$(type -P true) \
236 ${myconf}
237 }
238
239 src_install() {
240 gnome2_src_install
241
242 if ! use accessibility ; then
243 rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
244 fi
245
246 insinto /etc/X11/xinit/xinitrc.d
247 newins "${FILESDIR}/49-keychain-r1" 49-keychain
248 newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
249
250 # gdm user's home directory
251 keepdir /var/lib/gdm
252 fowners gdm:gdm /var/lib/gdm
253
254 # install XDG_DATA_DIRS gdm changes
255 echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
256 doenvd 99xdg-gdm
257
258 use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
259
260 readme.gentoo_create_doc
261 }
262
263 pkg_postinst() {
264 local d ret
265
266 gnome2_pkg_postinst
267
268 # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
269 ret=0
270 ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
271 chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
272 for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
273 [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
274 done
275 eend ${ret}
276
277 readme.gentoo_print_elog
278 }