From 7d85d9bf7949768f206c34cde4ef5ad5cd31ddec Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Tue, 18 Nov 2014 16:26:21 +0000 Subject: [PATCH] Workaround autotools bug, see bugs 479372, 529580, 527506 for details Signed-off-by: Andrew Savchenko Package-Manager: portage-2.2.14/cvs/Linux i686 Manifest-Sign-Key: 0x565953B95372756C --- app-text/docbook2X/ChangeLog | 6 +++++- app-text/docbook2X/Manifest | 20 +++++++++++++++----- app-text/docbook2X/docbook2X-0.8.8-r4.ebuild | 9 ++++++++- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app-text/docbook2X/ChangeLog b/app-text/docbook2X/ChangeLog index ec5d94893a42..2bb441c69e60 100644 --- a/app-text/docbook2X/ChangeLog +++ b/app-text/docbook2X/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/docbook2X # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.51 2014/09/14 09:10:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/ChangeLog,v 1.52 2014/11/18 16:26:16 bircoph Exp $ + + 18 Nov 2014; Andrew Savchenko docbook2X-0.8.8-r4.ebuild: + Workaround autotools bug with cache going off sync sometimes, until + autotool.eclass is fixed. See bugs 479372, 529580, 527506. 14 Sep 2014; Markus Meier docbook2X-0.8.8-r4.ebuild: arm stable, bug #520860 diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest index 2d2023eb138a..1553002ec64e 100644 --- a/app-text/docbook2X/Manifest +++ b/app-text/docbook2X/Manifest @@ -8,13 +8,23 @@ AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 SHA256 0f571f0e95 DIST docbook2X-0.8.8.tar.gz 723909 SHA256 4077757d367a9d1b1427e8d5dfc3c49d993e90deabc6df23d05cfe9cd2fcdc45 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c WHIRLPOOL 60cf325cbb9dbc7e0edc3a7bc4beb061259b22602efae54335f3828417c593ce7cb4c838eb33d598e1e6c2b2583e93eafbdfab37dba2873f1d8abaa72ed07b95 EBUILD docbook2X-0.8.8-r2.ebuild 1284 SHA256 e7eaac15a49522272b01c09b1e60fbebc98dbe368f9ce3b96c4dd176a57571c4 SHA512 5f335b4b2c8f058144a8d6a83854b50c7b36a4cdb04d09f9eb18de606170d8a16d842b176ac8449ab83aadcf8bd4f814fe1265056d15f7f45389ed1266718d4c WHIRLPOOL 17218635b07f2d86c82f49a1d4d3fd3406b72ed0054dc93044b6b9006d0cf071f522153a7393c889e434b390f469c42ae298a73c158c2efa8607aafb90acace0 EBUILD docbook2X-0.8.8-r3.ebuild 1549 SHA256 c6229c7e04cd236e358afe5cf81f5785986a415566b0513cac05dadc743414f0 SHA512 2a971f8e06b8565d4f42932c96cd2968e5d00c043f6c93f20f5c774c2ac7cd557e455332fbd8ef23c46e2002fcc55bed242fe4c43e416b553f6ff6ce41800113 WHIRLPOOL d82811809915e51d37cf0b01f4d282023b5983adbcb30c7d5bff7042578c15b4e5f5998a622e2d4ac20f09576e01d3407e217426aacf0d871a75e50ec0d060db -EBUILD docbook2X-0.8.8-r4.ebuild 1684 SHA256 51ab2a706f8a628875c75c2d0f3274dc6e6d6fd91172609b351bc4751f46cce6 SHA512 7d45ff7106ec2ab15bc257567c204dc8c4e05057d7a8db822fa4da1faee7be93eb17bf2a681fa8937c87cc1a25816b85ea8b88a48475a51ddfb010f655553646 WHIRLPOOL 50971dbc1941733539bd8030d4c12c9924574f3838e0fc2b3cb9daef7c3b53a51b0c712bae9ae2c30474bde48403acffe97622798e03bd58855a062ede49523a -MISC ChangeLog 7889 SHA256 733ac776cf954e3cab02660c813b06f5699f1790e22ef2290d205bea330a973e SHA512 d45e39ba5202c5df1c0484f3eccd33a604875f0f5b9b58dc100691cb4f9c52481da76eddcc8040c9a5182b050a8c213d22c8167116d3ebbd72bb088a5f881d5b WHIRLPOOL 4f023203f0022ca1d0135b503d9146f8c8d1a7cf7ed204cb997045941925a150b9ffac6339c8115bf986384eaaebc9dd7d32cee84d5284c7e734436cfeb5005d +EBUILD docbook2X-0.8.8-r4.ebuild 1873 SHA256 fffc42158b9d6036f413677aa7562ac68ec76703c0b15e59340dc8f527d84145 SHA512 b50019940429f2fac964c95313ecd8a02f3e070bca6a11a10fffc496d915a91da938bcefd36a385ef0f7d4bb93a99339cb4dc56b73b1711e2338e078a9676154 WHIRLPOOL 66bea8df27c5281bf451e3db55d9e05ed1f9bb9030d2e01a13a46e6025a5269f0a97ce5ece89dc7854e16ab56fb870ea046675b8c238bb85e737a3f21e552ebd +MISC ChangeLog 8102 SHA256 ba5897a5e13b4add8b574d24bf12afd0625bbb2ab9e45469069ae1ba3d27c27a SHA512 8bfb4617f2c8a3abdaca73af449137f34438085edd1c0a06b1669f0b1bfa98e18c4eccc454c4cf0e90f0c56ae57a57f87de83060bb26becc6702c18323c4f559 WHIRLPOOL da5e19e5bf6ba83e7b0b84d272aa92dd1780759acec05d59fc67b0d733da0c1e0f6ad7d3c9197d9bbf1e41d99ae902c4c35edbfcaa09267ea17fc916fe01acaf MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQVW3sACgkQkKaRLQcq0GIE9gCgoFvC40AgorC4fbfsiI9fMXDh -a+IAn0WRLP7S1ABSbQeYseIPkt5/PZn2 -=cNe6 +iQIcBAEBCAAGBQJUa3MpAAoJEFZZU7lTcnVs7q0P+wap4Ya2coB34MakHWKc/eo3 +KrjfbgHBUGr3tcP/nACY4Go+I0x3w6aOHWMdF+skeT8tBlBOSxH5dKuJRTT9uhDs +daxtBaG/7Cxh667d60aj1lNezvyWMMqs32J0W1YrvulzBdqEHHFbYhANQfBPXXid +XMbQTi2mZ59eRF2iIR6z+fh9VpmOiIOhH1Z5j0ygdjnBtkyGV8V+20fxDPFp4iu/ +NEgPW9/Ud6Ao0RoIWqDP/cPWqAN30dopxdTP3b1TnA6aZ4vBU+X7Y+QRHDGG0S6V +zKe9mw/mwgZQMJ1M71dpyksQP0K+ywzmdb/phFI9Lf4rTHCWteLyrGym6uij7qDX +TKW98pG/HoRlj3MLwD1IgCGqHLZIPE/FOjjEWiLaC76vLamEQbJdam2HPswm+Tj1 +vjQsVozFsJD4ZZDTukD8b3Z4+u3Ed4VFLfQNABllqBF9zaDC3hw2PqJDPQOMIugW +HS479YYRb8NtiknvuivzgWSGZQT/hdcWygbGcpA5AtDhI2Hz8JuQR+4QX/QkyJVe +XwcSgdSZ6J2Qme5HJAWq9GJHVjeKh/oQupfwOVaT1d3tab2zOiHbvALsSbc03y6w +VEP2BDJOeAn3ICbsyuwFQlcxRKbZZd9kWDdOeXxuNj9xwO+eS02YUzbWxE8h0i35 +OONylDuhiiyl4rxFzYyc +=DYW4 -----END PGP SIGNATURE----- diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild index 7b58294231be..b202a470aad9 100644 --- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild +++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild,v 1.4 2014/09/14 09:10:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild,v 1.5 2014/11/18 16:26:16 bircoph Exp $ EAPI="5" @@ -39,6 +39,13 @@ src_prepare() { sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed' autotools-utils_src_prepare + + # Workaround floating autotools bug with invalid generated data + # see bugs 479372, 529580, 527506. + # Should be removed when 527506 is fixed. + eautoconf --force + eautoheader + eautomake } src_configure() { -- 2.26.2