gentoo resync : 14.05.2020

3 files changed, 99 insertions, 4 deletions

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index df8a836a371c..20276f854f3a 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -5,11 +5,14 @@ DIST bison-3.3.2.tar.xz 2108612 BLAKE2B 84cf59c02ff4ba34c052ef2539cde8d5932145ab
 DIST bison-3.4.2-patches-01.tar.xz 11152 BLAKE2B a0d0423e034cfa1dc45a542c05667a8226b535e82c260f638b67f4cf0f693b55b531bf310ed2e701ed7cc8b30f4b9ba9de61dcfcc64428fed38c9d528976b4bd SHA512 14341c52bf53d9fa58da0818626312b199ad1c14b2e0180589d6713d79caa6206070826e0ea65901cee0f6bf3122a7a9f8dad75a6c7d31cb11a31136e7d5a325
 DIST bison-3.4.2.tar.xz 2240532 BLAKE2B fb3d90dc3f21075069684e5d9f8d6982353d909b8c62c4d9925a22319c9f486a4ad7e2629a8932449a3444580ed701357c326aa7cd778a68f66f8eeae70cdac1 SHA512 00d2b37187b93100ec4b220ce2752d12ccf68f9d0d39b380d375d36dd8a22aa1d6e60156918f95e4493f9531c5d42d8fad38fd807307b491c1ca7ca4177823d9
 DIST bison-3.5.1-patches-01.tar.xz 9388 BLAKE2B 656cdc4fef308df3bc97c8f452ae75440909ed7eae13a8bdfc6b3b380f9d392ac3c9d300cb1e7a6d5548271b6ac63f5dfef594cbf9ef5322f97024468ed8e757 SHA512 195725726575998ff3d274d723ce3f605f9e1478601904668f165c1d9f628ed94380dfa65e546f12e3fc80b41aae7899774208510f382864dffde8545710f211
-DIST bison-3.5.3.tar.xz 2364904 BLAKE2B def6d9927746691ec06fa78637fe3bace015bd10e3d51389890489d864169f888aa7c7ea5400b8190766a0ab4b45f0edc1cb07dfd572b693e969e43a1b47d73e SHA512 888a1e8d4aeda3ff2d7d0a3a88b63bbfe89bdb718cc64d48c244e05fe6c6cd39526fd88143db379fef3071cf6c2dc2ab2fd69834c24acb23ed5f739584ff6308
 DIST bison-3.5.4.tar.xz 2370252 BLAKE2B 38078224f2e8e99210b64948831942f91062c6c9a080bee627f1ab4542f01b15bf2d4ce33a9864ae37cd5fb9bcc21e7e3382f98086698be12e01916640dd11f9 SHA512 92f59122dc4d5cae1debdd5567253f269ef001c98582a5763a2051424fecb78e8710c80a09fc488f6784705e679a8bc82874bc11cc03e4eb83445cb9f418b331
+DIST bison-3.6-patches-01.tar.xz 10140 BLAKE2B 7731f5ed15bd221f75a42961efa8a034383332344474c71db6d1c95bbeff6687f83e4a77f2330000f31787eb78d0826942a648c6f55b084632b2876e5810a5d4 SHA512 0325f4a5cf53ab4a51a4abe22bd53eb4023684d1b3bbe89de8a15769e0c76bc6746aebd36f1efa950f14228d194202b68de28b304260eeada4f85cecd1eb4675
+DIST bison-3.6.1.tar.xz 2463812 BLAKE2B f9906254a4226fa8321008bce2b241e18a1e5301cd688a10eaf284b6eb08699a40987c43dce60a73d0188a7213403cc1bc0d4c0ca9a648e42af6d720ac52d313 SHA512 64c81a63745d4ecf167d303cd6c254a5df57adf4cc52560d295a1f411be0d99abb7399ea82c3c80cb35a66bda831c4bbe56bf272a66b33939ce4b7631398bfe0
+DIST bison-3.6.tar.xz 2463276 BLAKE2B 4a846a16f6da7d34880215dcc4fde4699b86ad524ade111acc1aaca653e672f7a287a4d39a1a82601103fabf5a2f703f0e18f780f71196f37410322fcb0ac675 SHA512 968bbcfd1dffd10fb46ea4b3d49486d31b605f79ca88b8e2aa45fbafdb2fca3e1b0ac38564a9101681c8831cf423ea6a366f55d9497d21c05ddb3c7d66acb042
 EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
 EBUILD bison-3.3.2.ebuild 2604 BLAKE2B 4a634ef94acb4ec6189aa83967232f3b6a29f8408000a733920a8125da22ab2180950cd44eb06c7948cb87080e1fc9ca0ab864666d3ee519056b5820f12fa1c5 SHA512 95b30075d74b742c71cc8efbe9e2c096bc73827bbedc996e5429a9d26e6bd35c2ed6388f60e8f831588014e75868d3165078bab29e18a7970907e8e8a96357dd
 EBUILD bison-3.4.2.ebuild 2475 BLAKE2B 08355d3475296df4df66d7d8ed336d7bd85e3f856afdb43802afd929784c31b945250ace89f9f33f95238348a54502b3c62bea91cf75eb4becb0dc78fefb3273 SHA512 3a743140947e99949c2fb599ad2ebabc69bb3f773bc70961b0345c3009261b84a8f2bcc7a9612830b80e432957db4e50acbedd2d25c4af4d5436da58a8f97a4c
-EBUILD bison-3.5.3.ebuild 2487 BLAKE2B 4f9475c770b3ea48b98724599a5abd0846f907c5e37b5b315e4d19a74fb0b17981c1e2911f277132fc9d73e412a630c50b3b5802a3a6eaf39e8f0cf3c0aa1e8e SHA512 7e1e957a90d5244d13559f26c14f23b60b8cc9c23793a84c75cd78af77d28dae338932f9b87b7a3bbd9d3df141d43d1c770bf5611812d8ec1a08449471683285
 EBUILD bison-3.5.4.ebuild 2487 BLAKE2B 4f9475c770b3ea48b98724599a5abd0846f907c5e37b5b315e4d19a74fb0b17981c1e2911f277132fc9d73e412a630c50b3b5802a3a6eaf39e8f0cf3c0aa1e8e SHA512 7e1e957a90d5244d13559f26c14f23b60b8cc9c23793a84c75cd78af77d28dae338932f9b87b7a3bbd9d3df141d43d1c770bf5611812d8ec1a08449471683285
+EBUILD bison-3.6.1.ebuild 2483 BLAKE2B 88ff7f1aeaa597f162123b63d1c22461d53ae9208cd62de168a678ccbd2439f6e088b55b15f8fe7bffe8a3883b6b7325212e528d6cc17bc25128cd09e1c4c502 SHA512 23d7b9097bfde2d99ccab14eaf1975af5ef2f9116a9e5353534771193baaebd820f105e3088457103628c5f9ab167de506eedda3d4ecd3f98c0961a74ac47924
+EBUILD bison-3.6.ebuild 2483 BLAKE2B 88ff7f1aeaa597f162123b63d1c22461d53ae9208cd62de168a678ccbd2439f6e088b55b15f8fe7bffe8a3883b6b7325212e528d6cc17bc25128cd09e1c4c502 SHA512 23d7b9097bfde2d99ccab14eaf1975af5ef2f9116a9e5353534771193baaebd820f105e3088457103628c5f9ab167de506eedda3d4ecd3f98c0961a74ac47924
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.5.3.ebuild b/sys-devel/bison/bison-3.6.1.ebuild
index f2977ccb4e95..ae1caa517daa 100644
--- a/sys-devel/bison/bison-3.5.3.ebuild
+++ b/sys-devel/bison/bison-3.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic
 
-PATCHES="${PN}-3.5.1-patches-01.tar.xz"
+PATCHES="${PN}-3.6-patches-01.tar.xz"
 
 DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/"
@@ -33,7 +33,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-19
 
 PATCHES=(
 	"${WORKDIR}"/patches/${PN}-3.5-optional-perl.patch #538300
-	"${WORKDIR}"/patches/${PN}-3.5.1-avoid_autoreconf.patch
+	"${WORKDIR}"/patches/${PN}-3.6-avoid_autoreconf.patch
 )
 
 src_prepare() {
diff --git a/sys-devel/bison/bison-3.6.ebuild b/sys-devel/bison/bison-3.6.ebuild
new file mode 100644
index 000000000000..ae1caa517daa
--- /dev/null
+++ b/sys-devel/bison/bison-3.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+PATCHES="${PN}-3.6-patches-01.tar.xz"
+
+DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
+HOMEPAGE="https://www.gnu.org/software/bison/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${PATCHES}
+	https://dev.gentoo.org/~whissi/dist/bison/${PATCHES}
+	https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCHES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples nls static test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=sys-devel/m4-1.4.16"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	examples? ( dev-lang/perl )
+	nls? ( sys-devel/gettext )
+	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.6-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
+
+	default
+
+	# Restore date after patching
+	touch -r old.configure.ac configure.ac || die
+	touch -r old.configure configure || die
+
+	# The makefiles make the man page depend on the configure script
+	# which we patched above.  Touch it to prevent regeneration.
+	touch doc/bison.1 || die #548778 #538300#9
+
+	# Avoid regenerating the info page when the timezone is diff. #574492
+	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		$(use_enable examples)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# This one is installed by dev-util/yacc
+	mv "${ED}"/usr/bin/yacc{,.bison} || die
+	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
+
+	# We do not need liby.a
+	rm -r "${ED}"/usr/lib* || die
+}
+
+pkg_postinst() {
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ ! -e ${f} ]] ; then
+		ln -s yacc.bison "${f}"
+	fi
+}
+
+pkg_postrm() {
+	# clean up the dead symlink when we get unmerged #377469
+	local f="${EROOT}/usr/bin/yacc"
+	if [[ -L ${f} && ! -e ${f} ]] ; then
+		rm -f "${f}"
+	fi
+}