Fix building with make >= 3.82 wrt #333645 by Jory A. Pratt and Diego E. Pettenò.

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

4 files changed, 33 insertions, 14 deletions

diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog
index a20e1c0a3f36..62def510a9e4 100644
--- a/gnome-extra/at-spi/ChangeLog
+++ b/gnome-extra/at-spi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/at-spi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.208 2010/09/11 18:37:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.209 2010/09/25 17:16:55 ssuominen Exp $
+
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> at-spi-1.30.1.ebuild,
+  +files/at-spi-1.30.1-make-382.patch:
+  Fix building with make >= 3.82 wrt #333645 by Jory A. Pratt and Diego E.
+  Pettenò.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> at-spi-1.30.1.ebuild:
   Marked ppc for bug #324077.
diff --git a/gnome-extra/at-spi/Manifest b/gnome-extra/at-spi/Manifest
index f1c599f8a6d7..2251ca2de5ab 100644
--- a/gnome-extra/at-spi/Manifest
+++ b/gnome-extra/at-spi/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX at-spi-1.22.0-tests.patch 3541 RMD160 649f6381d4cef0dcd5ad00d76d935acaa91d7532 SHA1 2cdd95e89a9115d990b59c02ce0863b41c94332e SHA256 23ed4f7026969eba5df992cb7290740c8eb62fa701cdf50f9f06eec83b559f3d
+AUX at-spi-1.30.1-make-382.patch 679 RMD160 04d1e20985928a658e5205e13c49120a6f9f6662 SHA1 f05381bd00a0f0220c63ab45171179f7c49ed99c SHA256 a04b3315ea9e9cc2d4ec3a33ee582126d88d4439c21bef4a67eae4fde011264c
 DIST at-spi-1.26.0.tar.bz2 829621 RMD160 e8cc5da683ec4289f552bbc07a08ee70cac5c3c7 SHA1 814871ea8a04570d44003ceffc166cbe44a8bb7c SHA256 bb8c9473a277fa75f172fa16fb6ada85f4a919219818fd9c792f1a137bb2644d
 DIST at-spi-1.28.1.tar.bz2 843057 RMD160 d48cecc1d4d56c2196fc08db42cefb42dc0c7b09 SHA1 a730e8726a5db9f08dd698262c526772112a7572 SHA256 b776a85290dcfd485f0307c8fcc71a74a07874e5edbf7bba31d599e6dab3d2be
 DIST at-spi-1.30.1.tar.bz2 836847 RMD160 f317c5ad38a6f79b1917f3173e77e4746f79408b SHA1 d7bf78555e8025e42325437d7809e1c98a35389e SHA256 8dbe3f3b6028f01afd841859e49c0bf159a1ccca1f90be2647365062c5d0346d
 EBUILD at-spi-1.26.0.ebuild 1608 RMD160 c510322d03baec25b9061fd810d6c2053bf0c7ff SHA1 6f8a284caf1da6402ab5791a4ec45bb002d19cca SHA256 7adf21b3c4a8fa1ed069ed09f7972cddf4486f9fc28aa0e47407fcc8df2c24ef
 EBUILD at-spi-1.28.1.ebuild 1749 RMD160 90bc2968c2550962c729eb7439cce2b6a521b673 SHA1 d5bb917bf237b43ccf14209346714fa651d03b8c SHA256 c69a84dc0d4c78a985cffecf1f466e16b32a7e1f125361051a8dcb953f1b65d7
-EBUILD at-spi-1.30.1.ebuild 1755 RMD160 45db35a9d20e0806c96395467c3e9248fd86731f SHA1 0e667888a1ba82a37e54f2cc86c345d551816d0e SHA256 f74e094e846769327b961c32d6c6969bafb472c7c4cb4fa8f5e5b40447d480db
-MISC ChangeLog 24491 RMD160 4963250aaa56a70cac1280b10c8956794a62de13 SHA1 5e8245e97736acc15d7a5333e3bb2b0bd5c49d48 SHA256 78f27592dbdb80e0072583a07d7555c79d74b178c27aa787b301a0eb9899fc0b
+EBUILD at-spi-1.30.1.ebuild 1809 RMD160 ccf8c0a66aa3aa843d4b2ef865a86d2e8613b73c SHA1 087482a2c26a267d1bf61a538d1dceaae5f0674c SHA256 3e5702e7e75a6b9b3821163261a5ac545e1ca8a438ecbee72e65b737b4a7a526
+MISC ChangeLog 24697 RMD160 05f33495005fa28937eee8d7d6637a99536c9c27 SHA1 3b096df107f29d19df67668f25cc2687a0c9e65e SHA256 1f02be51db33b9773d2fa5537773e5ba98b4ed6794e6dba758b2da434284c496
 MISC metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 SHA1 2a33de77ba2f0f4fdedeed148abdad125b78f996 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyLy4UACgkQcsIHjyDViGRmNgCgrmST1X30mxSxPdrtt8vSlXra
-u2MAoJFs5RAlKIuMVe8/jfCt7N+M2RSL
-=rQm6
------END PGP SIGNATURE-----
diff --git a/gnome-extra/at-spi/at-spi-1.30.1.ebuild b/gnome-extra/at-spi/at-spi-1.30.1.ebuild
index 486dc816b7c8..ce9704cc1c91 100644
--- a/gnome-extra/at-spi/at-spi-1.30.1.ebuild
+++ b/gnome-extra/at-spi/at-spi-1.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.30.1.ebuild,v 1.5 2010/09/11 18:37:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.30.1.ebuild,v 1.6 2010/09/25 17:16:55 ssuominen Exp $
 
 inherit autotools eutils gnome2 python virtualx
 
@@ -60,6 +60,8 @@ src_unpack() {
 	# should fix tests
 	epatch "${FILESDIR}"/${PN}-1.22.0-tests.patch
 
+	epatch "${FILESDIR}"/${PN}-1.30.1-make-382.patch
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
diff --git a/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch b/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch
new file mode 100644
index 000000000000..c80aa5874e2d
--- /dev/null
+++ b/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/333645
+
+--- Makefile.am
++++ Makefile.am
+@@ -12,11 +12,11 @@
+ 
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local:
+-                if test -z "$(DESTDIR)" ; then \
+-                        for p in $(schemas_DATA) ; do \
+-                                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
+-                        done \
+-                fi
++	if test -z "$(DESTDIR)" ; then \
++		for p in $(schemas_DATA) ; do \
++			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
++		done \
++	fi
+ else
+ install-data-local:
+ endif