Avoid regenerating bash info page #407985 by Jory A. Pratt.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 38 insertions, 6 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 8c803465e091..bed6ca07481e 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.299 2012/03/13 13:20:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.300 2012/03/13 14:43:10 vapier Exp $
+
+  13 Mar 2012; Mike Frysinger <vapier@gentoo.org> bash-4.2_p20.ebuild,
+  bash-4.2_p24.ebuild:
+  Avoid regenerating bash info page #407985 by Jory A. Pratt.
 
   13 Mar 2012; Brent Baude <ranger@gentoo.org> bash-4.2_p20.ebuild:
   Marking bash-4.2_p20 ppc for bug 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ffb8d82bf48d..25040c4fa425 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba
 AUX bash-3.0-configs.patch 2538 RMD160 00e8015531efb6a59298782581928f1aff2247e6 SHA1 7f4615de4ac2219372d34dfbead3311fcfdfab2a SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
@@ -186,8 +189,25 @@ EBUILD bash-4.1_p11.ebuild 5660 RMD160 307a3558a0b42808eacdd776841833cc40606d3d
 EBUILD bash-4.1_p7.ebuild 5647 RMD160 d304c9b6eeb384f9baa4a84e262f4725a2fad7b0 SHA1 7bbd8c7145bd494ff86fde53b9ba63a9aa1dd3de SHA256 f5d0f3136170e346cd97f30cc735f1e007183c5ae73bedb12b596c5b26323feb
 EBUILD bash-4.1_p9.ebuild 5647 RMD160 a4735eb85dacda84c5e616c40b18d3bd6090c2b8 SHA1 fb124d72adcab6e86240cfc991c18eb0681333a1 SHA256 9dfe8f46a4e24aa1a994e886fae5a80228449b0471e0856368e521ad2fd36588
 EBUILD bash-4.2_p10.ebuild 5604 RMD160 82d81068ca21f03dfa36e3f8e4b1506e91ef4a4d SHA1 65ae606556415c0cd82d1a8373aeb8574447650a SHA256 f0359ff78cd7c8b62e6e613779d83da25c158d430f2c54dee9c3d5fc2e1baf40
-EBUILD bash-4.2_p20.ebuild 5698 RMD160 2569bbece8363c549a7f8c76e4b436613f2736f1 SHA1 1a4314b95d4da45503455c576412b0ffa5d6ef4c SHA256 88d109801ff719c69b1fda86fa236d62fa9b93fde3662370e67a5d6b7036ea8c
-EBUILD bash-4.2_p24.ebuild 5701 RMD160 f264ef16ce6df8f4e886662ed4c007b0266366b1 SHA1 8c3ae67017cbbc14477238125dd8e2ebecb37987 SHA256 ec64de8bf7a779fc71d86d6b76008654b7ea19ba9f9e1354ab1cc36223cfcb98
+EBUILD bash-4.2_p20.ebuild 5825 RMD160 103f8cd638d70518c49cc6261d4098bac627109a SHA1 923cb251f8b4e74372134b309404e00b2cacae28 SHA256 d5f2b6f3b1bdc51fe400b085318ec1208514b598aa9ee29fecb8235977c22f6c
+EBUILD bash-4.2_p24.ebuild 5828 RMD160 cdd43e5c32c837a1e24d1e46cf99bd7a2d93e92b SHA1 741c769b21fb7187a591b76dc905a84ede4aab35 SHA256 b7e41f3b948c855e092d53527c9ef0961a215812bee390b7c525989ee88f78a7
 EBUILD bash-4.2_p8-r1.ebuild 5546 RMD160 d60f2c28b28dcb55b063f16b8ee5400b88e0f6d6 SHA1 096e27b3ead5a1ec0756f88471db3084bee98f01 SHA256 466fd15f97af04edd495bf0452c8bebb0725288c2503362ff3d0088e849ca105
-MISC ChangeLog 46183 RMD160 b2c5a54130283a7826b6ea557e94559e72418445 SHA1 c9b0e2739fac4f3c5aeef5cacb84abfc47710b97 SHA256 92ead1d4fd72902d559c297e4184074b98ccec8c13ac51f36784dd852f049997
+MISC ChangeLog 46340 RMD160 46460c5e72d945c28e202d40900d9dc1c86b205b SHA1 959dcbf5153b3fec03aa74403cc6d38823e52a86 SHA256 41236f7d9fb2b2a1bf37d9635b3690be4d27fee5898b4d9a345bdc5bda5caafd
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPX10FAAoJELEHsLL7fEFWjz4QAKAOB1nnEJl/1gVsg+dYjtL+
+XM+KrDWAg230i52/DR7f381B5fPGg40cfYMJ6QGLFxhrasOIk0Ano4e0Ri/a9czK
+vwNSgkd2Y+gkAkkFN7P8Q32k8oonJjp9SJWkFz3h5T8KYV/vVj0nXpijsCeHMAD+
+dAKGyiLYGHVXlJV8fxRYVPqsnC3LZwdc3Gp+jzZ9LYm9DDwrvLFU1uzI/9YfoNFj
+By4V0LZgBfUVPvQAq6tE5mOPiR2OcRCw2u5sZ02jq0WryFYJpz5jWEiczygBOAzR
+Q4ZmWNZkCtD2F7E52Or0qLbKQ0tMExgF7wRwI/HXYeIdpIIedB29JOU3wxPJEVSQ
+yLkHJxviBabUNAIuJW0QYQIL3iplDCMogUIhe6MqW5jU2ceunpQY168CMQxW60ub
+5qL67IH4aH/BtT3TW0o077ffiuQNIJm992wshgxi+ZgAcOEWYYCAfInVf16j7um5
+RCX+aHkylr07toMxYa+hXrik36Fp5Egvm5f1TLCpOcPyvTx5qvA99xCHP1Q/EQ7s
+/PbmXbiXTrzRyYnG6iotloCvFpH8aA3MbA5QIv3H1e4diZucE0H3QZKHyUqi3h5z
+H8kxQgv+ttcusCIkL0oCMGtG5N3xwQyHReu9xRCDnJW7cF93SaKKWJsTIwNr1O9y
+yPkibt0qwbNioZidSJ4K
+=ZsjT
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.2_p20.ebuild b/app-shells/bash/bash-4.2_p20.ebuild
index c4fa2400ddd8..395af6cf02de 100644
--- a/app-shells/bash/bash-4.2_p20.ebuild
+++ b/app-shells/bash/bash-4.2_p20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.5 2012/03/13 13:20:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.6 2012/03/13 14:43:10 vapier Exp $
 
 EAPI="1"
 
@@ -72,6 +72,10 @@ src_unpack() {
 	touch lib/{readline,termcap}/Makefile.in # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[a-z]*.h::g' Makefile.in || die
 
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
 	epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
 	epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
 }
diff --git a/app-shells/bash/bash-4.2_p24.ebuild b/app-shells/bash/bash-4.2_p24.ebuild
index 00dc265b2fa4..c7e6f29c4d6c 100644
--- a/app-shells/bash/bash-4.2_p24.ebuild
+++ b/app-shells/bash/bash-4.2_p24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.1 2012/03/12 14:57:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.2 2012/03/13 14:43:10 vapier Exp $
 
 EAPI="1"
 
@@ -72,6 +72,10 @@ src_unpack() {
 	touch lib/{readline,termcap}/Makefile.in # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[a-z]*.h::g' Makefile.in || die
 
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
 	epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
 	epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
 }