1 |
eva 09/05/01 10:28:07 |
2 |
|
3 |
Modified: metadata.xml ChangeLog gdm-2.20.3.ebuild |
4 |
Added: gdm-2.20.10-r1.ebuild |
5 |
Removed: gdm-2.20.7.ebuild gdm-2.20.9.ebuild |
6 |
gdm-2.20.8.ebuild |
7 |
Log: |
8 |
Bump to 2.20.10-r1, add consolekit USE flag (bug #239250) default on, move pambase to PDEPEND and replace built_with_use by USE-deps. Raise pambase dependency for proper consolekit handling. Clean up old revisions. |
9 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.5 gnome-base/gdm/metadata.xml |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/metadata.xml?rev=1.5&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/metadata.xml?rev=1.5&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/metadata.xml?r1=1.4&r2=1.5 |
17 |
|
18 |
Index: metadata.xml |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/metadata.xml,v |
21 |
retrieving revision 1.4 |
22 |
retrieving revision 1.5 |
23 |
diff -u -r1.4 -r1.5 |
24 |
--- metadata.xml 5 Aug 2008 15:40:30 -0000 1.4 |
25 |
+++ metadata.xml 1 May 2009 10:28:07 -0000 1.5 |
26 |
@@ -5,5 +5,7 @@ |
27 |
<use> |
28 |
<flag name='dmx'>Enables Distributed Multihead X (DMX) support</flag> |
29 |
<flag name='remote'>Enables support for secure remote connections</flag> |
30 |
+ <flag name='consolekit'>Allow proper handling of removable media according |
31 |
+ to who is actually present on the machine.</flag> |
32 |
</use> |
33 |
</pkgmetadata> |
34 |
|
35 |
|
36 |
|
37 |
1.294 gnome-base/gdm/ChangeLog |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.294&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.294&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.293&r2=1.294 |
42 |
|
43 |
Index: ChangeLog |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v |
46 |
retrieving revision 1.293 |
47 |
retrieving revision 1.294 |
48 |
diff -u -r1.293 -r1.294 |
49 |
--- ChangeLog 28 Apr 2009 18:00:13 -0000 1.293 |
50 |
+++ ChangeLog 1 May 2009 10:28:07 -0000 1.294 |
51 |
@@ -1,6 +1,15 @@ |
52 |
# ChangeLog for gnome-base/gdm |
53 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.293 2009/04/28 18:00:13 armin76 Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.294 2009/05/01 10:28:07 eva Exp $ |
56 |
+ |
57 |
+*gdm-2.20.10-r1 (01 May 2009) |
58 |
+ |
59 |
+ 01 May 2009; Gilles Dartiguelongue <eva@g.o> gdm-2.20.3.ebuild, |
60 |
+ -gdm-2.20.7.ebuild, -gdm-2.20.8.ebuild, -gdm-2.20.9.ebuild, |
61 |
+ +gdm-2.20.10-r1.ebuild: |
62 |
+ Bump to 2.20.10-r1, add consolekit USE flag (bug #239250) default on, move |
63 |
+ pambase to PDEPEND and replace built_with_use by USE-deps. Raise pambase |
64 |
+ dependency for proper consolekit handling. Clean up old revisions. |
65 |
|
66 |
28 Apr 2009; Raúl Porcel <armin76@g.o> gdm-2.20.9-r1.ebuild: |
67 |
arm/sh stable |
68 |
|
69 |
|
70 |
|
71 |
1.11 gnome-base/gdm/gdm-2.20.3.ebuild |
72 |
|
73 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild?rev=1.11&view=markup |
74 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild?rev=1.11&content-type=text/plain |
75 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild?r1=1.10&r2=1.11 |
76 |
|
77 |
Index: gdm-2.20.3.ebuild |
78 |
=================================================================== |
79 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild,v |
80 |
retrieving revision 1.10 |
81 |
retrieving revision 1.11 |
82 |
diff -u -r1.10 -r1.11 |
83 |
--- gdm-2.20.3.ebuild 20 Apr 2008 01:35:58 -0000 1.10 |
84 |
+++ gdm-2.20.3.ebuild 1 May 2009 10:28:07 -0000 1.11 |
85 |
@@ -1,6 +1,6 @@ |
86 |
-# Copyright 1999-2008 Gentoo Foundation |
87 |
+# Copyright 1999-2009 Gentoo Foundation |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild,v 1.10 2008/04/20 01:35:58 vapier Exp $ |
90 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild,v 1.11 2009/05/01 10:28:07 eva Exp $ |
91 |
|
92 |
inherit autotools eutils pam gnome2 |
93 |
|
94 |
@@ -9,7 +9,7 @@ |
95 |
|
96 |
LICENSE="GPL-2" |
97 |
SLOT="0" |
98 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" |
99 |
+KEYWORDS="~mips" |
100 |
|
101 |
IUSE_LIBC="elibc_glibc" |
102 |
IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC" |
103 |
|
104 |
|
105 |
|
106 |
1.1 gnome-base/gdm/gdm-2.20.10-r1.ebuild |
107 |
|
108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r1.ebuild?rev=1.1&view=markup |
109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r1.ebuild?rev=1.1&content-type=text/plain |
110 |
|
111 |
Index: gdm-2.20.10-r1.ebuild |
112 |
=================================================================== |
113 |
# Copyright 1999-2009 Gentoo Foundation |
114 |
# Distributed under the terms of the GNU General Public License v2 |
115 |
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r1.ebuild,v 1.1 2009/05/01 10:28:07 eva Exp $ |
116 |
|
117 |
EAPI="2" |
118 |
|
119 |
inherit eutils pam gnome2 |
120 |
|
121 |
DESCRIPTION="GNOME Display Manager" |
122 |
HOMEPAGE="http://www.gnome.org/projects/gdm/" |
123 |
|
124 |
LICENSE="GPL-2" |
125 |
SLOT="0" |
126 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
127 |
|
128 |
IUSE_LIBC="elibc_glibc" |
129 |
IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC" |
130 |
|
131 |
# Name of the tarball with gentoo specific files |
132 |
GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1" |
133 |
|
134 |
SRC_URI="${SRC_URI} |
135 |
mirror://gentoo/${GDM_EXTRA}.tar.bz2 |
136 |
branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" |
137 |
|
138 |
RDEPEND=">=dev-libs/glib-2.12 |
139 |
>=x11-libs/gtk+-2.6 |
140 |
>=x11-libs/pango-1.3 |
141 |
>=gnome-base/libglade-2 |
142 |
>=gnome-base/libgnomecanvas-2 |
143 |
>=gnome-base/librsvg-1.1.1 |
144 |
>=dev-libs/libxml2-2.4.12 |
145 |
>=media-libs/libart_lgpl-2.3.11 |
146 |
x11-libs/gksu |
147 |
x11-libs/libXi |
148 |
x11-libs/libXau |
149 |
x11-libs/libX11 |
150 |
x11-libs/libXext |
151 |
x11-apps/sessreg |
152 |
x11-libs/libXdmcp |
153 |
xinerama? ( x11-libs/libXinerama ) |
154 |
consolekit? ( |
155 |
sys-auth/consolekit |
156 |
dev-libs/dbus-glib ) |
157 |
accessibility? ( x11-libs/libXevie ) |
158 |
afs? ( net-fs/openafs sys-libs/lwp ) |
159 |
dmx? ( x11-libs/libdmx ) |
160 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) |
161 |
pam? ( virtual/pam ) |
162 |
!pam? ( elibc_glibc? ( sys-apps/shadow ) ) |
163 |
remote? ( gnome-extra/zenity ) |
164 |
selinux? ( sys-libs/libselinux ) |
165 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
166 |
>=x11-misc/xdg-utils-1.0.2-r3" |
167 |
DEPEND="${RDEPEND} |
168 |
dmx? ( x11-proto/dmxproto ) |
169 |
xinerama? ( x11-proto/xineramaproto ) |
170 |
sys-devel/gettext |
171 |
x11-proto/inputproto |
172 |
>=dev-util/intltool-0.35 |
173 |
>=dev-util/pkgconfig-0.19 |
174 |
>=app-text/scrollkeeper-0.1.4 |
175 |
>=app-text/gnome-doc-utils-0.3.2" |
176 |
PDEPEND="pam? ( >=sys-auth/pambase-20090430[consolekit=,gnome-keyring=] )" |
177 |
|
178 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
179 |
|
180 |
pkg_setup() { |
181 |
G2CONF="${G2CONF} |
182 |
--with-prefetch |
183 |
--sysconfdir=/etc/X11 |
184 |
--localstatedir=/var |
185 |
--with-xdmcp=yes |
186 |
--with-pam-prefix=/etc |
187 |
SOUND_PROGRAM=/usr/bin/gdmplay |
188 |
$(use_enable accessibility xevie) |
189 |
$(use_enable ipv6) |
190 |
$(use_enable remote secureremote) |
191 |
$(use_with consolekit console-kit) |
192 |
$(use_with dmx) |
193 |
$(use_with selinux) |
194 |
$(use_with tcpd tcp-wrappers) |
195 |
$(use_with xinerama)" |
196 |
|
197 |
if use pam; then |
198 |
G2CONF="${G2CONF} --enable-authentication-scheme=pam" |
199 |
else |
200 |
G2CONF="${G2CONF} --enable-console-helper=no" |
201 |
if use elibc_glibc ; then |
202 |
G2CONF="${G2CONF} --enable-authentication-scheme=shadow" |
203 |
else |
204 |
G2CONF="${G2CONF} --enable-authentication-scheme=crypt" |
205 |
fi |
206 |
fi |
207 |
|
208 |
enewgroup gdm |
209 |
enewuser gdm -1 -1 /var/lib/gdm gdm |
210 |
} |
211 |
|
212 |
src_prepare() { |
213 |
gnome2_src_prepare |
214 |
|
215 |
# remove unneeded linker directive for selinux (#41022) |
216 |
epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch" |
217 |
|
218 |
# Add gksu to gdmsetup menu entry |
219 |
epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch" |
220 |
|
221 |
# Fix parallel install, bug #217037 |
222 |
epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch" |
223 |
|
224 |
# Make custom session work, bug #216984 |
225 |
epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch" |
226 |
|
227 |
# ssh-agent handling must be done at xinitrc.d, bug #220603 |
228 |
epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch" |
229 |
} |
230 |
|
231 |
src_install() { |
232 |
gnome2_src_install |
233 |
|
234 |
local gentoodir="${WORKDIR}/${GDM_EXTRA}" |
235 |
|
236 |
# gdm-binary should be gdm to work with our init (#5598) |
237 |
rm -f "${D}/usr/sbin/gdm" |
238 |
dosym /usr/sbin/gdm-binary /usr/sbin/gdm |
239 |
|
240 |
# our x11's scripts point to /usr/bin/gdm |
241 |
dosym /usr/sbin/gdm-binary /usr/bin/gdm |
242 |
|
243 |
# log, etc. |
244 |
keepdir /var/log/gdm |
245 |
keepdir /var/gdm |
246 |
|
247 |
fowners root:gdm /var/gdm |
248 |
fperms 1770 /var/gdm |
249 |
|
250 |
# add a custom xsession .desktop by default (#44537) |
251 |
exeinto /etc/X11/dm/Sessions |
252 |
doexe "${gentoodir}/custom.desktop" |
253 |
|
254 |
# add xinitrc.d scripts |
255 |
exeinto /etc/X11/xinit/xinitrc.d |
256 |
doexe "${FILESDIR}/49-keychain" || die "doexe 1 failed" |
257 |
doexe "${FILESDIR}/50-ssh-agent" || die "doexe 2 failed" |
258 |
|
259 |
# install XDG_DATA_DIRS gdm changes |
260 |
echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm |
261 |
doenvd 99xdg-gdm || die "doenvd failed" |
262 |
|
263 |
# add a custom sound playing script (#248253) |
264 |
dobin "${gentoodir}/gdmplay" || die "dobin failed" |
265 |
|
266 |
# avoid file collision, bug #213118 |
267 |
rm -f "${D}/usr/share/xsessions/gnome.desktop" |
268 |
|
269 |
# We replace the pam stuff by our own |
270 |
rm -rf "${D}/etc/pam.d" |
271 |
|
272 |
if use pam ; then |
273 |
use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* |
274 |
|
275 |
dopamd "${gentoodir}"/pam.d/* |
276 |
dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" |
277 |
fi |
278 |
|
279 |
# use graphical greeter local |
280 |
dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \ |
281 |
/usr/share/gdm/defaults.conf |
282 |
|
283 |
# list available users |
284 |
dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf |
285 |
dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf |
286 |
|
287 |
# Fix old X11R6 paths |
288 |
dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf |
289 |
|
290 |
# Move Gentoo theme in |
291 |
if use branding ; then |
292 |
mv "${WORKDIR}"/gentoo-* "${D}/usr/share/gdm/themes" |
293 |
fi |
294 |
} |
295 |
|
296 |
pkg_postinst() { |
297 |
gnome2_pkg_postinst |
298 |
|
299 |
elog "To make GDM start at boot, edit /etc/conf.d/xdm" |
300 |
elog "and then execute 'rc-update add xdm default'." |
301 |
|
302 |
elog "GDM has changed the location of its configuration file. Please" |
303 |
elog "edit /etc/X11/gdm/custom.conf. The factory defaults are located" |
304 |
elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}" |
305 |
|
306 |
elog "See README.install for more information about the change." |
307 |
|
308 |
if use gnome-keyring; then |
309 |
elog "For autologin to unlock your keyring, you need to set an empty" |
310 |
elog "password on your keyring. Use app-crypt/seahorse for that." |
311 |
fi |
312 |
|
313 |
if [ -f "/etc/X11/gdm/gdm.conf" ]; then |
314 |
elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" |
315 |
elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" |
316 |
mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 |
317 |
fi |
318 |
|
319 |
# Soft restart, assumes Gentoo defaults for file locations |
320 |
# Do restart after gdm.conf move above |
321 |
FIFOFILE=/var/gdm/.gdmfifo |
322 |
PIDFILE=/var/run/gdm.pid |
323 |
|
324 |
if [ -w ${FIFOFILE} ] ; then |
325 |
if [ -f ${PIDFILE} ] ; then |
326 |
if kill -0 `cat ${PIDFILE}`; then |
327 |
(echo;echo SOFT_RESTART) >> ${FIFOFILE} |
328 |
fi |
329 |
fi |
330 |
fi |
331 |
} |
332 |
|
333 |
pkg_postrm() { |
334 |
gnome2_pkg_postrm |
335 |
|
336 |
if [ "$(rc-config list default | grep xdm)" != "" ] ; then |
337 |
elog "To remove GDM from startup please execute" |
338 |
elog "'rc-update del xdm default'" |
339 |
fi |
340 |
} |