Fix path changes lost in overlay; remove monolithic X deps

Package-Manager: portage-2.1.1

4 files changed, 197 insertions, 12 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 83562bf95884..fe5cdd27bb68 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.179 2006/09/07 03:53:29 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.180 2006/09/12 15:04:33 dang Exp $
+
+*gdm-2.16.0-r1 (12 Sep 2006)
+
+  12 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> -gdm-2.16.0.ebuild,
+  +gdm-2.16.0-r1.ebuild:
+  Fix path changes lost in overlay; remove monolithic X deps
 
 *gdm-2.16.0 (07 Sep 2006)
 
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.0-r1 b/gnome-base/gdm/files/digest-gdm-2.16.0-r1
new file mode 100644
index 000000000000..eb0ebb6bdadc
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.16.0-r1
@@ -0,0 +1,9 @@
+MD5 641116667d3486eca842dd1a2fc792c7 gdm-2.16.0.tar.bz2 3160137
+RMD160 e6775e55b0f4f7ec2dbde8e2295af7dcab4ae3b4 gdm-2.16.0.tar.bz2 3160137
+SHA256 e017abdf55561ad0efb8520f6a3be00f7ceb78f038e7b5a464e5f639def39d5f gdm-2.16.0.tar.bz2 3160137
+MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
+MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
+RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
+SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/gdm-2.16.0-r1.ebuild b/gnome-base/gdm/gdm-2.16.0-r1.ebuild
new file mode 100644
index 000000000000..cc707d2c21ee
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.16.0-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.16.0-r1.ebuild,v 1.1 2006/09/12 15:04:33 dang Exp $
+
+inherit eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="accessibility ipv6 pam selinux tcpd xinerama"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2
+	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
+
+RDEPEND="pam? ( virtual/pam )
+	!pam? ( sys-apps/shadow )
+	>=dev-libs/glib-2.8
+	>=x11-libs/gtk+-2.6
+	>=x11-libs/pango-1.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/librsvg-1.1.1
+	>=dev-libs/libxml2-2.4.12
+	>=media-libs/libart_lgpl-2.3.11
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libdmx
+	x11-libs/libXau
+	x11-apps/sessreg
+	accessibility? ( x11-libs/libXevie )"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/dmxproto
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.1.4"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="--sysconfdir=/etc/X11         \
+		--localstatedir=/var              \
+		--with-xdmcp                      \
+		--with-pam-prefix=/etc            \
+		$(use_enable accessibility xevie) \
+		$(use_enable ipv6)                \
+		$(use_with selinux)               \
+		$(use_with tcpd tcp-wrappers)     \
+		$(use_with xinerama)"
+
+	if use pam; then
+		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no \
+			--enable-authentication-scheme=shadow"
+	fi
+
+	enewgroup gdm
+	enewuser gdm -1 -1 /var/lib/gdm gdm
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch
+
+	# Fix missing intllib
+	epatch ${FILESDIR}/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
+}
+
+src_install() {
+	gnome2_src_install
+
+	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f ${D}/usr/sbin/gdm
+	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
+
+	# our x11's scripts point to /usr/bin/gdm
+	dosym /usr/sbin/gdm-binary /usr/bin/gdm
+
+	# log, etc.
+	keepdir /var/log/gdm
+	keepdir /var/gdm
+
+	chown root:gdm ${D}/var/gdm
+	chmod 1770 ${D}/var/gdm
+
+	# use our own session script
+	rm -f ${D}/etc/X11/gdm/Xsession
+	exeinto /etc/X11/gdm
+	doexe ${gentoodir}/Xsession
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe ${gentoodir}/custom.desktop
+
+	# We replace the pam stuff by our own
+	rm -rf ${D}/etc/pam.d
+
+	dopamd ${gentoodir}/pam.d/*
+	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
+		/usr/share/gdm/defaults.conf
+
+	# list available users
+	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
+	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
+
+	# Fix old X11R6 paths
+	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	FIFOFILE=/var/gdm/.gdmfifo
+	PIDFILE=/var/run/gdm.pid
+
+	if [ -w ${FIFOFILE} ] ; then
+		if [ -f ${PIDFILE} ] ; then
+			if kill -0 `cat ${PIDFILE}`; then
+				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
+			fi
+		fi
+	fi
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+	einfo "GDM has changed the location of its configuration file.  Please"
+	einfo "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
+	einfo "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
+
+	einfo "See README.install for more information about the change."
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+}
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index c3a3e9cdf034..b7093692db37 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -46,14 +46,14 @@ EBUILD gnome-applets-2.14.2.ebuild 2269 RMD160 dcc1d54f5aa205e1990fe0299b4372942
 MD5 bff4f49fa429d29302246329b56440bd gnome-applets-2.14.2.ebuild 2269
 RMD160 dcc1d54f5aa205e1990fe0299b4372942f62e3f6 gnome-applets-2.14.2.ebuild 2269
 SHA256 6a6aa8bce6335e0b3a1a13bf30c0d575a0259d01e6b53400599a8582b8e41252 gnome-applets-2.14.2.ebuild 2269
-EBUILD gnome-applets-2.16.0.1.ebuild 2549 RMD160 07b9a60ac4fcaf6b04e24b08817215e33208a9ab SHA1 4266502ac10012669559556fdf2bb265464ec3a3 SHA256 d4a01e0eca3ddb911a38e5b7ab941d1a5f936f58ad1467a1f26459bce0a596bd
-MD5 25b19a5de900d2003846c469bf09fd90 gnome-applets-2.16.0.1.ebuild 2549
-RMD160 07b9a60ac4fcaf6b04e24b08817215e33208a9ab gnome-applets-2.16.0.1.ebuild 2549
-SHA256 d4a01e0eca3ddb911a38e5b7ab941d1a5f936f58ad1467a1f26459bce0a596bd gnome-applets-2.16.0.1.ebuild 2549
-MISC ChangeLog 25576 RMD160 9eee831f334e160e1230b8b2e7638b26887dd11a SHA1 65cecb7df561ab402618e962a78d4764699005ef SHA256 832b30aead8c04b774b305d1c293bee9d6779e86334c011459adf19da7327b3c
-MD5 ce06dc64c03aa3490a0073cd0133fced ChangeLog 25576
-RMD160 9eee831f334e160e1230b8b2e7638b26887dd11a ChangeLog 25576
-SHA256 832b30aead8c04b774b305d1c293bee9d6779e86334c011459adf19da7327b3c ChangeLog 25576
+EBUILD gnome-applets-2.16.0.1.ebuild 2526 RMD160 25b5ccdfe4ea0683713cead55dad30045023b31a SHA1 6862e56ca1041e04a65630059e301d52878402d9 SHA256 7b69ab2cc46b954ead3602965a685730eac11f1554480917e6f324e736871281
+MD5 98c5eebbf90b4963ef3f115be97ceddd gnome-applets-2.16.0.1.ebuild 2526
+RMD160 25b5ccdfe4ea0683713cead55dad30045023b31a gnome-applets-2.16.0.1.ebuild 2526
+SHA256 7b69ab2cc46b954ead3602965a685730eac11f1554480917e6f324e736871281 gnome-applets-2.16.0.1.ebuild 2526
+MISC ChangeLog 25688 RMD160 82fc213a6c6d9b6ebf7977fb03b39e7b0ed96d19 SHA1 f92579c2f89227901e71975d435247eb13fc42df SHA256 b9f1c74b5196f7f00c6e002864952028e16b035bb960d84a219ad0614d8a8a19
+MD5 807717cbc88fd8c2f85cc68e16dd98c1 ChangeLog 25688
+RMD160 82fc213a6c6d9b6ebf7977fb03b39e7b0ed96d19 ChangeLog 25688
+SHA256 b9f1c74b5196f7f00c6e002864952028e16b035bb960d84a219ad0614d8a8a19 ChangeLog 25688
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -79,7 +79,7 @@ SHA256 4855b121d61e0542118850e8004b96ba249505ac03ac75d28b9a287af093a13b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFBZDeomPajV0RnrERAv2cAJ9/WQ7nfwpBLAdLcH1Q4hWSmPmL9ACfSYEk
-t38tEjoKnGXJhx2fK2YsfU8=
-=tmlk
+iD8DBQFFBs1vomPajV0RnrERAuLgAJ9Zs6a5epR9j3G+/4mO6D+CBJq5PACdHAtS
+JNJZqLLwIDycTAfUC+wCwDY=
+=DZ8O
 -----END PGP SIGNATURE-----