Clean up old revisions.

Package-Manager: portage-2.2_rc42/cvs/Linux i686

5 files changed, 8 insertions, 145 deletions

diff --git a/gnome-base/libbonobo/ChangeLog b/gnome-base/libbonobo/ChangeLog
index aa4b19bc1b68..5339fb07d645 100644
--- a/gnome-base/libbonobo/ChangeLog
+++ b/gnome-base/libbonobo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libbonobo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.178 2009/05/10 14:58:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.179 2009/10/05 14:55:46 eva Exp $
+
+  05 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libbonobo-2.20.4.ebuild,
+  -files/libbonobo-2.22.0-quit-with-dbus-session.patch,
+  -libbonobo-2.24.0.ebuild:
+  Clean up old revisions.
 
   10 May 2009; Jeroen Roovers <jer@gentoo.org> libbonobo-2.24.1.ebuild:
   Stable for HPPA (bug #266671).
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
index db6c941d6f04..b7453d596c25 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -1,9 +1,4 @@
-AUX libbonobo-2.22.0-quit-with-dbus-session.patch 2058 RMD160 40f78ee19accf3c60e8b667ecfc97931be7c6422 SHA1 6f8a5cd9a24bf777bb4aee93a2203e1ccbe3abf1 SHA256 1604bcd367f2fda9e585ad47955c26c501f26f7b2f29db12b08547f941321bfc
-DIST libbonobo-2.20.4.tar.bz2 1446532 RMD160 9d417058f20154daabf9885e4606f87ee1e0055a SHA1 15928d04861eedda6377b83375e9de66b6683bbe SHA256 81796573e99c2a70255684e49d3326d2341cd6dd918082e53fdf9792c3f9168a
-DIST libbonobo-2.24.0.tar.bz2 1455370 RMD160 244d93c8904e8ee04a76a5426849bedac0732950 SHA1 bd5f9e1eda3107fed86baad8a3501fa8d12b9b51 SHA256 bc851f032359f2c27d8980d8b0c6ba0e40e06c0c501ed9b897c7dd1723b5ef55
 DIST libbonobo-2.24.1.tar.bz2 1464385 RMD160 a6c49e74eda18bcd7a3ee842c2ae0c68502ef439 SHA1 9bd321ca9c7e6abba8d4f65b53940d7096e6724b SHA256 42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
-EBUILD libbonobo-2.20.4.ebuild 1112 RMD160 74bfcccfdbcc4d06a836e41d2e1cdae023ca1665 SHA1 15bfaba492698a291f84a4390530892d5b5d9fe1 SHA256 b7f242e0cf6f37909ac737823d79a485becef66af6089192cccf0dd7f8ce1177
-EBUILD libbonobo-2.24.0.ebuild 1301 RMD160 dcd1f01e045eadd4c1d04b9bb3fe1bdf99131daa SHA1 873347b09939b6fdbd33e836c65baf44596b621d SHA256 e75b3c77bd615e2b46a29b01ae55ffee6642806258c3db8e24918ae7f2b16f9d
 EBUILD libbonobo-2.24.1.ebuild 883 RMD160 48ddb4c78f168d1a0d7bc9053b8ad7228c716de1 SHA1 90cd8dfa6cd3de1c38b2c79f535f77e3831f9162 SHA256 84e044df00adc9da83e47aab3c6ea68792a4547b8b6f86d16736633440da5140
-MISC ChangeLog 20389 RMD160 8f80746adb1717709d8cb1f7f681cb0d833b2015 SHA1 02efa1007c3d0583c3779f26b70844c064b05552 SHA256 9ca62520a0a78eb797e8124af4c36e09f576232188f58f9960f28b67fdacaaa9
+MISC ChangeLog 20582 RMD160 54dacf71dd73433a91b8ae9cc9feee5d1e9c9611 SHA1 c8e5a792babe9bbe4a01d724543425b9dd4367ce SHA256 b23e669ce7156278dd99262178bd5a8ad495c246366645ccb2d87a82fc9e91a2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/libbonobo/files/libbonobo-2.22.0-quit-with-dbus-session.patch b/gnome-base/libbonobo/files/libbonobo-2.22.0-quit-with-dbus-session.patch
deleted file mode 100644
index 43a8f185aee4..000000000000
--- a/gnome-base/libbonobo/files/libbonobo-2.22.0-quit-with-dbus-session.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up libbonobo-2.22.0/activation-server/activation-server-main.c.get-on-d-bus libbonobo-2.22.0/activation-server/activation-server-main.c
---- libbonobo-2.22.0/activation-server/activation-server-main.c.get-on-d-bus	2008-04-29 14:18:57.000000000 -0400
-+++ libbonobo-2.22.0/activation-server/activation-server-main.c	2008-04-29 14:19:00.000000000 -0400
-@@ -54,6 +54,8 @@
- 
- #include <glib/gstdio.h>
- 
-+#include <dbus/dbus-glib-lowlevel.h>
-+
- static gboolean        server_threaded = FALSE;
- static glong           server_guard_depth = 0;
- static GStaticRecMutex server_guard = G_STATIC_REC_MUTEX_INIT;
-@@ -398,6 +400,8 @@ main (int argc, char *argv[])
- 	const gchar                  *debug_output_env;
- #endif
- 	GError                       *error = NULL;
-+        DBusConnection               *connection;
-+        DBusError                     bus_error;
- 
- #ifdef HAVE_SETSID
-         /*
-@@ -535,6 +539,18 @@ main (int argc, char *argv[])
- 
- 	od_finished_internal_registration (); 
- 
-+        dbus_error_init (&bus_error);
-+        connection = dbus_bus_get (DBUS_BUS_SESSION, &bus_error);
-+
-+        if (dbus_error_is_set (&bus_error)) {
-+                g_warning ("could not associate with desktop session: %s",
-+                           bus_error.message);
-+                connection = NULL;
-+        } else {
-+                dbus_connection_setup_with_g_main (connection,
-+                                                   g_main_loop_get_context (main_loop));
-+        }
-+
-         if (getenv ("BONOBO_ACTIVATION_DEBUG") == NULL)
-                 chdir ("/");
- 
-diff -up libbonobo-2.22.0/configure.in.get-on-d-bus libbonobo-2.22.0/configure.in
---- libbonobo-2.22.0/configure.in.get-on-d-bus	2008-04-29 14:18:47.000000000 -0400
-+++ libbonobo-2.22.0/configure.in	2008-04-29 14:19:06.000000000 -0400
-@@ -121,6 +121,8 @@ PKG_CHECK_MODULES(SERVER, \
- 	gmodule-2.0 >= 2.0.1 \
- 	ORBit-2.0 >= 2.4.0 \
- 	ORBit-CosNaming-2.0 >= 2.4.0 \
-+	dbus-1 >= 1.0.0 \
-+	dbus-glib-1 >= 0.74 \
- 	libxml-2.0 >= 2.4.20)
- AC_SUBST(SERVER_LIBS)
- AC_SUBST(SERVER_CFLAGS)
diff --git a/gnome-base/libbonobo/libbonobo-2.20.4.ebuild b/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
deleted file mode 100644
index fa0ce03b8aff..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.20.4.ebuild,v 1.11 2009/03/08 01:19:09 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME CORBA framework"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=gnome-base/orbit-2.14.0
-	>=dev-libs/libxml2-2.4.20
-	>=dev-libs/popt-1.5
-	sys-devel/flex
-	!gnome-base/bonobo-activation"
-DEPEND="${RDEPEND}
-	  x11-apps/xrdb
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug bonobo-activation-debug)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	sed -i -e '/DISABLE_DEPRECATED/d' \
-		"${S}/activation-server/Makefile.am" "${S}/activation-server/Makefile.in" \
-		"${S}/bonobo/Makefile.am" "${S}/bonobo/Makefile.in"
-	sed -i -e 's:-DG_DISABLE_DEPRECATED ::g' \
-		"${S}/tests/test-activation/Makefile.am" "${S}/tests/test-activation/Makefile.in"
-}
diff --git a/gnome-base/libbonobo/libbonobo-2.24.0.ebuild b/gnome-base/libbonobo/libbonobo-2.24.0.ebuild
deleted file mode 100644
index 48c7e8b80af0..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.24.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.24.0.ebuild,v 1.6 2008/12/17 14:32:55 ranger Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME CORBA framework"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="debug doc"
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=gnome-base/orbit-2.14.0
-	>=dev-libs/libxml2-2.4.20
-	>=sys-apps/dbus-1.0.0
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/popt-1.5
-	!gnome-base/bonobo-activation"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	x11-apps/xrdb
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug bonobo-activation-debug)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	sed -i -e '/DISABLE_DEPRECATED/d' \
-		"${S}/activation-server/Makefile.am" "${S}/activation-server/Makefile.in" \
-		"${S}/bonobo/Makefile.am" "${S}/bonobo/Makefile.in" \
-		"${S}/bonobo-activation/Makefile.am" "${S}/bonobo-activation/Makefile.in"
-
-	sed -i -e 's:-DG_DISABLE_DEPRECATED ::g' \
-		"${S}/tests/test-activation/Makefile.am" "${S}/tests/test-activation/Makefile.in"
-}