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.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 37 insertions, 49 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/Manifest b/gnome-base/libbonobo/Manifest
index 2a3df5452534..d1d70e9bc5df 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST libbonobo-2.24.1.tar.bz2 1464385 RMD160 a6c49e74eda18bcd7a3ee842c2ae0c68502ef439 SHA1 9bd321ca9c7e6abba8d4f65b53940d7096e6724b SHA256 42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
-DIST libbonobo-2.24.2.tar.bz2 1435635 RMD160 105c25bab3b9e137ac86d49e233785ff0d008135 SHA1 c4ca4b5268581be3c263882b99940f8d787f6445 SHA256 95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf
 DIST libbonobo-2.24.3.tar.bz2 1354929 RMD160 c5c6320f4513c9db6ca2fd4e69ab993d4910396f SHA1 a77e471d967744af08815404834e03636d172151 SHA256 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe
 EBUILD libbonobo-2.24.1.ebuild 878 RMD160 4d5be1e5e243748d01cb853887c2e9bb838835c3 SHA1 2d8925439f855ecd875cee883ca6c115a4a6be53 SHA256 00162b141d10f22d710112d030257a9a26f7db1a44c72b1b40e153beaf4abd25
-EBUILD libbonobo-2.24.2.ebuild 1065 RMD160 f3f808c7fe49cce7126830be0944a099e7eaf0c0 SHA1 a5519d140fa560b5578a14afbf08e0fa0fdf8562 SHA256 e86ab6237f1b520bd66771dc875bb3d326d4124a73b6f10ef806173fb8910ffd
-EBUILD libbonobo-2.24.3.ebuild 1060 RMD160 1e24d804ae84f150aebd86c4a546ee2e36b96c18 SHA1 2a551d5d542dc0700998f2b361d8b859929eb57b SHA256 b33987eb600fb94ae54fa252a74a8c299a6238f68882b556d034f2302aa72aa8
-MISC ChangeLog 22387 RMD160 f8e5d67d873b73b3a80da62f89bc8cb404cb5ceb SHA1 6799e4799dfa724680292edab9f48d607cc2cce4 SHA256 913a0d92ca3c271e229a555fb116e4bbd0637be644590e2da928d6a6cfb1cebb
+EBUILD libbonobo-2.24.3.ebuild 1600 RMD160 4a89d23fb0846ff572c0f4008fd3a5a9965256df SHA1 0ed2779d7713b0e529e694504df9f025ed7932de SHA256 a42f6fbf8c5956c6202e493fbf08cfede7387beb6a5ff1967f04e10e5a67e6e5
+MISC ChangeLog 22838 RMD160 2f3074bde275e1ce3b59024f06d8bc0d6ad6099e SHA1 74327118afc38adac245a88060c3e56ad5278a8a SHA256 2e4838cb7a960faaf4955de80000fd7f0e0401767d417cdc4e226d718ac838f1
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLy+0ACgkQcsIHjyDViGRSwACZAZeNzUeAUWrdWQsEtROzgpa6
-pIcAn34B4uSzMrRu4IBOzUaXOHPFib91
-=WXJP
+iEYEARECAAYFAkyeCBEACgkQCaWpQKGI+9TiQgCcD22W0I67xRIriZ7VSD5efpD/
+xJAAn1WfAG351PKxEWFX2Km1CR6+WPN0
+=LB+L
 -----END PGP SIGNATURE-----
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