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.14.1-r1.ebuild gdm-3.12.2-r2.ebuild ChangeLog gdm-3.12.2-r1.ebuild gdm-3.14.1.ebuild
Date: Fri, 02 Jan 2015 11:24:40
Message-Id: 20150102112436.A554FEB5A@oystercatcher.gentoo.org
1 pacho 15/01/02 11:24:36
2
3 Modified: ChangeLog
4 Added: gdm-3.14.1-r1.ebuild gdm-3.12.2-r2.ebuild
5 Removed: gdm-3.12.2-r1.ebuild gdm-3.14.1.ebuild
6 Log:
7 xinitrc.d file needs to be executable (#520550#c6 by Joakim Tjernlund)
8
9 (Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)
10
11 Revision Changes Path
12 1.415 gnome-base/gdm/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.415&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.415&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.414&r2=1.415
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
21 retrieving revision 1.414
22 retrieving revision 1.415
23 diff -u -r1.414 -r1.415
24 --- ChangeLog 22 Dec 2014 21:17:35 -0000 1.414
25 +++ ChangeLog 2 Jan 2015 11:24:36 -0000 1.415
26 @@ -1,6 +1,13 @@
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.414 2014/12/22 21:17:35 eva Exp $
30 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
31 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.415 2015/01/02 11:24:36 pacho Exp $
32 +
33 +*gdm-3.12.2-r2 (02 Jan 2015)
34 +*gdm-3.14.1-r1 (02 Jan 2015)
35 +
36 + 02 Jan 2015; Pacho Ramos <pacho@g.o> +gdm-3.12.2-r2.ebuild,
37 + +gdm-3.14.1-r1.ebuild, -gdm-3.12.2-r1.ebuild, -gdm-3.14.1.ebuild:
38 + xinitrc.d file needs to be executable (#520550#c6 by Joakim Tjernlund)
39
40 *gdm-3.14.1 (22 Dec 2014)
41
42
43
44
45 1.1 gnome-base/gdm/gdm-3.14.1-r1.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.14.1-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.14.1-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: gdm-3.14.1-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2015 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.14.1-r1.ebuild,v 1.1 2015/01/02 11:24:36 pacho Exp $
55
56 EAPI="5"
57 GCONF_DEBUG="yes"
58 GNOME2_LA_PUNT="yes"
59
60 inherit autotools eutils gnome2 pam readme.gentoo systemd user
61
62 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
63 HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
64
65 SRC_URI="${SRC_URI}
66 branding? ( http://www.mail-archive.com/tango-artists@×××××××××××××××××.org/msg00043/tango-gentoo-v1.1.tar.gz )
67 "
68
69 LICENSE="
70 GPL-2+
71 branding? ( CC-Sampling-Plus-1.0 )
72 "
73
74 SLOT="0"
75 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
76 REQUIRED_USE="wayland? ( systemd )"
77 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
78
79 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
80 # nspr used by smartcard extension
81 # dconf, dbus and g-s-d are needed at install time for dconf update
82 # We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
83 COMMON_DEPEND="
84 app-text/iso-codes
85 >=dev-libs/glib-2.36:2
86 >=x11-libs/gtk+-2.91.1:3
87 >=gnome-base/dconf-0.20
88 >=gnome-base/gnome-settings-daemon-3.1.4
89 gnome-base/gsettings-desktop-schemas
90 >=media-libs/fontconfig-2.5.0
91 >=media-libs/libcanberra-0.4[gtk3]
92 sys-apps/dbus
93 >=sys-apps/accountsservice-0.6.12
94
95 x11-apps/sessreg
96 x11-base/xorg-server
97 x11-libs/libXi
98 x11-libs/libXau
99 x11-libs/libX11
100 x11-libs/libXdmcp
101 x11-libs/libXext
102 x11-libs/libXft
103 x11-libs/libXrandr
104 >=x11-misc/xdg-utils-1.0.2-r3
105
106 virtual/pam
107 systemd? ( >=sys-apps/systemd-186:0=[pam] )
108 !systemd? (
109 >=x11-base/xorg-server-1.14.3-r1
110 >=sys-auth/consolekit-0.4.5_p20120320-r2
111 !<sys-apps/openrc-0.12
112 )
113 sys-auth/pambase[systemd?]
114
115 audit? ( sys-process/audit )
116 introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
117 plymouth? ( sys-boot/plymouth )
118 selinux? ( sys-libs/libselinux )
119 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
120 xinerama? ( x11-libs/libXinerama )
121 "
122 # XXX: These deps are from session and desktop files in data/ directory
123 # fprintd is used via dbus by gdm-fingerprint-extension
124 # gnome-session-3.6 needed to avoid freezing with orca
125 RDEPEND="${COMMON_DEPEND}
126 >=gnome-base/gnome-session-3.6
127 >=gnome-base/gnome-shell-3.1.90
128 gnome-extra/polkit-gnome:0
129 x11-apps/xhost
130 x11-themes/gnome-icon-theme-symbolic
131
132 accessibility? (
133 >=app-accessibility/orca-3.10
134 app-accessibility/caribou
135 gnome-extra/mousetweaks )
136 fprint? (
137 sys-auth/fprintd
138 sys-auth/pam_fprint )
139
140 !gnome-extra/fast-user-switch-applet
141 "
142 DEPEND="${COMMON_DEPEND}
143 app-text/docbook-xml-dtd:4.1.2
144 dev-util/gdbus-codegen
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 eautoreconf
196
197 gnome2_src_prepare
198 }
199
200 src_configure() {
201 local myconf
202 # PAM is the only auth scheme supported
203 # even though configure lists shadow and crypt
204 # they don't have any corresponding code.
205 # --with-at-spi-registryd-directory= needs to be passed explicitly because
206 # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
207 # Xevie is obsolete, bug #482304
208 # --with-initial-vt=7 conflicts with plymouth, bug #453392
209 ! use plymouth && myconf="${myconf} --with-initial-vt=7"
210
211 gnome2_src_configure \
212 --with-run-dir=/run/gdm \
213 --localstatedir="${EPREFIX}"/var \
214 --disable-static \
215 --with-xdmcp=yes \
216 --enable-authentication-scheme=pam \
217 --with-default-pam-config=exherbo \
218 --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
219 --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
220 --without-xevie \
221 $(use_with audit libaudit) \
222 $(use_enable ipv6) \
223 $(use_with plymouth) \
224 $(use_with selinux) \
225 $(use_with systemd) \
226 $(use_with !systemd console-kit) \
227 $(use_enable systemd systemd-journal) \
228 $(systemd_with_unitdir) \
229 $(use_with tcpd tcp-wrappers) \
230 $(use_enable wayland wayland-support) \
231 $(use_with xinerama) \
232 ITSTOOL=$(type -P true) \
233 ${myconf}
234 }
235
236 src_install() {
237 gnome2_src_install
238
239 if ! use accessibility ; then
240 rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
241 fi
242
243 exeinto /etc/X11/xinit/xinitrc.d
244 newexe "${FILESDIR}/49-keychain-r1" 49-keychain
245 newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
246
247 # gdm user's home directory
248 keepdir /var/lib/gdm
249 fowners gdm:gdm /var/lib/gdm
250
251 # install XDG_DATA_DIRS gdm changes
252 echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
253 doenvd 99xdg-gdm
254
255 use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
256
257 readme.gentoo_create_doc
258 }
259
260 pkg_postinst() {
261 local d ret
262
263 gnome2_pkg_postinst
264
265 # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
266 ret=0
267 ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
268 chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
269 for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
270 [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
271 done
272 eend ${ret}
273
274 readme.gentoo_print_elog
275 }
276
277
278
279 1.1 gnome-base/gdm/gdm-3.12.2-r2.ebuild
280
281 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.12.2-r2.ebuild?rev=1.1&view=markup
282 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.12.2-r2.ebuild?rev=1.1&content-type=text/plain
283
284 Index: gdm-3.12.2-r2.ebuild
285 ===================================================================
286 # Copyright 1999-2015 Gentoo Foundation
287 # Distributed under the terms of the GNU General Public License v2
288 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.12.2-r2.ebuild,v 1.1 2015/01/02 11:24:36 pacho Exp $
289
290 EAPI="5"
291 GCONF_DEBUG="yes"
292 GNOME2_LA_PUNT="yes"
293
294 inherit autotools eutils gnome2 pam readme.gentoo systemd user
295
296 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
297 HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
298
299 SRC_URI="${SRC_URI}
300 branding? ( http://www.mail-archive.com/tango-artists@×××××××××××××××××.org/msg00043/tango-gentoo-v1.1.tar.gz )
301 "
302
303 LICENSE="
304 GPL-2+
305 branding? ( CC-Sampling-Plus-1.0 )
306 "
307
308 SLOT="0"
309 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
310 REQUIRED_USE="wayland? ( systemd )"
311 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
312
313 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
314 # nspr used by smartcard extension
315 # dconf, dbus and g-s-d are needed at install time for dconf update
316 # We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
317 COMMON_DEPEND="
318 app-text/iso-codes
319 >=dev-libs/glib-2.36:2
320 >=x11-libs/gtk+-2.91.1:3
321 >=gnome-base/dconf-0.20
322 >=gnome-base/gnome-settings-daemon-3.1.4
323 gnome-base/gsettings-desktop-schemas
324 >=media-libs/fontconfig-2.5.0
325 >=media-libs/libcanberra-0.4[gtk3]
326 sys-apps/dbus
327 >=sys-apps/accountsservice-0.6.12
328
329 x11-apps/sessreg
330 x11-base/xorg-server
331 x11-libs/libXi
332 x11-libs/libXau
333 x11-libs/libX11
334 x11-libs/libXdmcp
335 x11-libs/libXext
336 x11-libs/libXft
337 x11-libs/libXrandr
338 >=x11-misc/xdg-utils-1.0.2-r3
339
340 virtual/pam
341 systemd? ( >=sys-apps/systemd-186:0=[pam] )
342 !systemd? (
343 >=x11-base/xorg-server-1.14.3-r1
344 >=sys-auth/consolekit-0.4.5_p20120320-r2
345 !<sys-apps/openrc-0.12
346 )
347 sys-auth/pambase[systemd?]
348
349 audit? ( sys-process/audit )
350 introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
351 plymouth? ( sys-boot/plymouth )
352 selinux? ( sys-libs/libselinux )
353 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
354 xinerama? ( x11-libs/libXinerama )
355 "
356 # XXX: These deps are from session and desktop files in data/ directory
357 # fprintd is used via dbus by gdm-fingerprint-extension
358 # gnome-session-3.6 needed to avoid freezing with orca
359 RDEPEND="${COMMON_DEPEND}
360 >=gnome-base/gnome-session-3.6
361 >=gnome-base/gnome-shell-3.1.90
362 gnome-extra/polkit-gnome:0
363 x11-apps/xhost
364 x11-themes/gnome-icon-theme-symbolic
365
366 accessibility? (
367 >=app-accessibility/orca-3.10
368 app-accessibility/caribou
369 gnome-extra/mousetweaks )
370 fprint? (
371 sys-auth/fprintd
372 sys-auth/pam_fprint )
373
374 !gnome-extra/fast-user-switch-applet
375 "
376 DEPEND="${COMMON_DEPEND}
377 app-text/docbook-xml-dtd:4.1.2
378 dev-util/gdbus-codegen
379 >=dev-util/intltool-0.40.0
380 virtual/pkgconfig
381 x11-proto/inputproto
382 x11-proto/randrproto
383 test? ( >=dev-libs/check-0.9.4 )
384 xinerama? ( x11-proto/xineramaproto )
385 "
386
387 DOC_CONTENTS="
388 To make GDM start at boot, run:\n
389 # systemctl enable gdm.service\n
390 \n
391 For passwordless login to unlock your keyring, you need to install
392 sys-auth/pambase with USE=gnome-keyring and set an empty password
393 on your keyring. Use app-crypt/seahorse for that.\n
394 \n
395 You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
396 for smartcard support
397 "
398
399 pkg_setup() {
400 enewgroup gdm
401 enewgroup video # Just in case it hasn't been created yet
402 enewuser gdm -1 -1 /var/lib/gdm gdm,video
403
404 # For compatibility with certain versions of nvidia-drivers, etc., need to
405 # ensure that gdm user is in the video group
406 if ! egetent group video | grep -q gdm; then
407 # FIXME XXX: is this at all portable, ldap-safe, etc.?
408 # XXX: egetent does not have a 1-argument form, so we can't use it to
409 # get the list of gdm's groups
410 local g=$(groups gdm)
411 elog "Adding user gdm to video group"
412 usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
413 fi
414 }
415
416 src_prepare() {
417 # make custom session work, bug #216984, upstream bug #737578
418 epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
419
420 # ssh-agent handling must be done at xinitrc.d, bug #220603
421 epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
422
423 # Gentoo does not have a fingerprint-auth pam stack
424 epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
425
426 # Show logo when branding is enabled
427 use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
428
429 # Don't block SIGUSR1, bug #524008 (from 'master')
430 epatch "${FILESDIR}"/${PN}-3.12.2-SIGUSR1-blocking{,-1}.patch
431
432 eautoreconf
433
434 gnome2_src_prepare
435 }
436
437 src_configure() {
438 local myconf
439 # PAM is the only auth scheme supported
440 # even though configure lists shadow and crypt
441 # they don't have any corresponding code.
442 # --with-at-spi-registryd-directory= needs to be passed explicitly because
443 # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
444 # Xevie is obsolete, bug #482304
445 # --with-initial-vt=7 conflicts with plymouth, bug #453392
446 ! use plymouth && myconf="${myconf} --with-initial-vt=7"
447
448 gnome2_src_configure \
449 --with-run-dir=/run/gdm \
450 --localstatedir="${EPREFIX}"/var \
451 --disable-static \
452 --with-xdmcp=yes \
453 --enable-authentication-scheme=pam \
454 --with-default-pam-config=exherbo \
455 --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
456 --with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
457 --without-xevie \
458 $(use_with audit libaudit) \
459 $(use_enable ipv6) \
460 $(use_with plymouth) \
461 $(use_with selinux) \
462 $(use_with systemd) \
463 $(use_with !systemd console-kit) \
464 $(use_enable systemd systemd-journal) \
465 $(systemd_with_unitdir) \
466 $(use_with tcpd tcp-wrappers) \
467 $(use_enable wayland wayland-support) \
468 $(use_with xinerama) \
469 ITSTOOL=$(type -P true) \
470 ${myconf}
471 }
472
473 src_install() {
474 gnome2_src_install
475
476 if ! use accessibility ; then
477 rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
478 fi
479
480 exeinto /etc/X11/xinit/xinitrc.d
481 newexe "${FILESDIR}/49-keychain-r1" 49-keychain
482 newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
483
484 # gdm user's home directory
485 keepdir /var/lib/gdm
486 fowners gdm:gdm /var/lib/gdm
487
488 # install XDG_DATA_DIRS gdm changes
489 echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
490 doenvd 99xdg-gdm
491
492 use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
493
494 readme.gentoo_create_doc
495 }
496
497 pkg_postinst() {
498 local d ret
499
500 gnome2_pkg_postinst
501
502 # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
503 ret=0
504 ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
505 chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
506 for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
507 [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
508 done
509 eend ${ret}
510
511 readme.gentoo_print_elog
512 }