gentoo resync : 03.11.2018

3 files changed, 95 insertions, 81 deletions

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 609690f3adfc..6abf85e754bc 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,10 +1,10 @@
-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-1.1.tar.xz 5188 BLAKE2B 437a202cfc2431a5fe9a31ea6bcce5978d5a6ca5e812f3a45928a67aa78ec7c93327e0520516aa5f79a0d7c395e7b959f22d3f2f962eab5a5b826d3f9816786a SHA512 54371d28f3d0ec7a2709684030f4f008cff4cb1a74ba30586615caace5417d4d475a7453ba956d8d10ee819391779d74725c203412339388d4131ddebd46f93d
 DIST bison-3.0.5.tar.xz 1954868 BLAKE2B b6a8b426304f414c1b7601e75dcae8a63847b71361fba2538ad5cc52f3527fe464b066add670a236d5e1d2aff65bbe7a99c282ee3c72a0bfaa498d40e3a50398 SHA512 00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2
 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-3.0.4-r1.ebuild 2458 BLAKE2B 1105bccd73e0a25f34c549a3b1eb95affe13ae79c09d4d16f8525134ef3ded288914c1a2868e72e2088d2e38148a305a5d7228dca42d5884eeed421e3e5a6437 SHA512 2a29d81a8e2284897aa0d5d687eb3253f063a2a152d8d72ad1092a2df64caf84013d758a2f77df4f62d86b7c3af61c1136e74b51a7e5dde487913286402d1782
+DIST bison-3.2-patches-01.tar.xz 7696 BLAKE2B 5a83c118204173a8c264a1e9ca929612c8c1cceea40c2f45057ed053c34087b0dbef0bd25d299e9c928c192a68d55b83687c54cf3cab7c28ed557b2eac12ad5a SHA512 5fe6d40ac1f388764989653a8f1289d1368b75952ffae271e015853dc5c70a85430573a3ab261cca8d498d87f590b1257c6e72a7adb72a51a5f3e3bc56d87ec2
+DIST bison-3.2.tar.xz 2088320 BLAKE2B dacdf492ca49e51d30cd134db763bd174612d3e49531325f524fc1af602ba11068abdc2fac18a3698cf0f24508b6297a437f9d7ab81639869840ca1348f0b012 SHA512 2ca555df9b25f0764698cb152269dc1c24816ffeb6f912c12d1c8d1cf067f73e63c953ab2040b4dd894e6cc46a0d5b2f7cdae0ad8303e40fcd687b42d7d91410
 EBUILD bison-3.0.5-r1.ebuild 2515 BLAKE2B 02762a402b75a4658408326ca667aad61e9a96b763aeaad5bd9e266a6323f853c25ad38c56677e9002b9c5157bd6e3a02054100741ee577f158e64b7ba1a6b00 SHA512 cc831c96c9287da5ec1d2dd0c80ccf3c02f95a00436879623318224bc28840193cccdc5b102613aaf6c242c8bfaf768fb9bb603a41b239565f96b94118eb1bc8
 EBUILD bison-3.1.ebuild 2531 BLAKE2B 9be554bb8efb508541c3159699ff7e724b10d554d19d233800ed01b6ecbb17b61178fc1ddb26d9283e67acf77668bf23fcdc5eaa0fb43f1aa94bd8bc518d885a SHA512 1e3eee454e2df1ed4d0ff1e6a2aa739d84569e3df9d44614a6a3e1a80c45b49d03d6fa6c22b77a0d8aa3ed72a8543edef6fd2057e50ada9f16b0fb8837a7b1e8
+EBUILD bison-3.2.ebuild 2619 BLAKE2B 113374affeeaa3ae76ae14444e240a3d7f6ce15c13d4e44642bf41acc309537b62b759aa8f6a034fa41decce98721648110db70ef0122a84c4590bab56e195cf SHA512 c4dc6ef8e674435edc58f45c709643831c57c34300533e7159d040b3a4e9f8ce62646569f4794dccacf464c9a9886965142147f6aeacd353c06ccd7f4dcf8381
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
deleted file mode 100644
index 2c7be228dc5f..000000000000
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils
-
-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/~mgorny/dist/${P}-patchset.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
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${P}-optional-perl.patch #538300
-	epatch "${WORKDIR}"/${P}-patchset/${P}-darwin17-printf-n.patch #632500
-	epatch "${WORKDIR}"/${P}-patchset/${P}-fix-tests-gcc-7.patch #638308
-	# 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
-	# 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
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_enable examples) \
-		$(use_enable nls)
-}
-
-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.2.ebuild b/sys-devel/bison/bison-3.2.ebuild
new file mode 100644
index 000000000000..4de6feafecc7
--- /dev/null
+++ b/sys-devel/bison/bison-3.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+PATCHES="${P}-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
+	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 ~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/${PN}-3.1-optional-perl.patch #538300
+	"${WORKDIR}"/patches/${PN}-3.2-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
+}