Prevent automake mainainer mode from happening, bugs 365993 and 450448.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 20 insertions, 20 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index b57f69fdf9ac..c2a98a68f80d 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.164 2013/01/05 09:47:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.165 2013/01/07 03:02:01 floppym Exp $
+
+  07 Jan 2013; Mike Gilbert <floppym@gentoo.org> rpm-4.10.0.ebuild,
+  rpm-4.10.2.ebuild:
+  Prevent automake mainainer mode from happening, bugs 365993 and 450448.
 
   05 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> rpm-4.10.2.ebuild:
   Stabilise on amd64 x86 ppc and ppc64 wrt bug#450286.
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 81d84b675af7..55100c97f179 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -7,24 +7,14 @@ AUX rpm-4.8.1-db-path.patch 628 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7
 AUX rpm-4.9.1.2-libdir.patch 1056 SHA256 e4beb68b13861ccedcaa0a90c49f42c6dd7a2d7799360798b21eec7ea689437c SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc WHIRLPOOL 2a72aa223728f18fe186686dfee3e137e52f91a8150d4ed364fee9b9152941a4b2df366958901e4bdb733acf1eca77f5662755373fa0928f4f782e0723197caa
 DIST rpm-4.10.0.tar.bz2 3530378 SHA256 0e2e237235b64c07ee4a4152e4eb77aad4eb559737eac9b6713c5e1bcabfe4a9 SHA512 413362243e214cc16227142c26223e1a1deed83f57fe3d80951825f8cd325d11a8038654512815e04044e18e7c6f185e3330d5f652939c77f395ae14190413cd WHIRLPOOL 84d29e9f91b3b581ff0da9f0ce31128599931cc45acd5fd6bb60b8cc13b873c3e1be4e8e4c374913165950734dc8f4cd657ccd407f83549e472288a928f3d691
 DIST rpm-4.10.2.tar.bz2 3545536 SHA256 e9278a2b40f08bae5a9592b9b42f11f88b2e880cc34e57113d53461ed7de6e7b SHA512 7e290e0c0a993a96d575c8c962250f0eac12e11cd678d2f46cb23fbdb1e8dc1b2d63dc4dfa3efe7fa8917d34598a279eaf845331b311f64d02bcc4e93faae266 WHIRLPOOL bdf781030a5760d99950cb7162d2780675b00fe41ecb51b2d9ba22466ce150499489c25fc0a234143403d4d244351afa81828e20fe57bb67cdeaff5f712fbc13
-EBUILD rpm-4.10.0.ebuild 2694 SHA256 957abd23b6e2d1531918c47ed1cbab9f5857b1348c62c2261500a7dc4b1eeac3 SHA512 c43b43d1d2f8b3a66844ed2ea1d84885a11b1357d3b3b90d4c378c8f5ea443e95c4e996393e9c560f9b1ce091c81d9fbc833b815bb1a48573d2687e855bfa9dc WHIRLPOOL 6d525bb1e5eb2b2c7137930254ba9e52ecb831a820e37a82b62f8ee071db1a2a77c88812631acc1010a5e2ffa225c559cae0425d697e334ec400ff2b77fceffa
-EBUILD rpm-4.10.2.ebuild 2696 SHA256 7b8e640592175c7db992852a4fa3e0f7681fd01a4a5f4011918023b16926d088 SHA512 1548721b2177a1f3e33e672b06ed67b6f2504e2ab5ebd53fe4933dc7dc8449a4e1c41ef23bae46ba17b72f2239d0844f25beef96129535f737be4c45685f78e6 WHIRLPOOL 6e8edade57aefb74707c7704e3e81d4bd6d93dd75bb18d8ba78b4e1c5f0dba96cb9c09f9a38a6bca7d33fabd86281aa43089fcca5b8d43c70a67d8a9d879515a
-MISC ChangeLog 25419 SHA256 17ddd567c41b4cedf9dcdcaef1f91ba9419c90d6740bf38cd9a70b6b67fa34e2 SHA512 32db950fe1a61dfafaa8b5c81b0813a4352fef670de7c2869e07121415fd7854580e14c8df358e06eee7bef497f4d4bc58ea04c2563db5a5210ef2821b8508e2 WHIRLPOOL 046b2d0e18c7dc92772a4458ab90d881678ecc72b6bb5db3f9a68a5f76f7bf1de8b3de93b2a32227ee7b684854edaef07874066d0301b6db59c5ef29b46b4549
+EBUILD rpm-4.10.0.ebuild 2795 SHA256 e94e04686f059ce606485c667898701763a1fd2b3d781073b9c2f278f2d35123 SHA512 aef0c8bbce18cd8b1b60b5de261b6eb078ded8e00dc681623aefdca46b5efac13bfa117beaeb9dc6357b5c656037a17d3b412f18f4ea9a6bc481aff15b918180 WHIRLPOOL dff0f08295798fc4c6bfb1fa3e4a948230eb18a53d070567d32f5139db578cb806034d07543f1b37d59df20b1b38c58cba7f46e4e6dd8151c0a9a15f511e9c11
+EBUILD rpm-4.10.2.ebuild 2794 SHA256 ecf6aabcd71725a8da8f6f091e5c09269df11ba7b870a47882f75e87f06bf1ee SHA512 64f5fa338d90cdd2bbbfc9e809a52c311b7bf9b4e7da728d678e1907b22367a159bbd597cfa8525fcdfbd253b1aa21a230d540a141a2e8f3129ec23551170518 WHIRLPOOL 0bfd5ccfbf6acc8f1966f56bc9eecf9ec340514f289acb7943a003a547194395b8e94edc628dfda2b6562f1b8f67353ff94bd38a163dd0502f27d7f2d3680659
+MISC ChangeLog 25581 SHA256 3dfa54111044696cd54803c79e21b8c91d7d37aa5f761c6adc068ace6e87f4b2 SHA512 05a0b51cc46311deab68960ecde9780feb485248ed68ba2712a61b506cb5522d6e1c28f519174d49aceefcd88bfb90c09587ce4baa1202d0da40b8ad1a5ae354 WHIRLPOOL 49c71041caad7c1a6e0a63d78393bc7a80df37020e2d29115fb9821c8e58836c03eb7ae8fa6e4d0f6d80545ea81907377cad2e64554717e07b73e5e6532abc1e
 MISC metadata.xml 258 SHA256 d18cd3c79f172a08970999a154c3ae331f1e6eabe37e677a4491e6ccf5122ab2 SHA512 a35165b524655cb15d343890439b14c3f5eaa998825338a5adc4cff8edad391869c31bc33b4f9bf7bb03a99653684c3f4eb5897b314c0ca1e89defba3f4b9dcf WHIRLPOOL c7d2a308b3d592fc50542eb844e302f214ee6b738b4853332e0a2c034c32cdefd646b5e6c50351e7735ac87f97bf5a5d211d121373a0ace625e564862a62f1ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ5/awAAoJEOSiRoyO7jvonYgP/iOQrM4RGBAqI25yRvC14nVK
-cQqCNGwuSenHD0DdPBNY2zqc6LKfh9V1cd/DpYx9rVVqFIRrW5bWE2dhsXoBZldU
-tmg9sQpv8l7oiirm30e2e/BgRJYxa38FKx5y4gfc8RgqbOObKhTROBBiYQsTsNgX
-vYe92y6TKE0mXcw/aTFWRW7pGR8m4eHkbuiF9F8OyI0yhEokrYOB2PFT+AaGZwfU
-fywbWa7qKi5dqeKxF6SPHN9bLN38ZbXJdnRx4/AHiEboYFuJ85Xnhs5ly3omCk+H
-Ahzy/Q0E+RzUG/wBVl7skhnzdfeZIT0bsL2ah8rWFm5NAAzHzo2+XE1BFn1y4m+J
-Z6jhd/mj451o70bTfZOHtp/tNAiMfZyXQ9XM4hJRI+itoWTBb67eScU59qUkIcxz
-OU8PvPp+e7uvkgYaVNk17CNWfbilLnGP6NJfjapIxE8OPsrePX9C8Ylu0UBahH5V
-NebLtcSURPpaBd2zXdFbuoelyYLhWcmlbi+YhflgOKf+h7xRR3bIjjeDWA2LqMwS
-jAyUYC7mu3g3Eap/nkDfKBY43aZAlZ3a4o/Dv9X2n30UCGeGGRyfWE3AFn40505a
-vAI9yArjpXoJW7iF4D+A/q+0Jx8LPv9sbDzNksDETjrAXsP4Q495yFECjSLELhU/
-TA1nnZDmkimN0eymUNDz
-=4Ww1
+iF4EAREIAAYFAlDqOqsACgkQC77qH+pIQ6Sk8AD/eUxfX5oefRbXt/oYoR9jiknp
+OiOKXw7WA49vItdeKqEA/0oaZZgjPpBJo1WuPlMqWtPLnko5oo3JWiJAbx7ZtneG
+=Y5ae
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.10.0.ebuild b/app-arch/rpm/rpm-4.10.0.ebuild
index bf8816d3c093..2c5c5599abe0 100644
--- a/app-arch/rpm/rpm-4.10.0.ebuild
+++ b/app-arch/rpm/rpm-4.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.0.ebuild,v 1.9 2012/10/14 17:40:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.0.ebuild,v 1.10 2013/01/07 03:02:00 floppym Exp $
 
 EAPI=4
 
@@ -54,6 +54,9 @@ src_prepare() {
 	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
 
 	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
 }
 
 src_configure() {
diff --git a/app-arch/rpm/rpm-4.10.2.ebuild b/app-arch/rpm/rpm-4.10.2.ebuild
index 8d7c24d3acd0..76099d4cde4b 100644
--- a/app-arch/rpm/rpm-4.10.2.ebuild
+++ b/app-arch/rpm/rpm-4.10.2.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/app-arch/rpm/rpm-4.10.2.ebuild,v 1.2 2013/01/05 09:47:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.2.ebuild,v 1.3 2013/01/07 03:02:00 floppym Exp $
 
 EAPI=4
 
@@ -54,6 +54,9 @@ src_prepare() {
 	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
 
 	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
 }
 
 src_configure() {