Fix automake-1.13 compability wrt #466970 by Alphat-PC

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 27 insertions, 9 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 28281770bea1..562b8eb7ec5f 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.214 2013/04/20 12:22:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.215 2013/04/27 15:57:14 ssuominen Exp $
+
+  27 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  pygobject-2.28.6-r53.ebuild, pygobject-3.4.2-r1.ebuild:
+  Fix automake-1.13 compability wrt #466970 by Alphat-PC
 
 *pygobject-3.8.1 (20 Apr 2013)
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 71a7fac35866..40ee0fd78f8d 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -21,17 +21,21 @@ DIST pygobject-3.2.2.tar.xz 564712 SHA256 4653790baaff0176fd814b88cfb5378c45906a
 DIST pygobject-3.4.2.tar.xz 615032 SHA256 2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad SHA512 ff22d2825896246564230949b93e6d6075f885cbe4c633b8fdd6505287bc167dd50d3c3a3f4ed9ff690c0b70a81fb893a9fbf947ed9ff043ad61a61af192412d WHIRLPOOL df50588c9da9b56b50370530b1b70a10addc1d89e44ede7efbbcc7e9039e35816c105477c9e33caa52bbae9d6bd33b6532e6a0b8df3b8de0aab6f838bf00a10f
 DIST pygobject-3.8.0.tar.xz 652616 SHA256 9c57f581ae35587108c978cb116eeb7ec186b50c95b145f62033589ee248b32d SHA512 7eba6310160e7cdb6e2eb141b8bf85b7f5e9db9cef43d0394143e2cbfcffb45014a3b34d8655648c39217168f005bffa1b36650deaba791b4553d8036d1f3a25 WHIRLPOOL db73677a4900da88eb826231bb6ae5c0937d08c027846748efae88ad7f044bf67d78cd339c25b48a7431dc3ce1483d57d56d8c07354e1d68810fb7de08e705c4
 DIST pygobject-3.8.1.tar.xz 652864 SHA256 e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb SHA512 e18ef89c7654d61c84378d4afcfe150ef8ed6be9f3e43fbd5617f1034729c334e4a76b1590dc1dd2f7fc1d39ca53248d5e7f48a5f516894490da27fa0cac0f72 WHIRLPOOL ff079fd3e4fc4bc9ed7a457c465982d1b69228341557ea6354548c1d4782507406dbc4e864d104cf4c52e54eb791fa5cfbbb41aaa75d053dd3955cae400d96d1
-EBUILD pygobject-2.28.6-r53.ebuild 4236 SHA256 8e96887690326d6acebfe7c1aabc01150e94f68f5637f9003e130fc72fd98dca SHA512 f509fd786d7f9d94a418bca0b9e155b6df812a820b4f09589f4faef464f4173084e8d02ed5dacc556c80ad014e58f08c97433b1815d4b5de4dccf913af8c17e5 WHIRLPOOL 26c05c147056d0f18e43ef72de6d4df3ee56d665987a1b34afe1525b9a1dccc07a98497e22e8e85dd5d5b071bd90523142404346a408d7db4d3750274d9143ed
+EBUILD pygobject-2.28.6-r53.ebuild 4361 SHA256 bc4a122ba2373197da2da7c088cb7ff6eb1e66c0ed7fc0714423afc915585620 SHA512 adc01e47b5ed7433cc1c975e8d788b01b29435c6cb422a15685a31db9cad0fb8167c36baaf62b834db92f972dc727db55b7441e76a880e568adf7a0f0c5b5363 WHIRLPOOL 6a434411b40b033e7a6ad1b71e487d9348b9d47eb6bb495bbd37078fe4cc977beba8f7aac575f037c8bf0cb04007fccdea8ed0556e8b17603ac5f93caa196b15
 EBUILD pygobject-3.2.2-r1.ebuild 3004 SHA256 3071a9b0b2c63c9532bd07b623bd5a70caa45d7e42c6ade632b0d2e6a65bc8e7 SHA512 a9b91f111fdae028abe8176cb6691c1265287ed1aecf4c2d5e58ade22a7928680280a73158f91ef48b0d505e8c241c9a3b7f2a0507dce13bee2a3287186cabb7 WHIRLPOOL 0a8fc88aca6024f5b3b4f9f77e1d009651a0d762e0aef8c021736e7764d0e964a3b250832c80f3b8eceb9c684992e1e0ab7bd26ceed9ca6e585d4b0a041b9cb4
-EBUILD pygobject-3.4.2-r1.ebuild 2996 SHA256 12cac2d2ec2c064302df8b73e8231a665d5936ee3118d24be6a4627e57071c9b SHA512 e0fe69d579233309de61a5ba7d936c8d6d10d4481f9c24ca0c62928dad6a563cd2c903e4e929a8827c23602e422273ae3f25e0becdafb4455d688d86806cc1ae WHIRLPOOL 0d7df92a463efd521a1ebfa1c4ba7d408f412d89003a1f2f5882528deb8d23ed3f327846413a8b491db1ebc8687f9907f0f425ebc4268e7e063150aab2b5497b
+EBUILD pygobject-3.4.2-r1.ebuild 3116 SHA256 3be4af101c38886815a3982cdc255edbcbd6829b6190108fd531d3cb6c1c6885 SHA512 ea10e906555b7b9e0b7e26996ab449108defb8c6203bbe17e48a15a71de509b2286585cc85e15521566fe58e97e85d808a1dc7a1c9fc709dc892c1f6720089b5 WHIRLPOOL b3509d34351385f0143af1866080c3891fcc271b6a42036981b1cc4729cf323c60a2fc5e9e04956eb112e816f91280c087e266d3a7f1c070c9dc268929a6dd6a
 EBUILD pygobject-3.8.0.ebuild 3128 SHA256 104f3b76b4f3269c272d1a663813b1768df30f3b440dd0f635bf6af9e484fd8c SHA512 09037d9f7a3704376aa128201fcc8c0f8373284df63e3a7f73b8faa1a16368d057423f7be19f0f4dd4e15426bab7e5c0f1985d72939fd1f227103b1bc70f8553 WHIRLPOOL ce07e5ffedfab4c11ee65ee3176b7ce0c49cc09e9d942013110cc67e3e78aed3087fbf001d81dedfcd8a90983477268d5083af055c376555156eebb66ce9308c
 EBUILD pygobject-3.8.1.ebuild 2811 SHA256 6ed093a4ad4b9598aa79d51ffaed524d939d690414c28e44f50b3196737c3783 SHA512 3b9829790656ed75babebc0810d4558f3637c253a194589dfb657c0183924215b1e0c6a27ab05df313b7904161f5607ded92d3ab37899df010d0a86ddcdcd54e WHIRLPOOL 1cbc4081c99f5560f127c5eb717a4f63a8c0539d7ffb5d97e95083fe2c3cf4af59b02422713917a6ec46e19b7e9b8593d44b091f63a5079fb6e2538f6b04cf12
-MISC ChangeLog 35209 SHA256 3ee0187c17e3fded4cbba8e9b898374bd1eeb8729bed49145a720646f04746ee SHA512 73c9b3b2d7cb05e0a2a49c3cf8a27fd42eb3148815aca33fbc711d4252f3896ff660f7cbddd45311243582bdb13bb4f103c3d603b3b02f337862c268110b5f54 WHIRLPOOL 7bba7eec678c4a9e44c7af61e00878b6f6689c15adefa58b382469759fcc2abb3f719224d80483f7bba664f84d00500c370755927a105b8948f2c26c562381f0
+MISC ChangeLog 35383 SHA256 2f493d15566f9a842ae66a26744d3e905952ea8bf5149e89e754e8c9e4388f78 SHA512 cc39e602a61a874e1f15ca795a906d85c7f6569b292544b4dad4ab56a0df3bea1a600cdffaaecfdb70f9dac9567038fb815797fb372c8f88799622d4cbabe9ef WHIRLPOOL e8705b9cb3438cddf13eed539b0b911d5c1b66d34c3668e243fb1b3024785f36a2288d3f0f4de0ab8800105108e412f39cf9e609bcff2d2c0843c42c5fdd51ad
 MISC metadata.xml 178 SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c SHA512 090602f45b8fe37eb4ec23c568d815bd1ea41903eb2ad2592c251915aeb3edd957eae84957d556eb3b4b3fbb5acf6aae7594e1640ee5e04297cb6e2efc6c4c41 WHIRLPOOL 69136c1dbfe808f569ccf5362e9df219ef8ba594cc608893dbf854ee6482111c5c969c2510f2f92b659b3a94e1a669490062815891988e71e76a8d0782b871e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFyiIkACgkQCaWpQKGI+9RmEQCfREvnhh+gKcat892/6OSeyayo
-I2AAnR+cWDt58le0C2l6hSM38BuYd5Th
-=Cht2
+iQEcBAEBCAAGBQJRe/UAAAoJEEdUh39IaPFNbR0H/jV+szn3p9Hn0mc65oByPIqq
+KuYytOhXhwUWn5VDjiZlAMocxF/WGQffQT7EFePswewxBPx9UKy7XqrHXfiUujWM
+ge9M5R9iX/w21omCnAn4z36ZaKWqF9fo8m82CimkP1JIZjqvrVq7gQZ8CGXt5xYn
+StnUaJkD67xn5Abf3KhrndckxR8XRcn14fqylZF5x7/XiYARNOuzPBKd8WdqLENW
+0U0oVoNn8lT5TgFm4xeldrudxPlYpG23yMtcvo9tm09E2IgIMM1lrhcobp0RBUb7
+S2Fxu86xh1ohcQSH6O9rH2MrHrgQhVoP9dkcMV4NK7pBGFCyyzk26JDkiL+SHBA=
+=4Bbl
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/pygobject-2.28.6-r53.ebuild b/dev-python/pygobject/pygobject-2.28.6-r53.ebuild
index 676778fd0b69..0d114a8fda67 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r53.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r53.ebuild,v 1.13 2013/04/10 19:51:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.28.6-r53.ebuild,v 1.14 2013/04/27 15:57:14 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -51,6 +51,11 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-set_qdata.patch"
 	epatch "${FILESDIR}/${P}-gio-types-2.32.patch"
 
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.ac || die
+
 	eautoreconf
 	gnome2_src_prepare
 
diff --git a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
index d803872ccd7d..f4616fa9c2b6 100644
--- a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.6 2013/01/28 13:43:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.7 2013/04/27 15:57:14 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -63,6 +63,11 @@ src_prepare() {
 	# Run tests with older python too
 	epatch "${FILESDIR}/${PN}-3.4.2-run-tests-with-old-python.patch"
 
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.ac || die
+
 	eautoreconf
 	gnome2_src_prepare