cleanup up lod unstable ebuilds and fixing bug #157219

(Portage version: 2.1.2.9)

6 files changed, 7 insertions, 387 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 719fcdcff1ca..a9ddb818a3cb 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.209 2007/05/27 05:55:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.210 2007/06/16 14:10:44 eva Exp $
+
+  16 Jun 2007; Gilles Dartiguelongue <dartigug@esiee.fr> -gdm-2.16.1.ebuild,
+  -gdm-2.18.0.ebuild, gdm-2.18.1.ebuild:
+  Cleanup old unstable versions and fix bug #157219
 
   27 May 2007; Joshua Kinard <kumba@gentoo.org> gdm-2.16.4.ebuild:
   Stable on mips.
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.1 b/gnome-base/gdm/files/digest-gdm-2.16.1
deleted file mode 100644
index 4921eec4eb9a..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.16.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a0bf247fdaf32add6d5a69495a433bbf gdm-2.16.1.tar.bz2 3130299
-RMD160 2aa56bf08be354778b9f0c55cbd441b2a354ac2f gdm-2.16.1.tar.bz2 3130299
-SHA256 9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6 gdm-2.16.1.tar.bz2 3130299
-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/files/digest-gdm-2.18.0 b/gnome-base/gdm/files/digest-gdm-2.18.0
deleted file mode 100644
index 14b2bc85f3a9..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.18.0
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a569a8275f0e0396e6ef5f63c5f56ad5 gdm-2.18.0.tar.bz2 3461709
-RMD160 6f23c30cdd51e4c71e9464808844156938b37316 gdm-2.18.0.tar.bz2 3461709
-SHA256 6619ef1ba04f4408f181b1a6c1d8a86f791706e22e0e2803153dbd5554a18053 gdm-2.18.0.tar.bz2 3461709
-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.1.ebuild b/gnome-base/gdm/gdm-2.16.1.ebuild
deleted file mode 100644
index c4562f57d16d..000000000000
--- a/gnome-base/gdm/gdm-2.16.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.16.1.ebuild,v 1.3 2007/04/30 20:55:21 genone 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
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-	elog "See README.install for more information about the change."
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	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
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	elog "To remove GDM from startup please execute"
-	elog "'rc-update del xdm default'"
-}
diff --git a/gnome-base/gdm/gdm-2.18.0.ebuild b/gnome-base/gdm/gdm-2.18.0.ebuild
deleted file mode 100644
index 4e145a8b2fea..000000000000
--- a/gnome-base/gdm/gdm-2.18.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.0.ebuild,v 1.2 2007/04/30 20:55:21 genone Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility branding 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/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="pam?	(
-					virtual/pam
-					sys-auth/consolekit
-				)
-	!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/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	||	(
-			>=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
-		)
-	accessibility? ( x11-libs/libXevie )
-	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"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/dmxproto
-	sys-devel/gettext
-	app-admin/eselect
-	>=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 \
-						  --with-console-kit=yes"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no \
-						  --enable-authentication-scheme=shadow \
-						  --with-console-kit=no"
-	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.18.0-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
-	if use branding ; then
-		mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/rc.conf"
-	elog "and then execute 'rc-update add xdm default'."
-	elog
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-	elog
-	elog "See README.install for more information about the change."
-	elog
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	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
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-2.18.1.ebuild b/gnome-base/gdm/gdm-2.18.1.ebuild
index 5bda91a12963..4e173804cc98 100644
--- a/gnome-base/gdm/gdm-2.18.1.ebuild
+++ b/gnome-base/gdm/gdm-2.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.1.ebuild,v 1.3 2007/04/30 20:55:21 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.1.ebuild,v 1.4 2007/06/16 14:10:44 eva Exp $
 
 inherit eutils pam gnome2
 
@@ -43,7 +43,7 @@ RDEPEND="pam?	(
 	x11-libs/libXdmcp
 	x11-libs/libXi
 	x11-libs/libXext
-	x11-libs/libXinerama
+	xinerama? ( x11-libs/libXinerama )
 	x11-libs/libdmx
 	x11-libs/libXau
 	x11-apps/sessreg"