gentoo resync : 16.09.2020

3 files changed, 20 insertions, 16 deletions

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 290fc45aaa8a..d633a0a95545 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -2,12 +2,12 @@ DIST bison-3.1-patches-1.0.tar.xz 7268 BLAKE2B 9195c00be1706664762598926913cd8fc
 DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d981875ca2224f5aa344a43efbbbea34e79dff94ea489853e505b1d7f5920f4d159d1464ce61d8956ca0401ad SHA512 2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152
 DIST bison-3.6.3-patches-01.tar.xz 10316 BLAKE2B a99e12e69334371316e5841f8c86ed716a9fed108800a33099e99f8fe432374259bf5477188d054b6d474bc905f821939691fc97f0c891d17a79968466f0c7e3 SHA512 5c97a183232ad31f231580193ed1853aba18010703b0c22105eaf6834241c9828d180eaafbc5d1da751b2d45a7e8195493e10ca2321b35680b2b3cd4ec39e3ca
 DIST bison-3.6.4.tar.xz 2472456 BLAKE2B d2efe7ff1a349efe5a8c79eb69aa296dbc7eb9fde549afc91986460f27976e033dd793e904dda2f919f11e011ff6c458805288dff4939dcd1ee20e2b316cb9e6 SHA512 041cd87f4ca6b012031719a49aa81e62d3c0817c6364289732e6a3cb9a0762498760e0f2ce84c03ca9e9b74eb74bdffd1b8b86d2b4a6e4a0d8c8a4b864b672dc
-DIST bison-3.7-patches-01.tar.xz 10468 BLAKE2B 62d422fa0654d6d3e9f829edcfb9a6f0eb5ae60997aa9362bbbe280fc95d86114ff9399586acfa94f2a52564b4f745ca778ce016f102e2981caefb96575f56e8 SHA512 2703963df71871b6e4973d79f69ee95aa6cc22c342d852f136b16d636f90285f6921064616db66f10f29dbfce884a23f79c005e7ceaaf9ccd9a2e1c749b337ac
 DIST bison-3.7.1-patches-01.tar.xz 11072 BLAKE2B e68dc42fdeebd9c530d04ba906fb49dec3f2df0a68186a54de9671564ee47f9adc9ca4cb167ddaa3e15458dd339570191b2fe6debb33fdf47f29d1a7aa8d868f SHA512 d167f5278cf3136a96450b2bd664b2563c94205d7c82298951b0b08a6b4b0733101e25636f905c8d4033b5e6d1aaaddab70b7772c28e8c1d6c31a05e23df7ce5
 DIST bison-3.7.1.tar.xz 2605940 BLAKE2B a00e8af6a74100154d2dad1597c901f8473dbdcc57826eff947878c3568bfc9070d92857b3b3e349302e9fcfd67eb3287e7a04f6fcff3b897a6fecf43c1cd03d SHA512 9c4097b6ff26e819be14a9d4ef39f6f259c04627cd305e11da8e67897a369b2bba5ce96bf19fa5f6088670e90a9c5bc5c45172f8f482252aeec546b285dd0797
-DIST bison-3.7.tar.xz 2601220 BLAKE2B 3ac140048baacebce47a9090e916815e6c30d9c8b0f9fe61a3724b46fbfddf5b8bf94be2bc533a718d84bdc8c73d579b5e43d576efd488a6f5b52424883bc5cf SHA512 f6c8f1522849b65046844bd51953b4f1e2c32818d8bca0b8e4a1035e72d6731d8a66bc307d4b20d1a576cac6cbe10aa1c66829112327f37938ace165e154ba6a
+DIST bison-3.7.2-patches-02.tar.xz 99664 BLAKE2B 8f719265d16b42f398beef9ff9fde01c5f86d301421f64f8ac801cbc55af8d1258e1ae0f90e67b4de7bb8b25e99480acacc73815534f25e116f2f2b920ee9697 SHA512 bd99762a1f244755499efb400d2bb4399a5d21126eff253533b7f1320c8a4cd8513485cd176c90932029d720369182eb595ff36fa32ccaaa8d7048e46921e79b
+DIST bison-3.7.2.tar.xz 2613404 BLAKE2B 7543c7df4496fbe6b9ab18ffb643a0d58eb63d0d1e91d67eaa6f9a7c805180c1cef02a640fd41eec228782a6758f82058dc4a45c13e3730b740883efad77498d SHA512 42eb501c246e9b4b24cb212c8da538b11b1944b997314105e67f88f22d73b7d00cf19b21e086aa7523630a2a24e1fd70a89d85a7e3003783990e08d31f711a27
 EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
 EBUILD bison-3.6.4.ebuild 2484 BLAKE2B bd124013721e70456fa448f2e005a704e046d6290ef7f1eb42e848771f8f2390edfa6195b5be882104e390d1339fbb0d7e4474e7f9b189ab3b5809d29d16451a SHA512 6342a604c9644fb06c75bca03da99946b7d6eb2d8d25a96bc0e57a7de22af839075db0f7eaf64fc631d30467ba26c852317ed5c83791ecdf41adfa1f9c7d1375
-EBUILD bison-3.7.1.ebuild 2485 BLAKE2B 40ccdcdc669627ac881ac7d2a0247b47d075f075ae21f10849b1b3f1043523a960c31ec06e3d627eb7b7e7291edc8b417611cf26a4fc01476fb767d10783be3d SHA512 8f9bc46aac9ad5725dd434addc68f2e5146e8f89c4bfaf06ba6ad5687482d3401279a49f4f2ac1c350ef598b4f8185fa90cf0263b7ccaa5ab3f78a88683f486e
-EBUILD bison-3.7.ebuild 2489 BLAKE2B dd3eb51c04ccaf6026ec7398276ae99554f1eca449b96e6c17c62f89de289575e8335c8ddde720aecbb99cf2aca5366bfffea7b5327ac906567776dafe92dabd SHA512 c51de07a7fb665f09b7c88b19753bd3fb1c451840993ab067da2e506339f1b4d51e3157c5de863e06decc7b803a9500892b741b9829d9d3dc01aef28ae67607b
+EBUILD bison-3.7.1-r1.ebuild 2595 BLAKE2B baa507af3b72ade963afb30418b60f58dddead12cdecbac5ee4c9de6912ecfa6b173c6666bdde6985d817e45c23c67c3d75e1e7b78a6266b3e5814ae0a34d43f SHA512 324bef8d63f9dc384acd4df6fffb382cc926fdc92182a57bfd5893645ac0fd270b4b04da2a0a622a7c620fe441aaf528ce09a9c5a43769c2d175f7c79f529b5c
+EBUILD bison-3.7.2.ebuild 2502 BLAKE2B fc64923ec5a985c362c70f525f98752665ea5e7fa08360a839599f11b30d1dda5e8e5b25e0b168246e2be2d3324457c0edc21f6181ca46d54f0faee5bd5a7a28 SHA512 d17d9393bc3623067291a6b8400d9e93a17754ae6c1300cce824cb9dcfcc95c0c6f2a5f4ee1d70748e09d0205f8ecc2621d120d9e43babdae0818892db7dc2b3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.7.1.ebuild b/sys-devel/bison/bison-3.7.1-r1.ebuild
index cb5ef2103848..dd9b0ff67f99 100644
--- a/sys-devel/bison/bison-3.7.1.ebuild
+++ b/sys-devel/bison/bison-3.7.1-r1.ebuild
@@ -20,11 +20,15 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 s
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=sys-devel/m4-1.4.16"
-DEPEND="${RDEPEND}"
+# gettext _IS_ required in RDEPEND because >=bison-3.7 links against
+# libtextstyle.so!!! (see bug #740754)
+DEPEND="
+	>=sys-devel/m4-1.4.16
+	>=sys-devel/gettext-0.21
+"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-devel/flex
-	>=sys-devel/gettext-0.21
 	examples? ( dev-lang/perl )
 	test? ( dev-lang/perl )
 "
diff --git a/sys-devel/bison/bison-3.7.ebuild b/sys-devel/bison/bison-3.7.2.ebuild
index aa517bbd9c63..e23f6ca6bef4 100644
--- a/sys-devel/bison/bison-3.7.ebuild
+++ b/sys-devel/bison/bison-3.7.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 
-PATCH_TAR="${PN}-3.7-patches-01.tar.xz"
+PATCH_TAR="${PN}-3.7.2-patches-02.tar.xz"
 
 DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/"
@@ -20,27 +20,27 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=sys-devel/m4-1.4.16"
-DEPEND="${RDEPEND}"
+# gettext _IS_ required in RDEPEND because >=bison-3.7 links against
+# libtextstyle.so!!! (see bug #740754)
+DEPEND="
+	>=sys-devel/m4-1.4.16
+	>=sys-devel/gettext-0.21
+"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-devel/flex
-	>=sys-devel/gettext-0.21
 	examples? ( dev-lang/perl )
 	test? ( dev-lang/perl )
 "
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-1998 PACKAGING README-alpha README-release
 
-PATCHES=(
-	"${WORKDIR}"/patches/${PN}-3.5-optional-perl.patch #538300
-	"${WORKDIR}"/patches/${PN}-3.7-avoid_autoreconf.patch
-)
-
 src_prepare() {
 	# Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4'
 	touch -r configure.ac old.configure.ac || die
 	touch -r configure old.configure || die
 
+	eapply "${WORKDIR}"/patches
 	default
 
 	# Restore date after patching