Fix for parallel build, #354495; Fix for forced as-needed with introspection, #379543; removed src_test as it duplicates the default function

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

8 files changed, 91 insertions, 36 deletions

diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog
index 864a894f1442..8da322b104ba 100644
--- a/dev-libs/libindicate/ChangeLog
+++ b/dev-libs/libindicate/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libindicate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.18 2011/08/20 10:39:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.19 2011/08/28 17:36:11 jlec Exp $
+
+  28 Aug 2011; Justin Lecher <jlec@gentoo.org> libindicate-0.2.3-r1.ebuild,
+  libindicate-0.4.4.ebuild, libindicate-0.4.4-r1.ebuild,
+  libindicate-0.4.4-r2.ebuild,
+  +files/libindicate-0.4.4-as-needed-introspection.patch,
+  +files/libindicate-0.4.4-parallel.patch:
+  Fix for parallel build, #354495; Fix for forced as-needed with introspection,
+  #379543; removed src_test as it duplicates the default function
 
   20 Aug 2011; Justin Lecher <jlec@gentoo.org> libindicate-0.4.4-r2.ebuild,
   metadata.xml:
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index 6443389e8a38..20d6a9411858 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA512
 
 AUX libindicate-0.2.3-optional-gtk-support.patch 5038 RMD160 afae6044bc558459b779838aa88e414d2543aff0 SHA1 b9078296d800d1ea41116b6854af833cdd08330f SHA256 856b132e2d080dcfcc65faf7d177ef59e4fe7f2e488bcdbfded8422e4c68feb9
+AUX libindicate-0.4.4-as-needed-introspection.patch 1263 RMD160 c98b7d98460f50c2f65e25013fc4275356b0e0c9 SHA1 a6071853666aed548592f0245b3a7a4e88cdbff0 SHA256 9ca599b426569129b88367d12a27859ca6398935d590e2aef561c88c4372cda4
 AUX libindicate-0.4.4-fix-aclocal.patch 181 RMD160 81fbc27796faba28141e2efdd8aefd402c6f3f92 SHA1 afef17326571a4c17404690e06110e611b0e3f1c SHA256 7d34560b93dc25b1bfb89aa9ea726bd9f70cd3107eb21e0692aaa29c9b369c96
 AUX libindicate-0.4.4-fix-introspection.patch 3690 RMD160 d64ff2fb723ba13fc7418e9c63889aff0759b85c SHA1 f623a0929190da9caef0e0b569c96ca50c12daba SHA256 678176349d2121cc4d2fc0846f8b0609af1615beb6fac01717e6f01ddef10e8d
 AUX libindicate-0.4.4-fix-out-of-source-build.patch 1322 RMD160 f27759c12ce602a39005613878ea37383f63cf74 SHA1 9cc7758aa0dd627e4f5db935a2b0a0db192ec793 SHA256 7be0fa28278cc69bee72f545667ecbf966f0d36ed5db2b5dc6e5d048a484710d
@@ -11,21 +12,22 @@ AUX libindicate-0.4.4-optional-doc.patch 1187 RMD160 969b672f293d843f978ab0079e5
 AUX libindicate-0.4.4-optional-examples.patch 310 RMD160 08c649cbafbc742562179e09d2ecb3a52f790144 SHA1 908d5812dbaee1fd7f9a03e60864815af7d84e0f SHA256 cdb14c7848ef1b4cb828a2e865d7945116b21ad6890bd41b7da5320ff3994a63
 AUX libindicate-0.4.4-optional-gtk.patch 1265 RMD160 aa1b20934bc3ea277709772755ad3428269f5cf2 SHA1 8f3d3325365b4b96570a93530c8f8aea9295b617 SHA256 95a3678ac1f6fc7b58544c16ddf0a7a5d98321e07b736ff3d4feb530a8a0bcf2
 AUX libindicate-0.4.4-optional-mono-example.patch 321 RMD160 70cdade62938796b70a6c7a0696b6976b8f8d93c SHA1 7481c1a7a0d478f638eefdc79d05331581321406 SHA256 dc68fd7ba8f03618f2f6f369652ba7a6f72b921190e751667afcbf70be393f5f
+AUX libindicate-0.4.4-parallel.patch 1181 RMD160 2ca045264c2f9723cc42323892b86cbb84403909 SHA1 a2a281a858fb563c2621b46ecceddb31ed2c71aa SHA256 6676f636674ad3512e1d68f59adab4245e0afa3bd80a2a50cb8fc07c8fbe1b2d
 AUX libindicate-0.4.91-fix-python-version.patch 1056 RMD160 0a82d98948ed932ab22acecd3f70b7e51f7b2e50 SHA1 ff878335e5794ae148522417559fb3280bac09bb SHA256 cbe1db86aa486e1ce9357aa27c1ff112acd2c0eac9701b218efdb1433b176845
 AUX libindicate-0.4.91-optional-mono.patch 1246 RMD160 e8951cf8978eeb0d25d7f438d92761d494d9dab0 SHA1 d411e61cd8cf359e5df9860a46111fe7679de7a8 SHA256 ecb72e7e7ee241d5ea3b31473681f6960fc9e7bb48b681b4e12e50761a9750d5
 AUX libindicate-0.4.91-optional-python.patch 1495 RMD160 6eb24678f376c4185453d57f684d1d82edb8984b SHA1 8cf3346e24b940e6d609553151070753d6031937 SHA256 121380055f5aa178446c722c9eb81104f9e9c3dac016ff1b0a0254ebf4e34aec
 DIST libindicate-0.2.3.tar.gz 426971 RMD160 9aa7a2ad95a232db23739d45497b0e5746cdf2a5 SHA1 46ff8ff837bac175c72f3ee66761d1f549a71547 SHA256 590dff54608b8c6eddf691f588f70f8b25da8f8f061da3696019da38abc356bf
 DIST libindicate-0.4.4.tar.gz 473110 RMD160 2e926172d8b0a2604f44b2b42ee70f3a1fc837f9 SHA1 0dc3ad4c35581adea9d9ae89daacf820c764f24a SHA256 20d7ac6fe02b28283c619fe583d5b0fb8a473bb17ef020c2fa40c53f72e315ce
-EBUILD libindicate-0.2.3-r1.ebuild 1590 RMD160 3ee342b28b927908d71fa48a44ff4f1cb0009188 SHA1 c8013f6672e73192dee5ac6f52a74fd769cb8b79 SHA256 310662be5618526226d721bfd440da3e071b3496652096fb4c2e99cfa9efcb43
-EBUILD libindicate-0.4.4-r1.ebuild 2744 RMD160 7078c8b61cc7a3cc90ca80d8bbd9218149306f99 SHA1 4a693e812d5972068ed107ed47dd4aec8cf0e2bd SHA256 4b71becf24613d54b10ec7883ff0dfbe621930395a92d7c3e2016d7b7c07ae7d
-EBUILD libindicate-0.4.4-r2.ebuild 3083 RMD160 0e0d0e2e5bdec8c3979bb2ee0f48fa59761b7cb3 SHA1 a6abe2d18d56811e59d741a96b3c2f7596750de7 SHA256 c23a681ad1be06000b2c26b1151af2fcc2f0e479efd10a27a6e4a848ac6e6b04
-EBUILD libindicate-0.4.4.ebuild 2618 RMD160 5e9dab16b468a5ec57438f53e1a18e2c1eab332e SHA1 bc75f6e712fc39de5d17841cee52daeb73ecc17e SHA256 3b4f58a046f6c9a84a0331ee4dc54814201b3e22e365bae0cd9e720a381be83a
-MISC ChangeLog 4600 RMD160 77c5a8194712d6ae480c0c2e3be7e702f03e6850 SHA1 ff7f054147b8f2cb7b2c7912a8dc86ccfc8834f3 SHA256 df9190acac62e3850f67bbd7bfa1838e7d71ef1d4ea05abbd794c1f42f0c76f5
+EBUILD libindicate-0.2.3-r1.ebuild 1531 RMD160 c72d2adb59950c05f1e1951ae7f56ffe4fd12e55 SHA1 bf13165cf6198cef89064d0d9f78e4f87b536ee3 SHA256 c12f08819742a2019ebcf8517d11f3b77d4a97194d51542e76d2a2b18f52431a
+EBUILD libindicate-0.4.4-r1.ebuild 2655 RMD160 36c8ceded17ab17e7a183edc32d0e7bf01c598bf SHA1 b57e2fdd39c3338bf0e9a259f30839873ef36482 SHA256 3f64c3809a9fa3d225821953c02bf0628be33c7625c3d7cea45f4e7bf7845646
+EBUILD libindicate-0.4.4-r2.ebuild 3169 RMD160 954d1a7e5f7854f4f47c70dc19b413bb6e2398c6 SHA1 6acafa90d27bfec3f73a94e9873935a378f51f86 SHA256 3b8b5cbbd71c2e4f78f6e72e8b4b022d6e468fdf873389abc8ded106f6429d1d
+EBUILD libindicate-0.4.4.ebuild 2528 RMD160 230c3f2616f024424d9c113e36a974db1acc6fd8 SHA1 18b3734a30fd61622b59affa77566e385a095614 SHA256 8bc79dd884897e3c548e091d4a39f88459b8a217bdce6db39c650c641c364786
+MISC ChangeLog 5012 RMD160 db048564dfc2ab25610d9f2a351e439e3be63df0 SHA1 5f096b92656e68cb02cafd6b2bd030721fd9a990 SHA256 eb761f79740080d9cb56bc06e892bc0fd491e31e70f69680c2fddb99786c1943
 MISC metadata.xml 272 RMD160 808eb26860968f7e008c2b3e8385682df1e5271e SHA1 e69c7b5e3cfed8f851ddaa8450af20bee3d0467c SHA256 d3c25ef05517a4f35cde224df9a556894984337471b4616190c9587975b5a673
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5Pju0ACgkQgAnW8HDreRbg6ACgj8EaIFR02WyEAK2GlpOz6BXR
-szwAnjesfeThp+bA1nSqblLwc1Ag49La
-=d4/s
+iEYEAREKAAYFAk5afJcACgkQgAnW8HDreRb6dgCgrg8DcjfYFbvs96Q4cZ+eHTT5
+GX0An1jb9+yPj3j1Hm0s/OFC9rcoBoay
+=9RPi
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch b/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch
new file mode 100644
index 000000000000..fda48a86f65c
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch
@@ -0,0 +1,30 @@
+ libindicate-gtk/Makefile.am |    2 +-
+ libindicate/Makefile.am     |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am
+index 9e73402..4527996 100644
+--- a/libindicate-gtk/Makefile.am
++++ b/libindicate-gtk/Makefile.am
+@@ -56,7 +56,7 @@ Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
+ 		--include=GLib-2.0 \
+ 		--include=GdkPixbuf-2.0 \
+ 		--include=Indicate-0.2 \
+-		--library=indicate-gtk \
++		--library=libindicate-gtk.la \
+ 		--add-include-path=$(top_builddir)/libindicate \
+ 		$(LIBINDICATEGTK_CFLAGS) -I$(srcdir) -I$(top_srcdir) \
+ 		--output Indicate-Gtk-0.2.gir $(irscanner_headers) \
+diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
+index 3703299..22cf1e2 100644
+--- a/libindicate/Makefile.am
++++ b/libindicate/Makefile.am
+@@ -119,7 +119,7 @@ Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
+ 		--include=GObject-2.0 \
+ 		--include=GLib-2.0 \
+ 		--include=Dbusmenu-Glib-0.2 \
+-		--library=indicate \
++		--library=libindicate.la \
+ 		$(LIBINDICATE_CFLAGS) -I $(srcdir) -I $(top_srcdir) \
+ 		--output Indicate-0.2.gir $(irscanner_headers) \
+ 		$(addprefix --c-include=libindicate/, $(indicate_headers))
diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch b/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch
new file mode 100644
index 000000000000..bf0828e5ac7b
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch
@@ -0,0 +1,30 @@
+ libindicate-gtk/Makefile.am |    2 +-
+ libindicate/Makefile.am     |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am
+index 4527996..3fd9c5e 100644
+--- a/libindicate-gtk/Makefile.am
++++ b/libindicate-gtk/Makefile.am
+@@ -47,7 +47,7 @@ BUILT_GIRSOURCES =
+ 
+ irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_gtk_headers))
+ 
+-Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
++Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate-gtk.la Makefile.am
+ 	$(INTROSPECTION_SCANNER) \
+ 		-v --namespace Indicate \
+ 		--nsversion=0.2 \
+diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
+index 22cf1e2..8712b4e 100644
+--- a/libindicate/Makefile.am
++++ b/libindicate/Makefile.am
+@@ -111,7 +111,7 @@ BUILT_GIRSOURCES =
+ 
+ irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers))
+ 
+-Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am
++Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate.la Makefile.am
+ 	$(INTROSPECTION_SCANNER) \
+ 		-v --namespace Indicate \
+ 		--nsversion=0.2 \
diff --git a/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild b/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild
index 64ceb9c000b4..6654875b58c4 100644
--- a/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild
+++ b/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild,v 1.3 2010/06/06 00:37:37 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild,v 1.4 2011/08/28 17:36:11 jlec Exp $
 
 EAPI=2
 
@@ -46,10 +46,6 @@ src_configure() {
 	econf $my_conf
 }
 
-src_test() {
-	emake check || die "testsuite failed"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS || die "dodoc failed"
diff --git a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
index ae611f5226a8..75c3bfafb7b4 100644
--- a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild,v 1.2 2011/08/19 19:18:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild,v 1.3 2011/08/28 17:36:11 jlec Exp $
 
 EAPI=2
 
@@ -67,12 +67,7 @@ src_configure() {
 		--disable-dependency-tracking \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable doc) \
-		$(use_enable introspection) \
-		|| die "configure failed"
-}
-
-src_test() {
-	emake check || die "testsuite failed"
+		$(use_enable introspection)
 }
 
 src_install() {
diff --git a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
index ddc0c6c4701b..5d8cf68d92aa 100644
--- a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild,v 1.5 2011/08/20 10:39:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild,v 1.6 2011/08/28 17:36:11 jlec Exp $
 
 EAPI=2
 
@@ -58,6 +58,10 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-python-version.patch"
 	# Fix parallel-make for mono bindings, launchpad-bug #709954
 	epatch "${FILESDIR}/${P}-mono-parallel-make.patch"
+	# Fix for forced as-needed #379543
+	epatch "${FILESDIR}/${P}-as-needed-introspection.patch"
+	# Fix for forced as-needed #354495
+	epatch "${FILESDIR}/${P}-parallel.patch"
 	# Drop -Werror in a release
 	sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed"
 	# Find slotted vapigen
@@ -72,12 +76,7 @@ src_configure() {
 		--disable-dependency-tracking \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable doc) \
-		$(use_enable introspection) \
-		|| die "configure failed"
-}
-
-src_test() {
-	emake check || die "testsuite failed"
+		$(use_enable introspection)
 }
 
 src_install() {
diff --git a/dev-libs/libindicate/libindicate-0.4.4.ebuild b/dev-libs/libindicate/libindicate-0.4.4.ebuild
index f812b18e16dc..6b1d9302edb4 100644
--- a/dev-libs/libindicate/libindicate-0.4.4.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4.ebuild,v 1.1 2011/01/17 09:34:20 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4.ebuild,v 1.2 2011/08/28 17:36:11 jlec Exp $
 
 EAPI=2
 
@@ -65,12 +65,7 @@ src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--docdir=/usr/share/doc/${PF} \
-		$(use_enable doc) \
-		|| die "configure failed"
-}
-
-src_test() {
-	emake check || die "testsuite failed"
+		$(use_enable doc)
 }
 
 src_install() {