Gentoo Archives: gentoo-commits

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