Fix path changes lost in overlay; remove monolithic X deps

(Portage version: 2.1.1)
 (Signed Manifest commit)

3 files changed, 14 insertions, 197 deletions

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 9c3c85b6deda..56fd63c4ca94 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -49,10 +49,10 @@ EBUILD gdm-2.14.9-r1.ebuild 4559 RMD160 239b344a269df4c5b2bff3de34b3084d089cb759
 MD5 2fef4eb2cbc68eaa32c3bcb3a4207fba gdm-2.14.9-r1.ebuild 4559
 RMD160 239b344a269df4c5b2bff3de34b3084d089cb759 gdm-2.14.9-r1.ebuild 4559
 SHA256 f54c2504d449f26c517446807406e8a2d231fcec189db81c93e690c22bd0fec5 gdm-2.14.9-r1.ebuild 4559
-EBUILD gdm-2.16.0.ebuild 4222 RMD160 27ec1a2267c3b57e6ee8eb8ae1cb8975f6a4a567 SHA1 600749f678bf69d18a47a8dc827151fc2921c3bb SHA256 ef1fab1b08e282ed157d74eaca98a854cc5cc5a677bc0c124a4ea21ef3c5d856
-MD5 910cf66c28a5048ec657c901cd165155 gdm-2.16.0.ebuild 4222
-RMD160 27ec1a2267c3b57e6ee8eb8ae1cb8975f6a4a567 gdm-2.16.0.ebuild 4222
-SHA256 ef1fab1b08e282ed157d74eaca98a854cc5cc5a677bc0c124a4ea21ef3c5d856 gdm-2.16.0.ebuild 4222
+EBUILD gdm-2.16.0-r1.ebuild 4431 RMD160 9eaa366a363d4da16f351a754adad25c82e12ae6 SHA1 daccb8d9372c540aed033d680167a995fdfde08c SHA256 d2d30bcc28dc89314966a04ad1f8ef54cfd9e1bf85ea8a61ad17106717eb87cd
+MD5 609be880f1f5c1aaa7bd9b79fe31defa gdm-2.16.0-r1.ebuild 4431
+RMD160 9eaa366a363d4da16f351a754adad25c82e12ae6 gdm-2.16.0-r1.ebuild 4431
+SHA256 d2d30bcc28dc89314966a04ad1f8ef54cfd9e1bf85ea8a61ad17106717eb87cd gdm-2.16.0-r1.ebuild 4431
 EBUILD gdm-2.2.5.4-r5.ebuild 4685 RMD160 c09585b38e20221a4f5fe1a17e6b2a5d442126d1 SHA1 01d17c66e2b2f7fc22f874a3901ce9434f0556b1 SHA256 c0315f95a1149276eb30d68d5ae2594e5dad2a38dd5e4cb6ac1a9900dc884c32
 MD5 1e8602e01ca98f77438fd5a4327e4df7 gdm-2.2.5.4-r5.ebuild 4685
 RMD160 c09585b38e20221a4f5fe1a17e6b2a5d442126d1 gdm-2.2.5.4-r5.ebuild 4685
@@ -69,10 +69,10 @@ EBUILD gdm-2.8.0.8.ebuild 3987 RMD160 77cb40f3845a8f6e5794e7fadd1a2825c33ac50a S
 MD5 132b4ab207f147144ad0230b9d494c5f gdm-2.8.0.8.ebuild 3987
 RMD160 77cb40f3845a8f6e5794e7fadd1a2825c33ac50a gdm-2.8.0.8.ebuild 3987
 SHA256 ba363063dfc8cfda93cd2ae309108130fadf238f5866ff89fc9aab2c25b3a70c gdm-2.8.0.8.ebuild 3987
-MISC ChangeLog 23540 RMD160 34674fcef49df06c770c671f69a24b35dcf2d7a6 SHA1 3e10d965977c6bad85d5697214e90145b5c3ddf3 SHA256 5578c4bfbe02613c855002c6e78d1a28b9bd7a5d502701485e5a2868a77e3697
-MD5 0ab0d44725d575929d4c8dbe64352bd4 ChangeLog 23540
-RMD160 34674fcef49df06c770c671f69a24b35dcf2d7a6 ChangeLog 23540
-SHA256 5578c4bfbe02613c855002c6e78d1a28b9bd7a5d502701485e5a2868a77e3697 ChangeLog 23540
+MISC ChangeLog 23728 RMD160 235af661c02a167f3ef61567d539accd3bcfc708 SHA1 ce0f292576fb4b8814a8415dc2ad660938509691 SHA256 04008eac6069f64db7583979e95ae2eda9d833a9d5ed77411d0a9c526febf49c
+MD5 a507a7e5de23b58405ed1471628d6ae8 ChangeLog 23728
+RMD160 235af661c02a167f3ef61567d539accd3bcfc708 ChangeLog 23728
+SHA256 04008eac6069f64db7583979e95ae2eda9d833a9d5ed77411d0a9c526febf49c ChangeLog 23728
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -80,9 +80,9 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 ea4fc423e9d653330920d389a43122f0 files/digest-gdm-2.14.9-r1 768
 RMD160 71291a8c33d020c4d3766e41dd8a243fa159a41e files/digest-gdm-2.14.9-r1 768
 SHA256 34ff0a74b881c8f694b858c4918511a843ad6b4c650f58d1007aeb9ab75d6bf7 files/digest-gdm-2.14.9-r1 768
-MD5 8a3cea7c75a2d6dfcc7b524ab802cc2b files/digest-gdm-2.16.0 768
-RMD160 7aa8ab521857c248d138785a98cc23f0d7f3aefd files/digest-gdm-2.16.0 768
-SHA256 0729df514ae4c98246a6f401913f8924361e2168ee22cbd5341d11c448ea83cb files/digest-gdm-2.16.0 768
+MD5 8a3cea7c75a2d6dfcc7b524ab802cc2b files/digest-gdm-2.16.0-r1 768
+RMD160 7aa8ab521857c248d138785a98cc23f0d7f3aefd files/digest-gdm-2.16.0-r1 768
+SHA256 0729df514ae4c98246a6f401913f8924361e2168ee22cbd5341d11c448ea83cb files/digest-gdm-2.16.0-r1 768
 MD5 6b95da6d4ca477ed00d5c30d142a7147 files/digest-gdm-2.2.5.4-r5 241
 RMD160 16efdcfca9892db66b724607b3c744fe5ee93db1 files/digest-gdm-2.2.5.4-r5 241
 SHA256 abe4d784a03cce322c289f7ab49e93307c112886e90d2a60d683b7e280bf741a files/digest-gdm-2.2.5.4-r5 241
@@ -98,7 +98,7 @@ SHA256 c0a06a42d9256d58b8af8c138b0b8339a6b45ff5449139faba1c5e3eb518947c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE/5fAomPajV0RnrERAtaeAJ9FmHEGxh8ju3M5Jqe3IH8emcKF9gCfV3nc
-f8OWy1R8oI3SitVeNddkGFk=
-=waCa
+iD8DBQFFBsyGomPajV0RnrERAjUoAJ9hPcS3nbtR1OYtgNJN2DnzhkU+vACfZx9E
+ITWYars6TTuz1shY4MI7buc=
+=vOId
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.0 b/gnome-base/gdm/files/digest-gdm-2.16.0
deleted file mode 100644
index eb0ebb6bdadc..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.16.0
+++ /dev/null
@@ -1,9 +0,0 @@
-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.ebuild b/gnome-base/gdm/gdm-2.16.0.ebuild
deleted file mode 100644
index bda4f0ea39ab..000000000000
--- a/gnome-base/gdm/gdm-2.16.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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.ebuild,v 1.1 2006/09/07 03:53:29 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 )
-			)
-			virtual/x11
-		)"
-
-DEPEND="${RDEPEND}
-	||	(
-			(
-				x11-proto/inputproto
-				x11-proto/dmxproto
-			)
-			virtual/x11
-		)
-	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:" \
-		/etc/X11/gdm/gdm.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /etc/X11/gdm/gdm.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /etc/X11/gdm/gdm.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /etc/X11/gdm/gdm.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'."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-}