gentoo resync 08.09.2018

5 files changed, 113 insertions, 15 deletions

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index d3bf6440b341..c6ce390c84d1 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,9 +1,12 @@
 DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f942d48326a9ac869cf31fd8f127759167dced662b826fa54a24cd0cf87b0c096814c84e34afed8078368828a1 SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370
 DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b
 DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
-DIST bison-3.0.5-patches-01.tar.xz 5192 BLAKE2B ee5bbd59569b484e62dbd820a9795fa6d89c79fed96aa0615ec3baa067ae1f0f7ea6eadccf94d20458fc18d5977e8eac4e50a1a5f41f51519d8ff9f58dc78ab4 SHA512 f5df3896a113b6ce4a361d61b0139ee2ed4e0bda4a46e6312ae2ded0c7a1b2d2b67b37545c0bcad806f9289954022ff446c00bc2384dfff4049afb53e4657ed5
+DIST bison-3.0.5-patches-1.1.tar.xz 5188 BLAKE2B 437a202cfc2431a5fe9a31ea6bcce5978d5a6ca5e812f3a45928a67aa78ec7c93327e0520516aa5f79a0d7c395e7b959f22d3f2f962eab5a5b826d3f9816786a SHA512 54371d28f3d0ec7a2709684030f4f008cff4cb1a74ba30586615caace5417d4d475a7453ba956d8d10ee819391779d74725c203412339388d4131ddebd46f93d
 DIST bison-3.0.5.tar.xz 1954868 BLAKE2B b6a8b426304f414c1b7601e75dcae8a63847b71361fba2538ad5cc52f3527fe464b066add670a236d5e1d2aff65bbe7a99c282ee3c72a0bfaa498d40e3a50398 SHA512 00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2
-EBUILD bison-2.7.1.ebuild 1641 BLAKE2B 41dbe1a40e5ffef3a9d259350cf40c66c17ac4a3f21049e858840a3571b682145d4545a7179fcf4d6c3b3c57db1212669690822ed8d5a510c290dd67bce82a0d SHA512 61b9c0ddf1ffc34bc1d1c849b242a02d9892315eaa14fc465c75349306476bcb93c65efe9223df3f503a7ba48c3e043422d626f955dbeab9f1ea59f95c012b25
-EBUILD bison-3.0.4-r1.ebuild 2469 BLAKE2B 6a0f5900ccd90f71bab9816e0e78a0bcd34f8e4f71517afb8c5d17422e1a19fdc5fe96c06827d4dcbce487b8293b34c36857a133c5ba79cc8c95876ff46057cb SHA512 5cd934e6cb839e468062f726317758e57e9d34dcdb525c9cdb0ce562eb537d25bbc52196b8249a3a6044b2d14a9112d0a1169edc71c13dc29c78c200dcfaf88b
-EBUILD bison-3.0.5.ebuild 2443 BLAKE2B abbd604bfb5b8029c8c301d10585997ed0f226c084343768947cc7c510412c830d52e09bc35496af423307f195249c7a80a8db6d33b5ab69209cdc23c68a7be2 SHA512 3eb5aaa9ba42daffaa92306d565f225dac6202f7b4599efd51f0c49539d0aaa19f4d2e72c90bbd63adedb9a76e628ea7a23b646b5e44011479af04c689ae9bb6
+DIST bison-3.1-patches-1.0.tar.xz 7268 BLAKE2B 9195c00be1706664762598926913cd8fc18a32a6ae6ae4ec58748d5e8fc4877f63258db51cbe3bf84f3345ea0fc7c27d2e1190632c529615d9e6922baef74915 SHA512 5569b7901b40ea01eb7bccdc1b090207bc1ea6c50d144b561b2725ae79f3bcd51e7ea4e8ea37b60ea50ff4882e82110a07986cba1d2397a0333e7e01ae466e79
+DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d981875ca2224f5aa344a43efbbbea34e79dff94ea489853e505b1d7f5920f4d159d1464ce61d8956ca0401ad SHA512 2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152
+EBUILD bison-2.7.1.ebuild 1630 BLAKE2B e5172368221a1a6a51d2949e3d3e9a2a8d31bb7e56edfa2b80d183cf6f7ed645368e6bd705d3858667dfa3dca2939240a4a603f1051ba1dbf62be3d71231d30e SHA512 9d8022a854924d5998b2312070d18604661d59200ab0dc9b5698975dedf9bfe3060f8b647b067c96dd6834b5d356b2f8b9f45552acb5566bae5972a9d95f793d
+EBUILD bison-3.0.4-r1.ebuild 2458 BLAKE2B 1105bccd73e0a25f34c549a3b1eb95affe13ae79c09d4d16f8525134ef3ded288914c1a2868e72e2088d2e38148a305a5d7228dca42d5884eeed421e3e5a6437 SHA512 2a29d81a8e2284897aa0d5d687eb3253f063a2a152d8d72ad1092a2df64caf84013d758a2f77df4f62d86b7c3af61c1136e74b51a7e5dde487913286402d1782
+EBUILD bison-3.0.5-r1.ebuild 2524 BLAKE2B 57ab22407bef7eadc5b1eeac7e0d300af2b5e18c105d83715746decac3531c05e8aac854eb0409fc12529d22de05776e93cebbf7c0be832469c173d7b695938d SHA512 2f76c348c8bc8998d528204c10fa3c73a1f5cd87f125318fc039f5150eb7d156258d53d2a823e7d19fae55a4ed164dfbd82a1cc79247186fe60d7176b66aaf9c
+EBUILD bison-3.1.ebuild 2542 BLAKE2B 962d828a83984bc7cbdf4944da0e89e465949f3bc0bf3c7b06599613f564753c569f7cbc319874032ecbeb88527fd8f0108c03817324dedfc27728d20311459e SHA512 ff53edf61d66903512f0a9c490fd314e20c345b9e61b6a111907156e7520f8be53647e7c27b4720b75ce71a53df24679774761b2e002562d664741061a70a4af
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-2.7.1.ebuild b/sys-devel/bison/bison-2.7.1.ebuild
index d220d72438a9..fadc63d444a4 100644
--- a/sys-devel/bison/bison-2.7.1.ebuild
+++ b/sys-devel/bison/bison-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index f21a9f2a9e61..2c7be228dc5f 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/bison/bison-3.0.5-r1.ebuild b/sys-devel/bison/bison-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..e60826d10599
--- /dev/null
+++ b/sys-devel/bison/bison-3.0.5-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
+HOMEPAGE="https://www.gnu.org/software/bison/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/bison/${P}-patches-1.1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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"
+
+RDEPEND=">=sys-devel/m4-1.4.16"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	examples? ( dev-lang/perl )
+	nls? ( sys-devel/gettext )
+	test? ( dev-lang/perl )"
+
+DOCS=( AUTHORS ChangeLog-2012 NEWS README THANKS TODO ) # ChangeLog-1998 PACKAGING README-alpha README-release
+
+PATCHES=(
+	"${WORKDIR}"/patches/${P}-optional-perl.patch #538300
+	"${WORKDIR}"/patches/${P}-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=(
+		--docdir='$(datarootdir)'/doc/${PF}
+		$(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
+
+	# Move to documentation directory and leave compressing for EAPI>=4
+	mv "${ED%/}"/usr/share/${PN}/README "${ED%/}"/usr/share/doc/${PF}/README.data
+}
+
+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
+}
diff --git a/sys-devel/bison/bison-3.0.5.ebuild b/sys-devel/bison/bison-3.1.ebuild
index 8c4763c45fdd..ab84ec813320 100644
--- a/sys-devel/bison/bison-3.0.5.ebuild
+++ b/sys-devel/bison/bison-3.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 inherit flag-o-matic
 
 DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz"
+	https://dev.gentoo.org/~whissi/dist/bison/${P}-patches-1.0.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,21 +30,27 @@ PATCHES=(
 )
 
 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 #548778 #538300#9
+	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
-	# ugly workaround to avoid maintainer mode (see #647410 and #648012)
-	printf '#!/bin/sh\nexit 0\n' > build-aux/missing || die
 }
 
 src_configure() {
 	use static && append-ldflags -static
 
-	# We don't need perl unless we run tests.
-	use test || export ac_cv_path_PERL=true
 	local myeconfargs=(
 		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_enable examples)
@@ -68,7 +74,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	local f="${EROOT}/usr/bin/yacc"
+	local f="${EROOT%/}/usr/bin/yacc"
 	if [[ ! -e ${f} ]] ; then
 		ln -s yacc.bison "${f}"
 	fi
@@ -76,7 +82,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	# clean up the dead symlink when we get unmerged #377469
-	local f="${EROOT}/usr/bin/yacc"
+	local f="${EROOT%/}/usr/bin/yacc"
 	if [[ -L ${f} && ! -e ${f} ]] ; then
 		rm -f "${f}"
 	fi