Bump to 2.24.1. Build fixes with newer glib. Clean up old revisions.

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

6 files changed, 59 insertions, 105 deletions

diff --git a/gnome-base/libbonobo/ChangeLog b/gnome-base/libbonobo/ChangeLog
index cce903eedf7c..a83cfb63a4e4 100644
--- a/gnome-base/libbonobo/ChangeLog
+++ b/gnome-base/libbonobo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libbonobo
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.172 2008/12/17 14:32:55 ranger Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.173 2009/03/08 01:19:09 eva Exp $
+
+*libbonobo-2.24.1 (08 Mar 2009)
+
+  08 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  libbonobo-2.20.4.ebuild, -libbonobo-2.22.0.ebuild,
+  -libbonobo-2.22.0-r1.ebuild, +libbonobo-2.24.1.ebuild:
+  Bump to 2.24.1. Build fixes with newer glib. Clean up old revisions.
 
   17 Dec 2008; Brent Baude <ranger@gentoo.org> libbonobo-2.24.0.ebuild:
   Marking libbonobo-2.24.0 ppc64 for bug 244457
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
index 14d2e6c53e48..75915dfd2409 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.22.0.tar.bz2 1445318 RMD160 ad22f56ec15e663010721eab5f346421dba39863 SHA1 517e8f1ca24cea4ce77cdb1d7485c61da3096be2 SHA256 5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4
 DIST libbonobo-2.24.0.tar.bz2 1455370 RMD160 244d93c8904e8ee04a76a5426849bedac0732950 SHA1 bd5f9e1eda3107fed86baad8a3501fa8d12b9b51 SHA256 bc851f032359f2c27d8980d8b0c6ba0e40e06c0c501ed9b897c7dd1723b5ef55
-EBUILD libbonobo-2.20.4.ebuild 1171 RMD160 02fe4b6ca783ae6cabc055f4aa7d0cbf12c7a998 SHA1 4192e3ade9a770adb484cb19cabfe15ee47b495f SHA256 f601d1b2c5142e11984d7b9d05c28b5f7029e9b5dad0cb8709da4cdf4aa65b90
-EBUILD libbonobo-2.22.0-r1.ebuild 1497 RMD160 d5fb31cb8ecc39c05105319fceff9d767c2ac9e8 SHA1 5623a8c3e73b4692b382cb919f9a970b127fc560 SHA256 570601539d6f0261bbee8b5027c06d3c10de8184f1e8ddec9381e099dd1387a8
-EBUILD libbonobo-2.22.0.ebuild 1281 RMD160 a6b21113aecc52e38c24a4bd4bd6302185bce2b0 SHA1 c60f9cb4f1d051a60b10bda894e2de8d384e33c6 SHA256 4fd7ef4d5ac8b724387098c5abc8bd3e94a0b9fb55c81806edc942aba89c30d6
+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
-MISC ChangeLog 19584 RMD160 ef85153787f448d33663267236b8a9831f44c17a SHA1 644c4314cb9363229875cdfacd52df2d71621e44 SHA256 89c6b907f4c9c60c482a163a61da7d794d3810de2b162dd5fbf8c3679e60d8cf
+EBUILD libbonobo-2.24.1.ebuild 893 RMD160 5554b08e25c4e20e4388d0e766104c22b8cf79bb SHA1 f0c0f6269bb4b4f3ece53d6c270afd0a290bf999 SHA256 3ac9675a8f35126beb0b32d900366709cd35a7123615ee85de7b31a56c5c27cb
+MISC ChangeLog 19850 RMD160 2d32859a90d674319525028729b51f85dc94250b SHA1 70cebda8398bd4289a8f814f19a74474762af85d SHA256 ea73ce4a93d8b4e82c81f4af765fd72826a162e1014dcdd54e2ab08e5dbb6c02
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmzHRMACgkQ1fmVwcYIWAa3qACgvxiRcbFZ7BJufwoxXOkOEFaV
+AYMAnjzn0afNjGxM0ehvBZM/Uv8xts0o
+=50Q8
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/libbonobo/libbonobo-2.20.4.ebuild b/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
index 4333c97c34f1..fa0ce03b8aff 100644
--- a/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.10 2008/05/17 01:10:36 dang Exp $
+# $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
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="arm sh"
 IUSE="debug doc"
 
 RDEPEND=">=dev-libs/glib-2.8
diff --git a/gnome-base/libbonobo/libbonobo-2.22.0-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.22.0-r1.ebuild
deleted file mode 100644
index e5d7847dc0bd..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.22.0-r1.ebuild
+++ /dev/null
@@ -1,51 +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.22.0-r1.ebuild,v 1.2 2008/09/20 19:49:45 eva Exp $
-
-inherit gnome2 eutils autotools
-
-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
-	>=dev-util/gtk-doc-am-1.10
-	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"
-
-	# attach bonobo to the dbus session bus, fixes bug #236864
-	epatch "${FILESDIR}/${PN}-2.22.0-quit-with-dbus-session.patch"
-
-	eautoreconf
-}
diff --git a/gnome-base/libbonobo/libbonobo-2.22.0.ebuild b/gnome-base/libbonobo/libbonobo-2.22.0.ebuild
deleted file mode 100644
index c737cfeed48e..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.22.0.ebuild
+++ /dev/null
@@ -1,44 +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.22.0.ebuild,v 1.9 2008/11/13 19:03:47 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
-	>=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
-	>=dev-util/gtk-doc-am-1.10
-	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"
-}
diff --git a/gnome-base/libbonobo/libbonobo-2.24.1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.1.ebuild
new file mode 100644
index 000000000000..a2a216448398
--- /dev/null
+++ b/gnome-base/libbonobo/libbonobo-2.24.1.ebuild
@@ -0,0 +1,33 @@
+# 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.24.1.ebuild,v 1.1 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc"
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=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)"
+}