Gentoo Archives: gentoo-commits

From: "Daniel Gryniewicz (dang)" <dang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gdm: ChangeLog gdm-2.20.2.ebuild
Date: Thu, 29 Nov 2007 16:46:50
Message-Id: E1IxmXD-00036S-8R@stork.gentoo.org
1 dang 07/11/29 16:46:43
2
3 Modified: ChangeLog
4 Added: gdm-2.20.2.ebuild
5 Log:
6 Bump to 2.20.2
7 - Fix bugs that were causing XDMCP to not work properly. (Robert
8 Nelson and Brian Cameron)
9
10 - Fix so that XDMCP configuration options are read from the
11 configuration file. (Andrew Ziem)
12
13 - Fix bug with gdmXnestchooser where it wasn't starting Xephyr with
14 the correct arguments. (Andrew Ziem)
15
16 - Fix so that GDM allows setting of LC_TYPE without setting LANG.
17 (Sjoerd Simons and Takao Fujiwara)
18
19 - Icon imporvements. (Luca Ferretti)
20
21 - Fix leaks. (Andrew Ziem)
22
23 (Portage version: 2.1.4_rc3)
24
25 Revision Changes Path
26 1.254 gnome-base/gdm/ChangeLog
27
28 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.254&view=markup
29 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.254&content-type=text/plain
30 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.253&r2=1.254
31
32 Index: ChangeLog
33 ===================================================================
34 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v
35 retrieving revision 1.253
36 retrieving revision 1.254
37 diff -u -r1.253 -r1.254
38 --- ChangeLog 29 Nov 2007 05:59:28 -0000 1.253
39 +++ ChangeLog 29 Nov 2007 16:46:42 -0000 1.254
40 @@ -1,6 +1,27 @@
41 # ChangeLog for gnome-base/gdm
42 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
43 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.253 2007/11/29 05:59:28 jer Exp $
44 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.254 2007/11/29 16:46:42 dang Exp $
45 +
46 +*gdm-2.20.2 (29 Nov 2007)
47 +
48 + 29 Nov 2007; Daniel Gryniewicz <dang@g.o>
49 + +files/gdm-2.20.2-gksu.patch, +gdm-2.20.2.ebuild:
50 + Bump to 2.20.2
51 + - Fix bugs that were causing XDMCP to not work properly. (Robert
52 + Nelson and Brian Cameron)
53 +
54 + - Fix so that XDMCP configuration options are read from the
55 + configuration file. (Andrew Ziem)
56 +
57 + - Fix bug with gdmXnestchooser where it wasn't starting Xephyr with
58 + the correct arguments. (Andrew Ziem)
59 +
60 + - Fix so that GDM allows setting of LC_TYPE without setting LANG.
61 + (Sjoerd Simons and Takao Fujiwara)
62 +
63 + - Icon imporvements. (Luca Ferretti)
64 +
65 + - Fix leaks. (Andrew Ziem)
66
67 29 Nov 2007; Jeroen Roovers <jer@g.o> gdm-2.20.1.ebuild:
68 Stable for HPPA (bug #199740).
69
70
71
72 1.1 gnome-base/gdm/gdm-2.20.2.ebuild
73
74 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.2.ebuild?rev=1.1&view=markup
75 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/gdm-2.20.2.ebuild?rev=1.1&content-type=text/plain
76
77 Index: gdm-2.20.2.ebuild
78 ===================================================================
79 # Copyright 1999-2007 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.2.ebuild,v 1.1 2007/11/29 16:46:42 dang Exp $
82
83 inherit autotools eutils pam gnome2
84
85 DESCRIPTION="GNOME Display Manager"
86 HOMEPAGE="http://www.gnome.org/projects/gdm/"
87
88 LICENSE="GPL-2"
89 SLOT="0"
90 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
91
92 IUSE_LIBC="elibc_glibc"
93 IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
94
95 # Name of the tarball with gentoo specific files
96 GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
97
98 SRC_URI="${SRC_URI}
99 mirror://gentoo/${GDM_EXTRA}.tar.bz2
100 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
101
102 RDEPEND="dev-libs/dbus-glib
103 >=dev-libs/glib-2.12
104 >=x11-libs/gtk+-2.6
105 >=x11-libs/pango-1.3
106 >=gnome-base/libglade-2
107 >=gnome-base/libgnomecanvas-2
108 >=gnome-base/librsvg-1.1.1
109 >=dev-libs/libxml2-2.4.12
110 >=media-libs/libart_lgpl-2.3.11
111 x11-libs/gksu
112 x11-libs/libXi
113 x11-libs/libXau
114 x11-libs/libX11
115 x11-libs/libXext
116 x11-apps/sessreg
117 x11-libs/libXdmcp
118 xinerama? ( x11-libs/libXinerama )
119 sys-auth/consolekit
120 accessibility? ( x11-libs/libXevie )
121 afs? ( net-fs/openafs sys-libs/lwp )
122 dmx? ( x11-libs/libdmx )
123 pam? ( virtual/pam )
124 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
125 remote? ( gnome-extra/zenity )
126 selinux? ( sys-libs/libselinux )
127 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
128 DEPEND="${RDEPEND}
129 dmx? ( x11-proto/dmxproto )
130 sys-devel/gettext
131 x11-proto/inputproto
132 >=dev-util/intltool-0.35
133 >=dev-util/pkgconfig-0.19
134 >=app-text/scrollkeeper-0.1.4
135 >=app-text/gnome-doc-utils-0.3.2"
136
137 DOCS="AUTHORS ChangeLog NEWS README TODO"
138
139 pkg_setup() {
140 G2CONF="--with-prefetch=yes \
141 --sysconfdir=/etc/X11 \
142 --localstatedir=/var \
143 --with-xdmcp=yes \
144 --with-pam-prefix=/etc \
145 --with-console-kit=yes \
146 $(use_enable accessibility xevie) \
147 $(use_enable ipv6) \
148 $(use_enable remote secureremote) \
149 $(use_with selinux) \
150 $(use_with tcpd tcp-wrappers) \
151 $(use_with xinerama)"
152
153 if use dmx ; then
154 G2CONF="${G2CONF} --with-dmx=yes"
155 else
156 G2CONF="${G2CONF} --with-dmx=no"
157 fi
158
159 if use pam; then
160 G2CONF="${G2CONF} --enable-authentication-scheme=pam"
161 else
162 G2CONF="${G2CONF} --enable-console-helper=no"
163 if use elibc_glibc ; then
164 G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
165 else
166 G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
167 fi
168 fi
169
170 enewgroup gdm
171 enewuser gdm -1 -1 /var/lib/gdm gdm
172 }
173
174 src_unpack() {
175 gnome2_src_unpack
176
177 # remove unneeded linker directive for selinux (#41022)
178 epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
179
180 # Add gksu to gdmsetup menu entry
181 epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
182 }
183
184 src_install() {
185 gnome2_src_install
186
187 local gentoodir="${WORKDIR}/${GDM_EXTRA}"
188
189 # gdm-binary should be gdm to work with our init (#5598)
190 rm -f "${D}/usr/sbin/gdm"
191 dosym /usr/sbin/gdm-binary /usr/sbin/gdm
192
193 # our x11's scripts point to /usr/bin/gdm
194 dosym /usr/sbin/gdm-binary /usr/bin/gdm
195
196 # log, etc.
197 keepdir /var/log/gdm
198 keepdir /var/gdm
199
200 chown root:gdm "${D}/var/gdm"
201 chmod 1770 "${D}/var/gdm"
202
203 # use our own session script
204 rm -f "${D}/etc/X11/gdm/Xsession"
205 exeinto /etc/X11/gdm
206 doexe "${gentoodir}/Xsession"
207
208 # add a custom xsession .desktop by default (#44537)
209 exeinto /etc/X11/dm/Sessions
210 doexe "${gentoodir}/custom.desktop"
211
212 # We replace the pam stuff by our own
213 rm -rf "${D}/etc/pam.d"
214
215 if use pam ; then
216 dopamd "${gentoodir}"/pam.d/*
217 dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
218 fi
219
220 # use graphical greeter local
221 dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
222 /usr/share/gdm/defaults.conf
223
224 # list available users
225 dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
226 dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
227
228 # Fix old X11R6 paths
229 dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
230
231 # Move Gentoo theme in
232 if use branding ; then
233 mv "${WORKDIR}"/gentoo-* "${D}/usr/share/gdm/themes"
234 fi
235 }
236
237 pkg_postinst() {
238 gnome2_pkg_postinst
239
240 elog "To make GDM start at boot, edit /etc/rc.conf"
241 elog "and then execute 'rc-update add xdm default'."
242
243 elog "GDM has changed the location of its configuration file. Please"
244 elog "edit /etc/X11/gdm/custom.conf. The factory defaults are located"
245 elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
246
247 elog "See README.install for more information about the change."
248
249 if [ -f "/etc/X11/gdm/gdm.conf" ]; then
250 elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
251 elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
252 mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
253 fi
254
255 # Soft restart, assumes Gentoo defaults for file locations
256 # Do restart after gdm.conf move above
257 FIFOFILE=/var/gdm/.gdmfifo
258 PIDFILE=/var/run/gdm.pid
259
260 if [ -w ${FIFOFILE} ] ; then
261 if [ -f ${PIDFILE} ] ; then
262 if kill -0 `cat ${PIDFILE}`; then
263 (echo;echo SOFT_RESTART) >> ${FIFOFILE}
264 fi
265 fi
266 fi
267 }
268
269 pkg_postrm() {
270 gnome2_pkg_postrm
271
272 if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
273 elog "To remove GDM from startup please execute"
274 elog "'rc-update del xdm default'"
275 fi
276 }
277
278
279
280 --
281 gentoo-commits@g.o mailing list