Clean up old revisions.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

7 files changed, 18 insertions, 248 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 989c2ccb9f89..7c53695bf609 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.281 2010/10/07 21:00:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.282 2010/10/08 23:30:29 eva Exp $
+
+  08 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-desktop-2.24.2-background.patch,
+  -gnome-desktop-2.24.3-r1.ebuild, -gnome-desktop-2.26.3.ebuild,
+  -gnome-desktop-2.28.1-r1.ebuild, -gnome-desktop-2.28.2.ebuild:
+  Clean up old revisions.
 
   07 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   gnome-desktop-2.30.2.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 3a85f7d53571..f7d060d73a7d 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,15 +1,17 @@
-AUX gnome-desktop-2.24.2-background.patch 886 RMD160 032349d5797ce2333a961a214bf078138ab16010 SHA1 6e271f942e130cf1f5020d1d7ab9f64f81903fc0 SHA256 cbe72e1e9f8b4891cbbe321ab7f6e16ca98fbdf05a5c833dbf5dfb8135173457
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-desktop-2.28.2-slideshow-fix.patch 532 RMD160 1375805b210900059169bf590dacac3116fad16d SHA1 050ad2cd4ffb7096f5de0bfb1b78f1d5dfb82ebc SHA256 0d0bc1b3788ebba0d8ed78e217117f5687772f976791020a15157c9fee53ba33
-DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c7826418401459ffbf0b9 SHA1 2ebbf2475bb741131b523819fb46e71d4489fa79 SHA256 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89
-DIST gnome-desktop-2.26.3.tar.bz2 3107987 RMD160 04e0de4e9e31e2994e1a3220f2183f25ac780399 SHA1 5b1090354ee775392d8faf4ee667a84c9c7a9e79 SHA256 37b7278d3132bb97f70ba2d5c5c06f5a219433d886e3f85e9a16c1f05c3726b7
-DIST gnome-desktop-2.28.1.tar.bz2 1639948 RMD160 4bcbb7e3c743e864afa1895c363427586b70be19 SHA1 27909d67d4f8d1116d106ef65f612cf673d6802a SHA256 21bb7d3b4aa9b452ecf1b27d6fe61b824f60f76d7c5f3b78b59f0fd3eedfd461
 DIST gnome-desktop-2.28.2.tar.bz2 1611325 RMD160 1d7291a38f981887c61564ad0ad90395b286b18f SHA1 21c25d1747f6db87b2c8c8fab8090f160c638687 SHA256 0d1d51d8aa04d148bfa673496061a675473fac3a9d21d2046fd93b05475dec11
 DIST gnome-desktop-2.30.2.tar.bz2 1665808 RMD160 bcdcc3c0483cfb438b2ae30c8f8a840a39967dc5 SHA1 92ace7dd3c017a71c9ac90d2df486ebc2ba3d2ba SHA256 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8
-EBUILD gnome-desktop-2.24.3-r1.ebuild 1927 RMD160 4ae164bff5c4501063d3f61575b6a2bd8ca9facf SHA1 d75a8295aa2dff133764c84c6912453d552a54dd SHA256 5b06a21e9f1d7e1f11ba9f8d3b39e927fb2f1ba822f0c03cc4b50d1af927cb8a
-EBUILD gnome-desktop-2.26.3.ebuild 1671 RMD160 5afe23650cc8742d026b3cea9b60b3824e8eb7b3 SHA1 6ce753801a0507b909a6b3ec6100447ffb296de5 SHA256 797a23af69261e97642dce9d3119c5b35a456d7fec1c6257703c8b82efdd32a6
-EBUILD gnome-desktop-2.28.1-r1.ebuild 1288 RMD160 335848cb3b412f2e311c0290e4f10225516355c1 SHA1 9e7fdb9ee30e93a4d21314cee8c43900ce4501cd SHA256 a240b7d6318bb7054e3dfb530acd5bec0917307d692d44f2840d38072b77dab0
 EBUILD gnome-desktop-2.28.2-r1.ebuild 1631 RMD160 e532ac29aa7f48d648756086184496f1a030448e SHA1 19232c2bcb62e4b7e129fde2c6c1a1d952bfa226 SHA256 89cee32c74112bfcc250065df61d2f7e9da4bc21581857e43e5e6527c362cba8
-EBUILD gnome-desktop-2.28.2.ebuild 1519 RMD160 03323f9ce036df6d28e5bafa2491100bbe04d79b SHA1 c7fd9121a7e118f21f4bdd66c1918ce7ccc787a8 SHA256 b8ecb0bbf47da0d5faec0eff835c107fd1c42de6f6a534c453b17e61041badb5
 EBUILD gnome-desktop-2.30.2.ebuild 1739 RMD160 4714f9cfb7f3a2c19665a61c7bc89d7e55ed0344 SHA1 79e452ac53191d5bded4e7c4f53aeac796479b88 SHA256 de6233dcb1407f51309d5d0c2cf83a6faf0da29e9272be880e00eab1a7beef23
-MISC ChangeLog 36509 RMD160 39e93cdb8d97d8e6860e0d6593bf38f3fca28da6 SHA1 bff41d25b4ebf96c5b91820d5fc9dfc8cc7b36d5 SHA256 f7807dff4b06d27322f55cda541beb458d8883dbeacc8ff18a125aa5b36cd1f1
+MISC ChangeLog 36762 RMD160 f7445774b82779d325a1f9afcd3fe46b58d7dcfb SHA1 1ab2ed1f8ee24a31208b6965467f7fd180dd1444 SHA256 902d0b05568a62d588dd9e52af024bbb0e6ae7b539f2e25dfc149f0fd9481f54
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyvqZsACgkQ1fmVwcYIWAbqDwCdFdQtz4k2PBvuiqzXxSZmNVcU
+40cAoIO4+wGAUYJa1jq4nfqr0PBC4nCT
+=eZwx
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch
deleted file mode 100644
index 4c5fb8fdee16..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Do not load background if not needed
-#
-# https://bugs.gentoo.org/show_bug.cgi?id=251350
-# http://bugzilla.gnome.org/show_bug.cgi?id=564909
---- a/libgnome-desktop/gnome-bg.c	2008-12-17 10:42:28.000000000 -0800
-+++ b/libgnome-desktop/gnome-bg.c	2008-12-17 10:44:33.000000000 -0800
-@@ -284,6 +284,7 @@
- 	GnomeBGColorType ctype;
- 	GdkColor c1, c2;
- 	GnomeBGPlacement placement;
-+	gboolean enabled;
- 
- 	g_return_if_fail (GNOME_IS_BG (bg));
- 	g_return_if_fail (client != NULL);
-@@ -291,7 +292,9 @@
- 	/* Filename */
- 	filename = NULL;
- 	tmp = gconf_client_get_string (client, BG_KEY_PICTURE_FILENAME, NULL);
--	if (tmp != NULL && *tmp != '\0') {
-+	enabled = gconf_client_get_bool (client, BG_KEY_DRAW_BACKGROUND, NULL);
-+
-+	if (tmp != NULL && *tmp != '\0' && enabled) {
- 		if (g_utf8_validate (tmp, -1, NULL) &&
- 		    g_file_test (tmp, G_FILE_TEST_EXISTS)) {
- 			filename = g_strdup (tmp);
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild
deleted file mode 100644
index 8597f52b79c6..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild,v 1.10 2010/07/20 01:50:19 jer Exp $
-
-inherit eutils autotools gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-# FIXME: Python deps are needed for gnome-about but not
-# listed in configure.ac
-RDEPEND=">=dev-libs/libxml2-2.4.20
-	>=x11-libs/gtk+-2.11.3
-	>=dev-libs/glib-2.15.4
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2.6
-	>=x11-libs/startup-notification-0.5
-	>=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14
-	>=dev-python/libgnome-python-2.22"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	gnome-base/gnome-common"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Do not load background if not needed, bug #251350
-	epatch "${FILESDIR}/${PN}-2.24.2-background.patch"
-
-	# Broken intltool-0.40.6 used for 2.24.3, re-intltoolize
-	intltoolize --force --automake --copy || die "intltoolize failed"
-	eautomake
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.24, please"
-	ewarn "make sure you run revdep-rebuild at the end of the upgrade."
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild
deleted file mode 100644
index e28662324eb1..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild,v 1.11 2010/07/20 01:50:19 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.14.0
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.5"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
-PDEPEND=">=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14
-	>=dev-python/libgnome-python-2.22"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gnome-distributor=Gentoo
-		--disable-scrollkeeper
-		--disable-static"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-2.so.7
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-2.so.7
-	ewarn
-	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.25, please"
-	ewarn "make sure you run revdep-rebuild at the end of the upgrade."
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.28.1-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.28.1-r1.ebuild
deleted file mode 100644
index 29782d4f1cbc..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.28.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.28.1-r1.ebuild,v 1.3 2010/07/20 01:50:19 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.14.0
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.5"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
-PDEPEND=">=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gnome-distributor=Gentoo
-		--disable-scrollkeeper
-		--disable-static"
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.28.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.28.2.ebuild
deleted file mode 100644
index 8fcfeee382cb..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.28.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.28.2.ebuild,v 1.3 2010/07/20 01:50:19 jer Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.14.0
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.5"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
-PDEPEND=">=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gnome-distributor=Gentoo
-		--disable-scrollkeeper
-		--disable-static"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}