Version bump. Remove some old versions

(Portage version: 2.1.3_rc6)

6 files changed, 19 insertions, 93 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 04ad6c694fc6..4f0458b97220 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.182 2007/06/02 02:43:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.183 2007/06/30 17:45:38 leio Exp $
+
+*gnome-session-2.18.2 (30 Jun 2007)
+
+  30 Jun 2007; Mart Raudsepp <leio@gentoo.org> -gnome-session-2.16.1.ebuild,
+  -gnome-session-2.16.2.ebuild, +gnome-session-2.18.2.ebuild:
+  Version bump. Remove some old versions
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> gnome-session-2.16.3.ebuild:
   Marking gnome-session-2.16.3 ppc stable for bug #171107
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.16.1 b/gnome-base/gnome-session/files/digest-gnome-session-2.16.1
deleted file mode 100644
index 1f06f7ad7e3a..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.16.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
-RMD160 e75052892920e1c919aae1f6e53853c27b2e063f gentoo-splash.png 78064
-SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179 gentoo-splash.png 78064
-MD5 ef6f87cb3cc6012b212fa14353a63932 gnome-session-2.16.1.tar.bz2 677501
-RMD160 99ea2540b00aebc97bcd9a51387e4f621060401a gnome-session-2.16.1.tar.bz2 677501
-SHA256 6d6d21c6b9a4a2fe7bc288e8fdf36159444370973b4aa71dfc4c48bc0ad7cdf3 gnome-session-2.16.1.tar.bz2 677501
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.16.2 b/gnome-base/gnome-session/files/digest-gnome-session-2.16.2
deleted file mode 100644
index b0fb49f68d31..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.16.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
-RMD160 e75052892920e1c919aae1f6e53853c27b2e063f gentoo-splash.png 78064
-SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179 gentoo-splash.png 78064
-MD5 ed09f3b2d87f25e9de4a60b15c8df6c9 gnome-session-2.16.2.tar.bz2 681853
-RMD160 aedb9906c7968080b5e5db044097c9294112d09a gnome-session-2.16.2.tar.bz2 681853
-SHA256 7422d116b666080f73c2b8c49c18b1fca8455b2e0f9d0add67d8eb80417fc668 gnome-session-2.16.2.tar.bz2 681853
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.18.2 b/gnome-base/gnome-session/files/digest-gnome-session-2.18.2
new file mode 100644
index 000000000000..2ebce358c2dc
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.18.2
@@ -0,0 +1,6 @@
+MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
+RMD160 e75052892920e1c919aae1f6e53853c27b2e063f gentoo-splash.png 78064
+SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179 gentoo-splash.png 78064
+MD5 a717b193386f634bd316e2e5a9dab75a gnome-session-2.18.2.tar.bz2 716286
+RMD160 f20fb6d61a09db54d77b4c990e6ba0ab89dfe775 gnome-session-2.18.2.tar.bz2 716286
+SHA256 b1e127df3cf7f76c6ff7eaf5383803e4942c3f076aad805ec4aced7ca154d0b9 gnome-session-2.18.2.tar.bz2 716286
diff --git a/gnome-base/gnome-session/gnome-session-2.16.1.ebuild b/gnome-base/gnome-session/gnome-session-2.16.1.ebuild
deleted file mode 100644
index 01029fa6d569..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.16.1.ebuild
+++ /dev/null
@@ -1,77 +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/gnome-session/gnome-session-2.16.1.ebuild,v 1.11 2007/01/14 02:30:40 kloeri Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-		 branding? ( mirror://gentoo/gentoo-splash.png )"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="branding esd ipv6 tcpd"
-
-RDEPEND=">=dev-libs/glib-2.6
-		 >=x11-libs/gtk+-2.3.1
-		 >=gnome-base/libgnomeui-2.2
-		  =gnome-base/gnome-desktop-2*
-		 >=gnome-base/control-center-2.15.4
-		 >=x11-libs/libnotify-0.2.1
-		 >=gnome-base/gconf-2
-		 >=gnome-base/gnome-keyring-0.5.1
-		 || (
-				>=dev-libs/dbus-glib-0.71
-				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
-			)
-		 esd? ( >=media-sound/esound-0.2.26 )
-		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-		  x11-apps/xrdb
-		>=sys-devel/gettext-0.10.40
-		>=dev-util/pkgconfig-0.17
-		>=dev-util/intltool-0.35
-		gnome-base/gnome-common
-		!gnome-base/gnome-core"
-
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd) $(use_enable tcpd tcp-wrappers)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Patch for Gentoo Branding (bug #42687)
-	use branding && epatch ${FILESDIR}/${PN}-2.10.0-schema_defaults.patch
-
-	# Patch for optionalizing tcp-wrappers
-	epatch ${FILESDIR}/${PN}-2.12.0-optional-tcp-wrappers.patch
-
-	# Implement switch to enable/disable esound support. See bug #6920.
-	epatch ${FILESDIR}/${PN}-2.10.0-esd_switch.patch
-
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-
-	# Our own splash for world domination
-	if use branding ; then
-		insinto /usr/share/pixmaps/splash/
-		doins ${DISTDIR}/gentoo-splash.png
-	fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.16.2.ebuild b/gnome-base/gnome-session/gnome-session-2.18.2.ebuild
index 9c28583fec5d..a5c35092dda3 100644
--- a/gnome-base/gnome-session/gnome-session-2.16.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.18.2.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/gnome-session/gnome-session-2.16.2.ebuild,v 1.10 2007/02/09 23:29:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.18.2.ebuild,v 1.1 2007/06/30 17:45:38 leio Exp $
 
 inherit eutils gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="branding esd ipv6 tcpd"
 
 RDEPEND=">=dev-libs/glib-2.6
@@ -49,7 +49,10 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Patch for Gentoo Branding (bug #42687)
-	use branding && epatch ${FILESDIR}/${PN}-2.10.0-schema_defaults.patch
+	use branding && epatch ${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch
+
+	# Get rid of random asserts in tons of programs due to development versions
+	epatch ${FILESDIR}/${PN}-2.17.90-no-asserts.patch
 }
 
 src_install() {