Fix install with automake 1.11, bug #279813.

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

4 files changed, 36 insertions, 4 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 68c02ceb5623..d99213950e67 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.71 2009/08/09 13:07:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.72 2009/08/09 22:15:34 eva Exp $
+
+  09 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  pygobject-2.18.0.ebuild, +files/pygobject-2.18.0-automake111.patch:
+  Fix install with automake 1.11, bug #279813.
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> pygobject-2.18.0.ebuild:
   ppc stable #277947
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 785db1dc5012..95698654b219 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pygobject-2.14.0-libffi-magic.patch 1445 RMD160 e71a2caba2a61803d115420631f7cd63cef7197e SHA1 0dbb6ce61fae2f4e53b7a4131918a99687f0a4be SHA256 229b1b62a1e5ac2c86a17683d5e3c64fa0aaf6ad0e54ed384d0f7a8084b182eb
 AUX pygobject-2.14.2-libffi.patch 796 RMD160 0aa01f1d2cdf602ab127658bd838f55a8db265dd SHA1 6f66c36aa071161b0ebc540cb4fbe4ebbecdf35a SHA256 23a2c96a3195fc6b46ed647ea7dea387076ee6eca97bd73415ddc4456898d759
 AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
+AUX pygobject-2.18.0-automake111.patch 323 RMD160 182ea96cbb8fe28a93add0ef3dfd7710777615d8 SHA1 96c22e5bb8f07ea117248f4c8ca580474938c7af SHA256 4a94e9ca2a421a923c522ad4132c8988f22e74949f0361e231b6ba0ca813bc57
 AUX pygobject-2.18.0-make_check.patch 1589 RMD160 a2657fb299055620a745cb704ea3de289cdf8d63 SHA1 64ada13e6ac91845353855ed694ed951f63f583b SHA256 df43cef258567f824753caa0ba3a8d2820f729dac5ecba0d9fbf39a6f4861c4a
 DIST pygobject-2.14.0.tar.bz2 360630 RMD160 71702329535680a813a36e05823d1968cb453b25 SHA1 f6867330c2a2d70ddb81807823e7515f55ddda23 SHA256 3a5919703f71c2d7059d02f03dc6566cbe86c6efb09a16730b7cdb4b0fbef9e8
 DIST pygobject-2.14.2.tar.bz2 366808 RMD160 c9894695d745a9d859f3edfb9e2946ad8b4fec3d SHA1 e891c3f1ad0d6f737d6c51b9be3eb363f7d11cbc SHA256 79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e
@@ -14,6 +18,13 @@ EBUILD pygobject-2.15.4.ebuild 2168 RMD160 5368334f822671d623fb00bd1a718eff2239e
 EBUILD pygobject-2.16.0.ebuild 2277 RMD160 18392c740c45aa120693a8dec4eb825894a6d23b SHA1 55b2925505d4918588b40168ba15f4a970f0758f SHA256 a495a04bd45f1712eea1c15063cb38ddec2158c1eac2d64b7e525b1a99d9899b
 EBUILD pygobject-2.16.1-r1.ebuild 2179 RMD160 bab1aa4a2f3cf9cce72fc0dec8d3f7e884f80818 SHA1 34631723c6e4b13301fe7c2fce796dac1983e2ee SHA256 8bfc884f183b10fe9b3ee581316a13ce0c0d827df607e3e2679533a344164aca
 EBUILD pygobject-2.16.1.ebuild 2266 RMD160 99ba86f34db41b30eeca54d367898caddecbcb6f SHA1 84ec57b5309292b56e9c8de361157ce631f809a2 SHA256 26581f3cedb92c88130df529d5d9e5b31e459fb2470a7486091da1f4375fb89d
-EBUILD pygobject-2.18.0.ebuild 2326 RMD160 084a2aaadb894d93f019a47435684bb752409fde SHA1 f09f5b17e8f6bd40c27be92a72041d920ffb6ae5 SHA256 eaf7059e2ed1966786d1c5a5c4de32bf090a8d854402426381a39ced1cc5330f
-MISC ChangeLog 9604 RMD160 edecd372f4c829d9360cdfa3c381bfefaab27d6a SHA1 92152a63a1a30009a158fa2f19d8109fd0fb6770 SHA256 81cc25381ec45ca7071e8b4efb0307037063279ba725e93c166cf58db6bd09a1
+EBUILD pygobject-2.18.0.ebuild 2459 RMD160 b1bc6ab6c5566c2bfa862453f4a9cf76c37acbaa SHA1 abe66e976a786bd7968023129611b584346953f6 SHA256 1b49fc211545987a848cc09fd980a26bb5e6b4598ee834adc66e8c498df9a8a4
+MISC ChangeLog 9773 RMD160 f55dd7ceed8d73b8857f7b4accf32b6b81f28879 SHA1 c0ae9e0fe55077d157989411763293815260a02b SHA256 bd4c7c435e13a9bc956ea5e5798079f591324071f203657d40d765573f531e7e
 MISC metadata.xml 263 RMD160 aa9b8ada798575f5d2b94042357d5ed59f4b1cbf SHA1 0843ae5e9b5a9a0ea54f4c79539bf781522e9b10 SHA256 993400d5ee19f0bd67c463d999d24e4184e8c077b4e535adf6a00678ced0c46c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkp/SowACgkQ1fmVwcYIWAa5BgCffZ3jqjinoN+O2ueSqBUtXAFk
+hD8AoM7WK8JsSopFNpM9InbIeXAjOUls
+=IwRS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch b/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
new file mode 100644
index 000000000000..9e57bb7f5601
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
@@ -0,0 +1,13 @@
+# Fix build failure due to automake 1.11.
+# defsgen.py was installed twice
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=279813
+--- a/codegen/Makefile.am
++++ b/codegen/Makefile.am
+@@ -18,7 +18,6 @@
+ 	docextract_to_xml.py \
+ 	docgen.py \
+ 	h2def.py \
+-	defsgen.py \
+ 	createdefs.py \
+ 	mergedefs.py \
+ 	missingdefs.py \
diff --git a/dev-python/pygobject/pygobject-2.18.0.ebuild b/dev-python/pygobject/pygobject-2.18.0.ebuild
index 5e7ad210c9cd..a243f64af64c 100644
--- a/dev-python/pygobject/pygobject-2.18.0.ebuild
+++ b/dev-python/pygobject/pygobject-2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.7 2009/08/09 13:07:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.8 2009/08/09 22:15:34 eva Exp $
 
 inherit autotools gnome2 python virtualx
 
@@ -36,8 +36,12 @@ src_unpack() {
 	# Fix FHS compliance, see upstream bug #535524
 	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
 
+	# Do not build tests if unneeded, bug #226345
 	epatch "${FILESDIR}"/${P}-make_check.patch
 
+	# Do not install files twice, bug #279813
+	epatch "${FILESDIR}/${P}-automake111.patch"
+
 	# needed to build on a libtool-1 system, bug #255542
 	rm m4/lt* m4/libtool.m4 ltmain.sh