Don't build tests and examples when not needed (bug #226223), also fix intltoolize broken file as my local check says it's broken; finally RESTRICT tests since they tend to fail on several ways even manually compiling, upstream is aware but they don't seem to care, probably because libbonobo is deprecated (bug #288689). Remove old testing.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 32 insertions, 42 deletions

diff --git a/gnome-base/libbonobo/ChangeLog b/gnome-base/libbonobo/ChangeLog
index 304dd4f23111..e364fa3b6611 100644
--- a/gnome-base/libbonobo/ChangeLog
+++ b/gnome-base/libbonobo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.191 2010/09/11 18:39:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.192 2010/09/25 14:32:42 pacho Exp $
+
+  25 Sep 2010; Pacho Ramos <pacho@gentoo.org> -libbonobo-2.24.2.ebuild,
+  libbonobo-2.24.3.ebuild:
+  Don't build tests and examples when not needed (bug #226223), also fix
+  intltoolize broken file as my local check says it's broken; finally
+  RESTRICT tests since they tend to fail on several ways even manually
+  compiling, upstream is aware but they don't seem to care, probably because
+  libbonobo is deprecated (bug #288689). Remove old testing.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> libbonobo-2.24.3.ebuild:
   Marked ppc for bug #324077.
diff --git a/gnome-base/libbonobo/libbonobo-2.24.2.ebuild b/gnome-base/libbonobo/libbonobo-2.24.2.ebuild
deleted file mode 100644
index 50eb04784bc7..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.24.2.ebuild
+++ /dev/null
@@ -1,39 +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.2.ebuild,v 1.5 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 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-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)"
-}
-
-src_test() {
-	# Pass tests with FEATURES userpriv, see bug #288689
-	unset ORBIT_SOCKETDIR
-	emake check || die
-}
diff --git a/gnome-base/libbonobo/libbonobo-2.24.3.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3.ebuild
index b8acf1d9f405..65283d4fb99d 100644
--- a/gnome-base/libbonobo/libbonobo-2.24.3.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.24.3.ebuild
@@ -1,7 +1,8 @@
 # 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.3.ebuild,v 1.8 2010/09/11 18:39:22 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.24.3.ebuild,v 1.9 2010/09/25 14:32:42 pacho Exp $
 
+EAPI="2"
 inherit gnome2
 
 DESCRIPTION="GNOME CORBA framework"
@@ -10,7 +11,7 @@ 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"
+IUSE="debug doc examples test"
 
 RDEPEND=">=dev-libs/glib-2.14
 	>=gnome-base/orbit-2.14.0
@@ -28,10 +29,30 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
+# 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)"
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die
+
+	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
+}
+
 src_test() {
 	# Pass tests with FEATURES userpriv, see bug #288689
 	unset ORBIT_SOCKETDIR