fix autotools up some more #151874

Package-Manager: portage-2.1.2_pre3-r4

5 files changed, 63 insertions, 21 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 2761ec5aca87..d7e772fe0fcc 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,10 +1,6 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.72 2006/10/19 07:01:22 pva Exp $
-
-  19 Oct 2006; Peter Volkov <pva@gentoo.org> rpm-4.4.6-r2.ebuild,
-  rpm-4.4.7.ebuild:
-  Forcing automake-1.9. See bug #151874.
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.73 2006/10/19 16:18:49 vapier Exp $
 
   17 Oct 2006; Mike Frysinger <vapier@gentoo.org>
   files/rpm-4.4.6-stupidness.patch, files/rpm-4.4.6-with-sqlite.patch,
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 027aa94d2d84..2f3f299d32b5 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rpm-4.4.6-autotools.patch 660 RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 SHA1 70dd2346df0e5d95ec4a06587485381b48d52b81 SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569
+MD5 3393c6bd76f8f86a8266a4fd3c6ef1c5 files/rpm-4.4.6-autotools.patch 660
+RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 files/rpm-4.4.6-autotools.patch 660
+SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569 files/rpm-4.4.6-autotools.patch 660
 AUX rpm-4.4.6-stupidness.patch 4992 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a SHA1 317f19c9f181ca2cd40d832536c458884bb5b279 SHA256 84af6ddab50982e15df90d2c7895ecd0f0b568caa6cd0af57ce33e1af784b4a7
 MD5 ba3ebde8f6d04c144f7d42f4eaba3dcf files/rpm-4.4.6-stupidness.patch 4992
 RMD160 d8f0e831599a72e6224e19a568fffadd999ebc4a files/rpm-4.4.6-stupidness.patch 4992
@@ -12,18 +19,18 @@ RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c7c9 files/rpm-4.4.7-stupidness.patch
 SHA256 e563657e648e9b5ecfc0a653d7515f93db7785ec6867c81591663213965c0850 files/rpm-4.4.7-stupidness.patch 5268
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
 DIST rpm-4.4.7.tar.gz 14125623 RMD160 9002eb0fe1d680d8bff447d6918f9726c9a4e34c SHA1 b119fb0f10fd5e2eb330ba547b6a89e40f3c0e68 SHA256 18fde4195e4ac21a4290327336948f8c4fc58a680395edbb5f2f31bae67b18b5
-EBUILD rpm-4.4.6-r2.ebuild 2524 RMD160 8758be2b457fc2a60568eef22a170c5628f34945 SHA1 2545e3fa3510e1a6dfd92c9e487c3fa599b0f902 SHA256 0a8ca72696b5ba99b804b3e9023bcc71581ddd67e472370a027e061c25c4ceba
-MD5 5ccf886b3d7d23f8075444a160dcd375 rpm-4.4.6-r2.ebuild 2524
-RMD160 8758be2b457fc2a60568eef22a170c5628f34945 rpm-4.4.6-r2.ebuild 2524
-SHA256 0a8ca72696b5ba99b804b3e9023bcc71581ddd67e472370a027e061c25c4ceba rpm-4.4.6-r2.ebuild 2524
-EBUILD rpm-4.4.7.ebuild 2540 RMD160 780e9afcfffcdbea00070a6bdf84fa4528d2da21 SHA1 1a8c34f7f87237c10965321fdda371840f88d8e5 SHA256 bec9160b3af4b6aa60a96f213567b64a4e492fee7be4de91734f15f3ccf4efbc
-MD5 9ab796c3fd11e549ad799a09dfd3ab81 rpm-4.4.7.ebuild 2540
-RMD160 780e9afcfffcdbea00070a6bdf84fa4528d2da21 rpm-4.4.7.ebuild 2540
-SHA256 bec9160b3af4b6aa60a96f213567b64a4e492fee7be4de91734f15f3ccf4efbc rpm-4.4.7.ebuild 2540
-MISC ChangeLog 10706 RMD160 8c87b474cd0539d00f85c968e2a8f2fe8f3f425c SHA1 41ea259bd2b796d5424f3047bfd09ad22f288ddc SHA256 559c82ba23c788c063bcdae25b52a711679d6051882e802f681e119037492327
-MD5 4617b76ba9b62242353d495f7593b235 ChangeLog 10706
-RMD160 8c87b474cd0539d00f85c968e2a8f2fe8f3f425c ChangeLog 10706
-SHA256 559c82ba23c788c063bcdae25b52a711679d6051882e802f681e119037492327 ChangeLog 10706
+EBUILD rpm-4.4.6-r2.ebuild 2720 RMD160 3b4813d058bd421c83bd0e31a8f4b759ff6ddea2 SHA1 1014e7f69dd9fe44b1217cd9d4bdd3f32a5bd965 SHA256 ad074da2ecb96eca1dd95eccc92c588608f25cf7d86b6e9285d4ab6947dc919d
+MD5 d61e91432dc8d59bd6e422e9943e8d32 rpm-4.4.6-r2.ebuild 2720
+RMD160 3b4813d058bd421c83bd0e31a8f4b759ff6ddea2 rpm-4.4.6-r2.ebuild 2720
+SHA256 ad074da2ecb96eca1dd95eccc92c588608f25cf7d86b6e9285d4ab6947dc919d rpm-4.4.6-r2.ebuild 2720
+EBUILD rpm-4.4.7.ebuild 2736 RMD160 82f3ef9944c3d9d0cc25b0b8a6f39d7d52c6b5a4 SHA1 1cf8ca69261bc1a761be6c9182215d91a6049e4b SHA256 0d4ee138a4ca3c627bb7799e33048aad4a1a6e0cdad11f6d486e455d93139140
+MD5 9114e3ae21c62fdf1f05b863f95ce049 rpm-4.4.7.ebuild 2736
+RMD160 82f3ef9944c3d9d0cc25b0b8a6f39d7d52c6b5a4 rpm-4.4.7.ebuild 2736
+SHA256 0d4ee138a4ca3c627bb7799e33048aad4a1a6e0cdad11f6d486e455d93139140 rpm-4.4.7.ebuild 2736
+MISC ChangeLog 10581 RMD160 d42058e974a0e6bd979f404c7f918d8288944e31 SHA1 e78e0b83b7d8e63e8c94c5170dd10d6e0a878bf7 SHA256 aa4ba83019b51275c9223cbba2c749168bcf06e0e70b650e187bd6726a2df31c
+MD5 c2f8a7c2855af0aeb5449aad97647db5 ChangeLog 10581
+RMD160 d42058e974a0e6bd979f404c7f918d8288944e31 ChangeLog 10581
+SHA256 aa4ba83019b51275c9223cbba2c749168bcf06e0e70b650e187bd6726a2df31c ChangeLog 10581
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
@@ -34,3 +41,10 @@ SHA256 1a9d97d24a7c07cfd808a471e9fd22ced0813b41a109f6716b1d216fc828ecce files/di
 MD5 1bb4771bd008ae0ecf2541173a600056 files/digest-rpm-4.4.7 235
 RMD160 5738523442bad1419926794367ffc30a16b59140 files/digest-rpm-4.4.7 235
 SHA256 1bf6cb96963acf3da6ad4a4b2e8166f0b426c0e396cdfe4428b2386d1fcad697 files/digest-rpm-4.4.7 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6WIamhnQswr0vIRAlsHAKCv8qP2ZBCsQDYrKObErOp3ftazggCfQ5eC
+owMzPgaiwn4Xw0PvzM+1k3M=
+=+BPj
+-----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/files/rpm-4.4.6-autotools.patch b/app-arch/rpm/files/rpm-4.4.6-autotools.patch
new file mode 100644
index 000000000000..55fced35fe89
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.4.6-autotools.patch
@@ -0,0 +1,22 @@
+fixup autotool warning:
+
+configure.ac:661: warning: AC_COMPILE_IFELSE was called before AC_GNU_SOURCE
+autoconf/specific.m4:335: AC_GNU_SOURCE is expanded from...
+aclocal.m4:8669: gl_LOCK_BODY is expanded from...
+aclocal.m4:8463: gl_LOCK is expanded from...
+aclocal.m4:609: gt_INTL_SUBDIR_CORE is expanded from...
+aclocal.m4:511: AM_INTL_SUBDIR is expanded from...
+aclocal.m4:387: AM_GNU_GETTEXT is expanded from...
+configure.ac:661: the top level
+configure.ac:661: warning: AC_RUN_IFELSE was called before AC_GNU_SOURCE
+
+--- configure.ac
++++ configure.ac
+@@ -57,6 +57,7 @@
+ AC_PROG_MAKE_SET
+ dnl AC_PROG_RANLIB
+ AC_PROG_YACC
++AC_GNU_SOURCE
+ 
+ AC_AIX
+ AC_MINIX
diff --git a/app-arch/rpm/rpm-4.4.6-r2.ebuild b/app-arch/rpm/rpm-4.4.6-r2.ebuild
index bf0ca7901559..f4d2aea3ecb0 100644
--- a/app-arch/rpm/rpm-4.4.6-r2.ebuild
+++ b/app-arch/rpm/rpm-4.4.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r2.ebuild,v 1.3 2006/10/19 07:01:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6-r2.ebuild,v 1.4 2006/10/19 16:18:49 vapier Exp $
 
 WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
+WANT_AUTOMAKE="latest"
 inherit eutils autotools distutils perl-module
 
 DESCRIPTION="Red Hat Package Management Utils"
@@ -37,6 +37,11 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch
 	epatch "${FILESDIR}"/rpm-4.4.6-stupidness.patch
+	epatch "${FILESDIR}"/rpm-4.4.6-autotools.patch
+
+	# rpm uses AM_GNU_GETTEXT() but fails to actually
+	# include any of the required gettext files
+	cp /usr/share/gettext/config.rpath . || die
 
 	# the following are additional libraries that might be packaged with
 	# the rpm sources. grep for "test -d" in configure.ac
diff --git a/app-arch/rpm/rpm-4.4.7.ebuild b/app-arch/rpm/rpm-4.4.7.ebuild
index 99e3949c304f..84e49a5a5e4a 100644
--- a/app-arch/rpm/rpm-4.4.7.ebuild
+++ b/app-arch/rpm/rpm-4.4.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7.ebuild,v 1.3 2006/10/19 07:01:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7.ebuild,v 1.4 2006/10/19 16:18:49 vapier Exp $
 
 WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
+WANT_AUTOMAKE="latest"
 inherit eutils autotools distutils perl-module
 
 DESCRIPTION="Red Hat Package Management Utils"
@@ -37,6 +37,11 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch
 	epatch "${FILESDIR}"/rpm-4.4.7-stupidness.patch
+	epatch "${FILESDIR}"/rpm-4.4.6-autotools.patch
+
+	# rpm uses AM_GNU_GETTEXT() but fails to actually
+	# include any of the required gettext files
+	cp /usr/share/gettext/config.rpath . || die
 
 	# the following are additional libraries that might be packaged with
 	# the rpm sources. grep for "test -d" in configure.ac