Version bump for Gnome 2.32

(Portage version: 2.1.9.14/cvs/Linux x86_64)

3 files changed, 57 insertions, 34 deletions

diff --git a/gnome-base/libbonobo/ChangeLog b/gnome-base/libbonobo/ChangeLog
index 9e9576645cf7..3acbf9e59d6d 100644
--- a/gnome-base/libbonobo/ChangeLog
+++ b/gnome-base/libbonobo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libbonobo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.193 2010/10/07 22:19:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.194 2010/10/12 18:20:37 pacho Exp $
+
+*libbonobo-2.32.0 (12 Oct 2010)
+
+  12 Oct 2010; Pacho Ramos <pacho@gentoo.org> -libbonobo-2.24.1.ebuild,
+  +libbonobo-2.32.0.ebuild:
+  Version bump for Gnome 2.32: Port to GDBus and translation updates.
 
   07 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   libbonobo-2.24.3.ebuild:
diff --git a/gnome-base/libbonobo/libbonobo-2.24.1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.1.ebuild
deleted file mode 100644
index 8a086c4dbf9d..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.24.1.ebuild
+++ /dev/null
@@ -1,33 +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/libbonobo/libbonobo-2.24.1.ebuild,v 1.6 2010/07/20 01:52:53 jer Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME CORBA framework"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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)"
-}
diff --git a/gnome-base/libbonobo/libbonobo-2.32.0.ebuild b/gnome-base/libbonobo/libbonobo-2.32.0.ebuild
new file mode 100644
index 000000000000..4bf969bc4f45
--- /dev/null
+++ b/gnome-base/libbonobo/libbonobo-2.32.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.32.0.ebuild,v 1.1 2010/10/12 18:20:37 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME CORBA framework"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="debug doc examples test"
+
+RDEPEND=">=dev-libs/glib-2.25.7
+	>=gnome-base/orbit-2.14.0
+	>=dev-libs/libxml2-2.4.20
+	>=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 )"
+
+# Tests are broken in several ways as reported in bug #288689 and upstream
+# doesn't take care since libbonobo is deprecated.
+RESTRICT="test"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable debug bonobo-activation-debug)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if ! use test; then
+		# don't waste time building tests, bug #226223
+		sed 's/tests//' -i Makefile.am Makefile.in || die
+	fi
+
+	if ! use examples; then
+		sed 's/samples//' -i Makefile.am Makefile.in || die
+	fi
+}