Forcing automake-1.9. See bug #151874.

Package-Manager: portage-2.1.1

4 files changed, 21 insertions, 27 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index ba37fb814a41..2761ec5aca87 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.71 2006/10/17 19:36:00 vapier Exp $
+# $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.
 
   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 969a871733f6..027aa94d2d84 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -15,18 +12,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 2530 RMD160 5053a9b659716810aeeda2250f4561e8fb3ae003 SHA1 26d85a0fc4f6c216b8d62cad752c6126227faed0 SHA256 b383c933ac1a2e4515b12eea0c99108fd7060d21e12c9dcad115a1cdcad2dd92
-MD5 6ea530e1a5e42098ff3fbd703e2b077c rpm-4.4.6-r2.ebuild 2530
-RMD160 5053a9b659716810aeeda2250f4561e8fb3ae003 rpm-4.4.6-r2.ebuild 2530
-SHA256 b383c933ac1a2e4515b12eea0c99108fd7060d21e12c9dcad115a1cdcad2dd92 rpm-4.4.6-r2.ebuild 2530
-EBUILD rpm-4.4.7.ebuild 2546 RMD160 ed9e1ec16ce12886469f6950439de32218a43f78 SHA1 1e750b500f96d2f593162b20faa090da139ad239 SHA256 bd89f10571e164499f2198ebc35e7653db2b42fe0467060a7a2e09be4ea258cf
-MD5 34196b6e98eed02145e0a06d7659cf13 rpm-4.4.7.ebuild 2546
-RMD160 ed9e1ec16ce12886469f6950439de32218a43f78 rpm-4.4.7.ebuild 2546
-SHA256 bd89f10571e164499f2198ebc35e7653db2b42fe0467060a7a2e09be4ea258cf rpm-4.4.7.ebuild 2546
-MISC ChangeLog 10581 RMD160 9ea35100f1f855abf8a80274df6d746479d6b485 SHA1 91cae03cad812af35aeb33fd8cd3b13a3b553979 SHA256 9cd35b2cab68d6a4911b497450523cc73e537611d2238842bb496b73f940b492
-MD5 2a16bdb91aab3c019a59cc6c189a08c2 ChangeLog 10581
-RMD160 9ea35100f1f855abf8a80274df6d746479d6b485 ChangeLog 10581
-SHA256 9cd35b2cab68d6a4911b497450523cc73e537611d2238842bb496b73f940b492 ChangeLog 10581
+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
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
@@ -37,10 +34,3 @@ 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)
-
-iD8DBQFFNTC1amhnQswr0vIRAhYaAKCyelWRW+8VcznwqSsw8hLM4idCUACeLT8d
-RfNmoBz95lLn6xs/RAPj+X8=
-=zlYQ
------END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.4.6-r2.ebuild b/app-arch/rpm/rpm-4.4.6-r2.ebuild
index fed4d9756111..bf0ca7901559 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.2 2006/10/17 19:36:00 vapier Exp $
+# $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 $
 
 WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+WANT_AUTOMAKE="1.9"
 inherit eutils autotools distutils perl-module
 
 DESCRIPTION="Red Hat Package Management Utils"
diff --git a/app-arch/rpm/rpm-4.4.7.ebuild b/app-arch/rpm/rpm-4.4.7.ebuild
index 871748343287..99e3949c304f 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.2 2006/10/17 19:36:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7.ebuild,v 1.3 2006/10/19 07:01:22 pva Exp $
 
 WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+WANT_AUTOMAKE="1.9"
 inherit eutils autotools distutils perl-module
 
 DESCRIPTION="Red Hat Package Management Utils"