gentoo resync : 18.11.2018

3 files changed, 98 insertions, 3 deletions

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 6abf85e754bc..0323e2ca1b86 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -3,8 +3,11 @@ DIST bison-3.0.5.tar.xz 1954868 BLAKE2B b6a8b426304f414c1b7601e75dcae8a63847b713
 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
 DIST bison-3.2-patches-01.tar.xz 7696 BLAKE2B 5a83c118204173a8c264a1e9ca929612c8c1cceea40c2f45057ed053c34087b0dbef0bd25d299e9c928c192a68d55b83687c54cf3cab7c28ed557b2eac12ad5a SHA512 5fe6d40ac1f388764989653a8f1289d1368b75952ffae271e015853dc5c70a85430573a3ab261cca8d498d87f590b1257c6e72a7adb72a51a5f3e3bc56d87ec2
+DIST bison-3.2.1-patches-01.tar.xz 8232 BLAKE2B 84be6854bc26cdf1308c466257ba03b0a8cfffd668332454a59311239347f6bd83fb53a742ad85d06b607c45c9f0d1498a53fca9cb82595406f760ce362d3761 SHA512 b0a5b37bd0e9bf09ef742f2b3b4b06d0954a66f411f87975e023468b8705dc31e58bd365cb501a1c53777cf98c05b5473bf12f034a55b8b99066202a382d196d
+DIST bison-3.2.1.tar.xz 2091684 BLAKE2B f2cfb1ec96dc0c5daf71a78348c8b4cb212262c00fa7f4474fd5634dd88bfe76b2ff63c9bb047d7b7eb42490bb188c5cb1db8cb1b9caa8972f9771bcbd74acce SHA512 2f6382d276d37f513a4cbb5badd8ac45a7f936e075ccd0d55e5a27802538fd2fdda24b7dc780d006eca0da499b264817a7aa6901bf423666bb34e86d3a180a52
 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.1.ebuild 2525 BLAKE2B 4658970e832ab017b594fb64686f914df57830b62ba16de3d409b359c005712ad2560091e56cdd141febf2d44d27be62b449d37d02e5e0d8d9988bbfbeec489a SHA512 00d2d2c9442690c4c717cdc5de947645f144fdfaa9d5d69e3e0f1c585bfa217ef237285a57691972518fe0a4ac3ad75d57fa43eb8c6167a8dd32e4f56ecbeb58
+EBUILD bison-3.2.1.ebuild 2621 BLAKE2B ade529ede01beabfde4227ba3a3927c71f77b328db0a4e46420af87a904658a8c1559d3b98085686b3918452d408efe55f175c375ea7a0ddf194e28e80dc7ea5 SHA512 16a7403f1206f4f426326e0940e7ea5d2abf412ba1831c9ac20634ad769310462cdbda6a7a40fd96111482de7ecc9f4d1b8863d0634e5808bcc1d882acc7dfa0
 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.1.ebuild b/sys-devel/bison/bison-3.1.ebuild
index 20f7dbbb209c..d4f518752561 100644
--- a/sys-devel/bison/bison-3.1.ebuild
+++ b/sys-devel/bison/bison-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 ~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.2.1.ebuild b/sys-devel/bison/bison-3.2.1.ebuild
new file mode 100644
index 000000000000..5717aa8d6140
--- /dev/null
+++ b/sys-devel/bison/bison-3.2.1.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.1-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
+}