Require automake-1.12, since building with 1.13 fails (bug #467086, thanks to Paramonov Valeriy et al.)

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

5 files changed, 32 insertions, 25 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 86a2f85219a7..4bd2c8da0862 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.556 2013/04/23 19:02:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.557 2013/04/29 01:23:26 tetromino Exp $
+
+  29 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  glib-1.2.10-r5.ebuild, glib-2.32.4-r1.ebuild, glib-2.34.3.ebuild:
+  Require automake-1.12, since building with 1.13 fails (bug #467086, thanks to
+  Paramonov Valeriy et al.)
 
 *glib-2.36.1 (23 Apr 2013)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index b0f30d3b966c..9a22fcc90c95 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -20,17 +20,21 @@ DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281
 DIST glib-2.36.0.tar.xz 6508276 SHA256 455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227 SHA512 86402c22b3df419112aab82bfe2c2a598992c6eadf941375b6f4f1840f9004491fafcbd95dc372262cddb29064abba54c640b1dbf281ff75c0ea209683876530 WHIRLPOOL 9db755e0a6070a63b78ebc71b6c54279faeffec57f9392c329fdbd105bfe5f74caff134c0aef7c93a542eed71e0465f7c1a42c4277ad7a8d42cf837fdc1f434c
 DIST glib-2.36.1.tar.xz 6524408 SHA256 7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24 SHA512 e738ef537fc8b05f535a42a46c3e5cf8d7c9c3aed788adea1bfd924e6031e6f3e8366850a3a1a0ea2c2a4c5e54f08eacf6cccbf32fb8a361b62a6caf9c4b7852 WHIRLPOOL 05298f71ff63b458ddc7e67c7ce0ab800109068c6bb2b0bff5ccfd76d8ed29cb5568d8a2953b71947bb0385033c3564467f9adfa377fc65c27eb765f71f71ef3
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
-EBUILD glib-1.2.10-r5.ebuild 1782 SHA256 1ac935da2188aa1ed04e5db79d8637f519fdfa9d9a64dd8a978cbf31bb056486 SHA512 6d9f9839be66df0f343f4dd39c6f88524e8acc45c747ef0ce7507c24296d0550c8b1c13efa396a6a65f31033d62f064cbc0fc7c7b8b28b2eabe22387b611fa15 WHIRLPOOL b5967b8704e5ce04f41a03bb108ccaffa628f02add1b67803e8b0a531d7f345b9a0c458388da90262a53e76fd96dae7a82cab391fc5e6404c6b2ff7d43164f54
-EBUILD glib-2.32.4-r1.ebuild 8167 SHA256 441ad904bbc1c2c1f8b489b71340201e159ded985637782673b21d0f46ecdb08 SHA512 9abe19daf097d270aa39e05b73c095f3bf505c786e0a1c69924ebc69a583d5690f1d8292ba1aeb051c7a249d47372d33c0196ff8bf4b472eb15eb8231049d573 WHIRLPOOL 0fc1cb8c94f37c3165f2a5b0192d7aadcf2b000ae0a8e35734ea1dbf6077b5a6fc8a3b2477a2b16201ab1f182809d3b60aa16f7ef4dea23d37d4bad19243287e
-EBUILD glib-2.34.3.ebuild 8443 SHA256 d41140889ea89dfcd563ffa4a794cc140664ffcac27d2fc2f93d5af2371b0dc5 SHA512 3a6e2b6fc0d020b876ab30452d41444ab5adcfe14011dda2eaf91bef5da53026fb41633b637603ef0d3b52cb0324a7824b155aecd821f2c682a720a2e394260b WHIRLPOOL 199ebc15e676471aaaf193e9f6f8c7587e65961b67999bdf619007a1e72997100273c1381ef1f2a3030f5756017c1101712b62c13ab55ff0815270c6e771adb9
+EBUILD glib-1.2.10-r5.ebuild 1739 SHA256 7ef5d036104a3c72e921dcb50849b4c27cb524508e9185ac717cf26d7c440bcb SHA512 24d4a9c6c502547a980a79bac42cd128089ca535d49ff7addad3b169c52f81d7609f8a7393bcfad5c0e184d64a77f4e5c8b3341a37414d84345b06676eef1ee3 WHIRLPOOL b345d9f261b4e96dd33ee3b80cb8559444713a0aaf0b191251fd74889d2b52717a1c1b249a2f324422312e00dbbfe275664d84db8784282b13b7fd5f23b7cc83
+EBUILD glib-2.32.4-r1.ebuild 8188 SHA256 0b8820554ba2cba45ddcec6be80f7a1809e6a073c74bb5d9705b44be80e01426 SHA512 e856b6284657702fef123a02dcae7325a62549a1659780544e2c6d1ee75b7ee098510149f325b22f9bfeba95ed6ea439d75a522a0d461bb0df7e66f07d165581 WHIRLPOOL e03126fcb8e205bfba9cc59095742448514099b4b4cb6effff0da1ea4d81077a5a532ada9001e71117786d2a01f6492fbc7dfe0eebdff4e436b69e283f630f57
+EBUILD glib-2.34.3.ebuild 8464 SHA256 27290bbd71d043ae107347b562612942f862374ae0598217ffeff100497c33ed SHA512 35df281a84823a468c6d8ce30700a7a2228c0231f47e5988c723b314db5202a5db3418c3da56633906fe7188db2dfd12e17fe6e5c9cf2a406fa4e9f11474ac19 WHIRLPOOL 72098d510c3628aa40d3eea0bde17789b01d71c388522ea4a89a428a00a8dfdd0c1229602d073aecc26fad29128ce1b3c4116ff372192d1461512b3c756eb665
 EBUILD glib-2.36.0.ebuild 8360 SHA256 daabc480ec8f536efa265643b8c3340fa6ce12f30bd800c85d3abf094833d0ea SHA512 5da13a2005614b7ea73add590739cf7412ed04bbf1e077125f99a5c171e9250ee742eb2c75b2ea86c8b8a1e90448c99414a21fe2852887a282243f7b525e8923 WHIRLPOOL 35b4ca1789588ed6217e2a9a6284e8499da5a02e9e87673dc3e668e004b72fafb22a46a7a73f41d1de8ad02f3b6131b7a36783eed363318c6c29fc8e93d9a820
 EBUILD glib-2.36.1.ebuild 8904 SHA256 7db1b7613ea8c9e2cf8183b5c2d19084fc5ae820a9c176ce4e3515c5372193de SHA512 38ab00d5f5c9fb8ea2f1a0aa6b270ebd2bd2690fc96b11b2e049fe1b10e0827eb6d50f8f1b97068f1e01bd43a50712e6b61dfc1db3eff61cd0e9d646a1284654 WHIRLPOOL 40793736f6855f58fdce90201232d561a5bea9acf981c55a04c241de67cef894b26fd44d1bdcb5a08de1054cc40cc9328b4e58a06f3d4850d7b7b69cb6358ec4
-MISC ChangeLog 76761 SHA256 6cb27c2679b64cae6e61f46679145334396f3a1f0fe472acad4806c6b29f6384 SHA512 73c2e48caccebed3e0baa0c8cc872c2b6b45e7d288df098cf08ad03446f8a49b86c3a16a4e87226b93bea310e7e63491e4c1c50961c553c3489f1ea45925232c WHIRLPOOL 713af823929d09b52c5a77954818d7c5a3074dc10c220cc71a6fe7eede162711747f5ed34f5ec8674def0fb799ad3ba117803c80fae56406bb57f1eae8619141
+MISC ChangeLog 77001 SHA256 92f2623f5dc0bc17e8531edf574869b2a8eb90395f69933c0d3f8434087e6388 SHA512 54c3d937fcf56f313e5b1abf880cf39e12e2a83291e3fa68454caabb703f8f728a737b88adbf6a28e58252fb935b14589a38301a3da8a4d2a381492ee0bd4bcf WHIRLPOOL 6556c2b045c57a9bb1337e0027d963847cba77494f6af02eb3b8f26b4d0e1687be68814609f0b4a58e3827b1ae655c6d587720a1c9a77a5295a9fac12214f043
 MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF22tEACgkQCaWpQKGI+9RgSACdGrHWImskk1nD2zQF4dpo1wG6
-I/MAnRHtlAs68bXECW/S7PFwofOqClCu
-=gL5C
+iQEcBAEBCAAGBQJRfcuYAAoJEJ0WA1zPCt1h6eMIAJEw6Jr29lVAru8xoSVSaZ+D
+odrkNfQsxlYaQZjoeU/PUkJDE+XplpOBKlYgdtvnOU5RZsrzPThBmJXLDMnpMjss
+RT1+2IJ+vzTGxZ3ZdezHhnFbxu/sfB1wxbu2SfvTEdtq+uB+/SzSMhhIGVykFe1k
+GHoVFlB38Ha7ODlp7znMPlgZYZjzY+HDEzPevEr5Gc7EyQrvZR/FaTsnD+pYUgW2
+QcdBVzGWdEi9rHZjgiq2JS0Pa2VF7Lr3sO5yw18kcz+jUQOv7tK2SsXSwd/Wxyk8
+eAhEe0T8BIPoKKzCcn56MK9BaMRkAOUjrI10oyoOl+SRoVPU3OUUPwWgBzQFEMM=
+=6X/C
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
index 57b2e37b9a4d..e08e0322535e 100644
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r5.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.55 2012/09/25 11:40:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.56 2013/04/29 01:23:26 tetromino Exp $
+
+EAPI="4"
+WANT_AUTOMAKE="1.12"
 
 inherit autotools libtool flag-o-matic eutils portability
 
@@ -18,10 +21,7 @@ IUSE="hardened"
 DEPEND=""
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-automake.patch
 	epatch "${FILESDIR}"/${P}-m4.patch
 	epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
@@ -40,7 +40,7 @@ src_unpack() {
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	# Bug 48839: pam fails to build on ia64
 	# The problem is that it attempts to link a shared object against
 	# libglib.a; this library needs to be built with -fPIC.  Since
@@ -50,13 +50,11 @@ src_compile() {
 
 	econf \
 		--with-threads=posix \
-		--enable-debug=yes \
-		|| die
-	emake || die
+		--enable-debug=yes
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	default
 
 	dodoc AUTHORS ChangeLog README* INSTALL NEWS
 	dohtml -r docs
diff --git a/dev-libs/glib/glib-2.32.4-r1.ebuild b/dev-libs/glib/glib-2.32.4-r1.ebuild
index bfda3727c9a6..294bd321dbd1 100644
--- a/dev-libs/glib/glib-2.32.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.32.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4-r1.ebuild,v 1.11 2013/02/19 00:08:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4-r1.ebuild,v 1.12 2013/04/29 01:23:26 tetromino Exp $
 
 EAPI="4"
-PYTHON_DEPEND="utils? 2"
-# Avoid runtime dependency on python when USE=test
+PYTHON_DEPEND="utils? 2" # Avoid runtime dependency on python when USE=test
+WANT_AUTOMAKE="1.12"
 
 inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
 
diff --git a/dev-libs/glib/glib-2.34.3.ebuild b/dev-libs/glib/glib-2.34.3.ebuild
index 549f66818179..12922ce668a6 100644
--- a/dev-libs/glib/glib-2.34.3.ebuild
+++ b/dev-libs/glib/glib-2.34.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3.ebuild,v 1.3 2013/02/19 00:08:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3.ebuild,v 1.4 2013/04/29 01:23:26 tetromino Exp $
 
 EAPI="5"
-PYTHON_DEPEND="utils? 2"
-# Avoid runtime dependency on python when USE=test
+PYTHON_DEPEND="utils? 2" # Avoid runtime dependency on python when USE=test
+WANT_AUTOMAKE="1.12"
 
 inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info