Fixup autotool handling #168198.

Package-Manager: portage-2.1.3_rc5

4 files changed, 52 insertions, 15 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 595ab23429ca..12ba85159bd0 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.266 2007/06/05 19:06:25 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.267 2007/06/27 15:28:52 vapier Exp $
+
+  27 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/glib-1.2.10-automake.patch, glib-1.2.10-r5.ebuild:
+  Fixup autotool handling #168198.
 
   05 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> glib-2.12.12.ebuild:
   Add back elibtoolize for fbsd
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 11abe2145e99..750b72a7e044 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67
+MD5 e43bc5a7b4b5d4fc5aedce23125a9e98 files/glib-1.2.10-automake.patch 827
+RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 files/glib-1.2.10-automake.patch 827
+SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67 files/glib-1.2.10-automake.patch 827
 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4
 MD5 a84a252e7f8698c36076ab4b586dce21 files/glib-1.2.10-configure-LANG.patch 1464
 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 files/glib-1.2.10-configure-LANG.patch 1464
@@ -32,10 +36,10 @@ DIST glib-2.12.11.tar.bz2 2925342 RMD160 8680d27e630643e6653d88537907d06e3ba6e91
 DIST glib-2.12.12.tar.bz2 2938743 RMD160 bab462a1e4ef3e9905a4af5b727ad4f9ca03cf02 SHA1 527bced2e6d38169c08c8712d5e3b6ebb0dc46b5 SHA256 debc507172093ef7c74e8a83bf49e090cc24057b1807d3be22e5d7cbfab60054
 DIST glib-2.12.9.tar.bz2 2902738 RMD160 f762b65131f5c1f30ee2e25cb771c296715e6bd6 SHA1 387da30929047ef88a6f369831a34f41a3d027f7 SHA256 10113e7b91f858557c7edb4b611cc009855c5ff8663af54977a65acb69445058
 DIST glib-2.8.6.tar.bz2 2691171 RMD160 54b3b5c96f5050793fbadbd523bc33b6bd36b257 SHA1 28731dc4799efc1824610971c88a571f18bd8471 SHA256 e2da2eec8c87dccdbce16dcd77489d225b613074764f2f39f2815db15b5deeea
-EBUILD glib-1.2.10-r5.ebuild 1716 RMD160 068c9be8d342da4aa927c39c1ec63f266408b03d SHA1 2f48154af232513d7d40d91dbb89d2b033082e53 SHA256 14a7cc736b4aec42c5efe2eae04627a6066a48b55ae445f037ae3e7ba93704ec
-MD5 a47e1db6dea09032240f97e5cf08177e glib-1.2.10-r5.ebuild 1716
-RMD160 068c9be8d342da4aa927c39c1ec63f266408b03d glib-1.2.10-r5.ebuild 1716
-SHA256 14a7cc736b4aec42c5efe2eae04627a6066a48b55ae445f037ae3e7ba93704ec glib-1.2.10-r5.ebuild 1716
+EBUILD glib-1.2.10-r5.ebuild 1766 RMD160 4b44e9b770e4418ecedf5c4b3d316f50771b7cab SHA1 37cafed362a8d9358e2a4b5cbbfb18a5d336869f SHA256 b1fee6efe8c78dd28a1b0d9074e5cce8237b4121c269ba131e1e9516a10542a0
+MD5 ea295c87025922952716d01fe92796fc glib-1.2.10-r5.ebuild 1766
+RMD160 4b44e9b770e4418ecedf5c4b3d316f50771b7cab glib-1.2.10-r5.ebuild 1766
+SHA256 b1fee6efe8c78dd28a1b0d9074e5cce8237b4121c269ba131e1e9516a10542a0 glib-1.2.10-r5.ebuild 1766
 EBUILD glib-2.10.3-r1.ebuild 2134 RMD160 082bb1d5fce43392cb245d6e922b30f4a9bf930b SHA1 79a03a54da782a54271756e453f556f0458e1234 SHA256 2e577043819ee67ca69af43f0bfc11b0976d3e2975144f96aaed94280eec1e49
 MD5 cd4f40181e11847ecd657ebede501426 glib-2.10.3-r1.ebuild 2134
 RMD160 082bb1d5fce43392cb245d6e922b30f4a9bf930b glib-2.10.3-r1.ebuild 2134
@@ -60,10 +64,10 @@ EBUILD glib-2.8.6.ebuild 1586 RMD160 5f33daf4eb864f33d091baa7e9eb038a4ced9705 SH
 MD5 86a8a7a320663e2e62d3e5d655caa664 glib-2.8.6.ebuild 1586
 RMD160 5f33daf4eb864f33d091baa7e9eb038a4ced9705 glib-2.8.6.ebuild 1586
 SHA256 0e8d42185e9bbee3008004bd262ca31e98b69a150a455a3a1c52ad227d95d584 glib-2.8.6.ebuild 1586
-MISC ChangeLog 31829 RMD160 2e016b44ef8ea1311a14b251a31255a02dd18cde SHA1 f77b176bf650c459e640f98d48655aa75b8f5ef3 SHA256 ef811f13219e1c5a80c45dd1b742fc87bd9885605519e57578ab5e3aeb35e779
-MD5 e38451578045b699ac9337041166df3b ChangeLog 31829
-RMD160 2e016b44ef8ea1311a14b251a31255a02dd18cde ChangeLog 31829
-SHA256 ef811f13219e1c5a80c45dd1b742fc87bd9885605519e57578ab5e3aeb35e779 ChangeLog 31829
+MISC ChangeLog 31977 RMD160 ed0cb0e0953248633a98b50a938d71e3d6cbbba2 SHA1 5596dfcbbf7052852fbfcd3a6a6fcedb2e7d8d67 SHA256 d8e8cea65e956e02e26182df2ec121c5c3720a9ac2da616fb17224dd0110ed44
+MD5 d4856cda94ce6f501c1df3c899714bc2 ChangeLog 31977
+RMD160 ed0cb0e0953248633a98b50a938d71e3d6cbbba2 ChangeLog 31977
+SHA256 d8e8cea65e956e02e26182df2ec121c5c3720a9ac2da616fb17224dd0110ed44 ChangeLog 31977
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -92,7 +96,7 @@ SHA256 30e7d4f7ac387cfa98e6c775cf1888a204523c609bc32d90ff24b7ff0900efc3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGfuEhp/wUKkr7RBoRAns3AJ9xeu+aHdAtsYx3+zQ90RWozXspjQCffyOe
-QvzhT+o8n6zVoxxeJy5B+2I=
-=Byc4
+iD8DBQFGgoJZp/wUKkr7RBoRAk6xAJ4tvILZMOcnpq5kLMbmR3UzAzCoKACdFzMa
+5b/f2kiF4I+EHf0tpPyez/w=
+=P4Ec
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-1.2.10-automake.patch b/dev-libs/glib/files/glib-1.2.10-automake.patch
new file mode 100644
index 000000000000..c4f8fd32110c
--- /dev/null
+++ b/dev-libs/glib/files/glib-1.2.10-automake.patch
@@ -0,0 +1,29 @@
+fix errors with newer automake:
+
+gmodule/Makefile.am:44: testgmodule_LDFLAGS must be set with `=' before using `+='
+
+Makefile.am:73: BUILT_SOURCES multiply defined in condition TRUE ...
+Makefile.am:11: ... `BUILT_SOURCES' previously defined here
+
+--- Makefile.am
++++ Makefile.am
+@@ -70,7 +70,7 @@
+ 
+ CONFIGURE_DEPENDENCIES = acglib.m4		
+ 
+-BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
++BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h
+ glibconfig.h: stamp-gc-h
+ 	@:
+ stamp-gc-h: config.status
+--- gmodule/Makefile.am
++++ gmodule/Makefile.am
+@@ -41,7 +41,7 @@
+ libgplugin_b_la_LIBADD = @G_MODULE_LIBS@  $(libglib)
+ 
+ noinst_PROGRAMS = testgmodule
+-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
+ testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+ 
+ .PHONY: files release
diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
index 87c8919528fd..60d853a0932d 100644
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r5.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 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.51 2007/03/03 15:59:55 falco Exp $
-
-WANT_AUTOMAKE="1.4"
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.52 2007/06/27 15:28:52 vapier Exp $
 
 inherit autotools libtool flag-o-matic eutils portability
 
@@ -23,6 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-automake.patch
 	epatch "${FILESDIR}"/${P}-m4.patch
 	epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679
 
@@ -35,6 +34,7 @@ src_unpack() {
 	use ppc64 && use hardened && replace-flags -O[2-3] -O1
 	append-ldflags $(dlopen_lib)
 
+	rm -f acinclude.m4 #168198
 	eautoreconf
 	elibtoolize
 }