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.8.4-r1.ebuild ChangeLog
Date: Sat, 28 Sep 2013 08:36:56
Message-Id: 20130928083650.74B5C2004C@flycatcher.gentoo.org
1 pacho 13/09/28 08:36:50
2
3 Modified: ChangeLog
4 Added: gdm-3.8.4-r1.ebuild
5 Log:
6 >=openrc-0.12 and xdm init.d script from >-x11-base/xorg-server-1.14.3-r1 supports gdm-3.8 restarting (#463784 by Ian Stakenvicius, Chí-Thanh Christopher Nguyễn, Alexander Vershilov, William Hubbs...). Handle accessibility in a different way (#479516): xevie support disabled as it's obsolete and broken, drop deps not needed for a long time due upstream progressively dropping their support, remaining deps are only for fallback greeter. Regarding orca.desktop autostart, it will only be started (confirmed by me just now) when screen-reader-enabled gsetting is true.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
9
10 Revision Changes Path
11 1.383 gnome-base/gdm/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.383&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.383&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.382&r2=1.383
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
20 retrieving revision 1.382
21 retrieving revision 1.383
22 diff -u -r1.382 -r1.383
23 --- ChangeLog 11 Sep 2013 14:20:02 -0000 1.382
24 +++ ChangeLog 28 Sep 2013 08:36:50 -0000 1.383
25 @@ -1,6 +1,18 @@
26 # ChangeLog for gnome-base/gdm
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.382 2013/09/11 14:20:02 pacho Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.383 2013/09/28 08:36:50 pacho Exp $
30 +
31 +*gdm-3.8.4-r1 (28 Sep 2013)
32 +
33 + 28 Sep 2013; Pacho Ramos <pacho@g.o> +gdm-3.8.4-r1.ebuild:
34 + >=openrc-0.12 and xdm init.d script from >-x11-base/xorg-server-1.14.3-r1
35 + supports gdm-3.8 restarting (#463784 by Ian Stakenvicius, Chí-Thanh
36 + Christopher Nguyễn, Alexander Vershilov, William Hubbs...). Handle
37 + accessibility in a different way (#479516): xevie support disabled as it's
38 + obsolete and broken, drop deps not needed for a long time due upstream
39 + progressively dropping their support, remaining deps are only for fallback
40 + greeter. Regarding orca.desktop autostart, it will only be started (confirmed
41 + by me just now) when screen-reader-enabled gsetting is true.
42
43 11 Sep 2013; Pacho Ramos <pacho@g.o> gdm-3.8.4.ebuild:
44 Rekeyword as bug #478076 is solved for ppc
45
46
47
48 1.1 gnome-base/gdm/gdm-3.8.4-r1.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.8.4-r1.ebuild?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.8.4-r1.ebuild?rev=1.1&content-type=text/plain
52
53 Index: gdm-3.8.4-r1.ebuild
54 ===================================================================
55 # Copyright 1999-2013 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4-r1.ebuild,v 1.1 2013/09/28 08:36:50 pacho Exp $
58
59 EAPI="5"
60 GNOME2_LA_PUNT="yes"
61
62 inherit autotools eutils gnome2 pam readme.gentoo systemd user
63
64 DESCRIPTION="GNOME Display Manager"
65 HOMEPAGE="https://live.gnome.org/GDM"
66
67 LICENSE="GPL-2+"
68 SLOT="0"
69 IUSE="accessibility audit fallback fprint +gnome-shell +introspection ipv6 plymouth selinux smartcard +systemd tcpd test xinerama"
70 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
71
72 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
73 # nspr used by smartcard extension
74 # dconf, dbus and g-s-d are needed at install time for dconf update
75 # We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
76 COMMON_DEPEND="
77 app-text/iso-codes
78 >=dev-libs/glib-2.35:2
79 >=x11-libs/gtk+-2.91.1:3
80 >=x11-libs/pango-1.3
81 dev-libs/nspr
82 >=dev-libs/nss-3.11.1
83 >=gnome-base/dconf-0.11.6
84 >=gnome-base/gnome-settings-daemon-3.1.4
85 gnome-base/gsettings-desktop-schemas
86 >=media-libs/fontconfig-2.5.0
87 >=media-libs/libcanberra-0.4[gtk3]
88 sys-apps/dbus
89 >=sys-apps/accountsservice-0.6.12
90 >=sys-power/upower-0.9
91
92 x11-apps/sessreg
93 x11-base/xorg-server
94 x11-libs/libXi
95 x11-libs/libXau
96 x11-libs/libX11
97 x11-libs/libXdmcp
98 x11-libs/libXext
99 x11-libs/libXft
100 x11-libs/libXrandr
101 >=x11-misc/xdg-utils-1.0.2-r3
102
103 virtual/pam
104 systemd? ( >=sys-apps/systemd-186[pam] )
105 !systemd? (
106 >=x11-base/xorg-server-1.14.3-r1
107 !<sys-apps/openrc-0.12 )
108 sys-auth/pambase[systemd?]
109
110 audit? ( sys-process/audit )
111 introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
112 plymouth? ( sys-boot/plymouth )
113 selinux? ( sys-libs/libselinux )
114 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
115 xinerama? ( x11-libs/libXinerama )
116 "
117 # XXX: These deps are from session and desktop files in data/ directory
118 # at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser)
119 # fprintd is used via dbus by gdm-fingerprint-extension
120 # gnome-session-3.6 needed to avoid freezing with orca
121 RDEPEND="${COMMON_DEPEND}
122 >=gnome-base/gnome-session-3.6
123 x11-apps/xhost
124 x11-themes/gnome-icon-theme-symbolic
125
126 fallback? ( x11-wm/metacity
127 accessibility? (
128 app-accessibility/orca
129 gnome-extra/at-spi:1 ) )
130 fprint? (
131 sys-auth/fprintd
132 sys-auth/pam_fprint )
133 gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
134 !gnome-shell? ( x11-wm/metacity )
135 smartcard? (
136 app-crypt/coolkey
137 sys-auth/pam_pkcs11 )
138
139 !gnome-extra/fast-user-switch-applet
140 "
141 DEPEND="${COMMON_DEPEND}
142 app-text/docbook-xml-dtd:4.1.2
143 >=dev-util/intltool-0.40.0
144 >=sys-devel/gettext-0.17
145 virtual/pkgconfig
146 x11-proto/inputproto
147 x11-proto/randrproto
148 test? ( >=dev-libs/check-0.9.4 )
149 xinerama? ( x11-proto/xineramaproto )
150 "
151
152 DOC_CONTENTS="
153 To make GDM start at boot, run:\n
154 # systemctl enable gdm.service\n
155 \n
156 For passwordless login to unlock your keyring, you need to install
157 sys-auth/pambase with USE=gnome-keyring and set an empty password
158 on your keyring. Use app-crypt/seahorse for that.
159 "
160
161 pkg_setup() {
162 enewgroup gdm
163 enewgroup video # Just in case it hasn't been created yet
164 enewuser gdm -1 -1 /var/lib/gdm gdm,video
165
166 # For compatibility with certain versions of nvidia-drivers, etc., need to
167 # ensure that gdm user is in the video group
168 if ! egetent group video | grep -q gdm; then
169 # FIXME XXX: is this at all portable, ldap-safe, etc.?
170 # XXX: egetent does not have a 1-argument form, so we can't use it to
171 # get the list of gdm's groups
172 local g=$(groups gdm)
173 elog "Adding user gdm to video group"
174 usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
175 fi
176 }
177
178 src_prepare() {
179 # make custom session work, bug #216984
180 epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
181
182 # ssh-agent handling must be done at xinitrc.d, bug #220603
183 epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
184
185 # Fix automagic selinux, upstream bug #704188
186 epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch"
187
188 # Gentoo does not have a fingerprint-auth pam stack
189 epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
190
191 # make gdm-fallback session the default if USE=-gnome-shell
192 if ! use gnome-shell; then
193 sed -e "s:'gdm-shell':'gdm-fallback':" \
194 -i data/00-upstream-settings || die "sed failed"
195 fi
196
197 mkdir -p "${S}"/m4
198 sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
199 eautoreconf
200
201 gnome2_src_prepare
202 }
203
204 src_configure() {
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 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-initial-vt=7 \
220 --without-console-kit \
221 --without-xevie \
222 $(use_with audit libaudit) \
223 $(use_enable fallback fallback-greeter) \
224 $(use_enable ipv6) \
225 $(use_with plymouth) \
226 $(use_with selinux) \
227 $(use_with systemd) \
228 $(use_enable systemd systemd-journal) \
229 $(systemd_with_unitdir) \
230 $(use_with tcpd tcp-wrappers) \
231 $(use_with xinerama) \
232 ITSTOOL=$(type -P true)
233 }
234
235 src_install() {
236 gnome2_src_install
237
238 insinto /etc/X11/xinit/xinitrc.d
239 newins "${FILESDIR}/49-keychain-r1" 49-keychain
240 newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
241
242 # log, etc.
243 keepdir /var/log/gdm
244
245 # gdm user's home directory
246 keepdir /var/lib/gdm
247 fowners gdm:gdm /var/lib/gdm
248
249 # install XDG_DATA_DIRS gdm changes
250 echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
251 doenvd 99xdg-gdm
252
253 readme.gentoo_create_doc
254 }
255
256 pkg_postinst() {
257 local d ret
258
259 gnome2_pkg_postinst
260
261 dbus-launch dconf update || die "'dconf update' failed"
262
263 # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
264 ret=0
265 ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
266 chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
267 for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
268 [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
269 done
270 eend ${ret}
271
272 readme.gentoo_print_elog
273
274 if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then
275 elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
276 elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
277 mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
278 fi
279 }