Make examples optional and fix perl dependency #538300 by Ben Kohler.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index e3f1588056f320316967fdfa4f023fa4872d1253..836455b41f2bc229ff3c22a0dcdec753ea91c015 100644 (file)
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/bison
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.133 2015/01/23 19:38:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.134 2015/04/03 07:03:42 vapier Exp $
+
+*bison-3.0.4-r1 (03 Apr 2015)
+
+  03 Apr 2015; Mike Frysinger <vapier@gentoo.org> +bison-3.0.4-r1.ebuild,
+  +files/bison-3.0.4-optional-perl.patch:
+  Make examples optional and fix perl dependency #538300 by Ben Kohler.
 
 *bison-3.0.4 (23 Jan 2015)
 

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index b98bea5fc4e7ffa7c640c6e8e8c0ec17aabae600..94f891a8427061ab0000eaaca4164b23cb156cc5 100644 (file)
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -4,7 +4,8 @@ Hash: SHA256
 AUX bison-1.32-extfix.patch 1170 SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4 SHA512 6f98d6ea4d6564c3890ede54994654af87d79a87e615e03856a71f3470876fe42768deeabe31f9393531a35619a7e00844ff2a3d87214754cfd04a25d591cc57 WHIRLPOOL 800744be43d9dc39ba4c7cba4342ee5c2360cf9792c0ff5971da91fe78df85358ac1b7cab5c32244898b69ced352ce159685daa80cf32317db4ab92610b2153d
 AUX bison-2.4.3-no-gets.patch 780 SHA256 aae4bb53fa827685a1005b48b3149cb96b83feb43ba104d5da6ef223676cef70 SHA512 cf7d60c143bf27a546c6fa04f08b58b0c297996f25fe28e85863795f51040772a85316ca1464204a84630322df16893d636331b7e4953f6c1718d680a5bc827b WHIRLPOOL 4415b7eebe6df47638df1c7f5c864a4296af0eddc18d56ccc24f926db48fb78699d3a864d08648867f06cfea88a3fc745bbd87865469c559f96b2b199cf24a75
 AUX bison-2.4.3-uclibc-sched_param-def.patch 580 SHA256 b111051eaaa15ce6e53ae168d06e0fb9688c70141060abfe0a15c5d1400fbaf9 SHA512 87a49e69aec0b36313132fc7a9fb520016e4dc4399a9af9a91636a588326825de3a65dd6bcdda8de20e364ec163afcb41b0453f09ce4102d179ce04279c8654d WHIRLPOOL 5f0d690078d004231d31adcbdea98c3f3059c60265595ac46cbb0d4e45638ae9e54c9ee08040842d278a4ddadd5744a6bce19753475978cf7360ce8bf2be9d7b
-DIST bison-1.875d.tar.bz2 882745 SHA256 37ff8d673e35838c195d614bc402573d1268c997796e79b831053f4a22e03808
+AUX bison-3.0.4-optional-perl.patch 2051 SHA256 5a751c4e3e687805e9d56341e37ffc9cb13ab24d97ccbb61a911dc9ef252ca72 SHA512 5e28ee043ecb1869d2776120eef874e60d39f7bf1ec48f2751e0304630be4a5c7a315d27d7253e8f335f58518ed1da57563be99117fdf2c10d007a0eaafb41c5 WHIRLPOOL c4a495ed8b1258b715855abf835db82403c982fb01dbd75e8ae45a47bdd72dc6fb811155fcdeaf78abd571907e189d3f00c729e2a85ffc38e18e2f395de3e60b
+DIST bison-1.875d.tar.bz2 882745 SHA256 37ff8d673e35838c195d614bc402573d1268c997796e79b831053f4a22e03808 SHA512 f84c6cf41a289ea7e0805cf9b0da6fe2d77f2e03a35c3db7d2e36e5186bba7c0853c3d518bd89f6cfa1030e346e046aa03b33974bb892dbd8f040e5ea2de1126 WHIRLPOOL 213e02b33b4cd65c4c8ad5a37b77cce75a366e1d5ad0837887763c75c5e30eb3d85b7ba8eb71ed86bb86fb3e23624a7c627558f492778ec29e6e79fd30e7c902
 DIST bison-2.4.3.tar.bz2 1652612 SHA256 935302ef194c7f0974fed913eaac8100be512094eab573cf0b67bdf7db1d3a05 SHA512 b789f55d9cb95c1b4fba004691ed9f79b76da55020c9b202e1704a02aab1ba43b9fc1015e29843ed552e6df6165cef9c6ebc8a29d15a21c6e194cad8a42ab055 WHIRLPOOL 0e0e61970a791e53afc6cc85f53cebf0050d885077dd9b2394d79549bac389ffa7e477e003525556858b6fa64c11ce93653bba1c861bd2acd67f85181e167558
 DIST bison-2.7.1.tar.xz 1781068 SHA256 b409adcbf245baadb68d2f66accf6fdca5e282cafec1b865f4b5e963ba8ea7fb SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370 WHIRLPOOL 171f6b18c3f205d746092bdd37bf113ab83944db468f81cbf5004573584c717b6fc1a10d112fe7178be222b51b746fed9da58a9065b7f2f7e65a15851500779e
 DIST bison-3.0.3.tar.xz 1971372 SHA256 5940efbdd6b5d80e55ec16a01d2322e2892da21863391049b9b692570649177c SHA512 6639ca0b2b5eb6862c97eb3d568267e417ebd24e78cd197e5770b217fb51fb26418703db25f38fd066a898085c30f1055e1a7d335a43f2d17c82bea64d09b54a WHIRLPOOL 59ac9cf65492e743e84443a245084501ee6c7a6c1616dfb71d9e5a382c492617980f991d1d174c078e6c56e9a947dcd4061a27d72c46b8fef27034961f0ef140
@@ -13,23 +14,24 @@ EBUILD bison-1.875d.ebuild 1788 SHA256 ee4e4834a116f01d6d351a887fa4f61e5329191c8
 EBUILD bison-2.4.3.ebuild 1241 SHA256 a84880274c634458eee4cbb0da2032cc2ee76cd2c3a66feb1cf001ad014ff00b SHA512 1f2721e2d5e3b8d944b4b3dee52e1a837d47fd634dcdb4cf7bde170b34057dd969f8d29e35c7a400b640f081cac9ab3cc53e90cab149ed84962350dc1ccf0da4 WHIRLPOOL dbcabb586ed41f9bebe10feae2a73ffaf2d71f6f4a7187033ee0df3062f7ba26b20c380d0c77f3343fc2d3190396fbaa433df76d0fbdcc7fdaf26a1a2d84827c
 EBUILD bison-2.7.1.ebuild 1733 SHA256 b15bf954418ce7289b2f671777dc6c3d7b90c0d397d956902a2e1284402c5bcb SHA512 758fa2c215f1bfe60a72f3ac51d948a59a8628d8c843f95af33e721749e2ff398b2285c30babe5f93529561d1582f66fcaf9f9a5a54ecb270fe90432b668d984 WHIRLPOOL a560dfa203c2f394fbdc90b8f140a0e16bb18f57b442bc2bbe2b29c83ae17c515cca5be96df7e78ba4b8d7a427ef71986685940f64b64d8a3e85670a6da9fab6
 EBUILD bison-3.0.3-r1.ebuild 1790 SHA256 099bd46e91ab3c3de560258c7bc98beae7b8f67e49c089173d36a6aad33bc54f SHA512 65f242c8a4671531a50758e0860f36c6ebe2507360eaea613e17b3131df5486e2399af9a8a075d73d076a9e1c0a3c2e5bdb76c90e80ed4957d9989cfebc71fa7 WHIRLPOOL bcfbbeb32b804ea7c666e05e9e21317e014d0489d33a775254db40bbfca28c3072996a091137124551332af72c2e4a291e6068f8b8b035055bf23dd0555bf5a4
+EBUILD bison-3.0.4-r1.ebuild 2000 SHA256 5f3427767b5d7574410f822ddd3c4827a4a6a0132f31a5cf4d701bca55374daa SHA512 e98e16515638b692ba6ee4e044aa76f447de1325780d66fff6742f47104dcba582cb7bacd8b44a82dc6dfa0962d3fce55283ea19bf271073d6049222f87e5613 WHIRLPOOL 98aaca3f3429a3fdd9a3922d6077f725783de0c8e8c962fc342b21eef145304fd8311529bccd09ae4adca96c91fe5a6ed1b67959c3d583d8518dc8fa1c9732b2
 EBUILD bison-3.0.4.ebuild 1787 SHA256 a8f31e75361b58bdd72c736a2e68d482659f88c5c6b71395f23d4a2480dcbca3 SHA512 bb3cb068faaa8f6923c21cdacc1ed1f340dded9501ba52d7daf8666d2eee457f4e3562021406e7a26c92ed58153cbcd22267c12352cb275779c3cf2a0afaaf5d WHIRLPOOL 6c27eab428ab824fd299c77b239e1f0dc147495c31fc37a18e4e98cf0bc87e190b0266f3a7ef385ef3b673d7b519a463f18fa4044c3567d1d98cc5d8ccb0b57d
-MISC ChangeLog 17845 SHA256 36ea717ae30bfceea23e491a8a46ae3553c97174b1fe0329b602f7232be56e27 SHA512 17c218f3f04893c7e4d4367dd09f65d1e35ddbc2abd1f123fa11f6be2200c297964386fe6ba76ca4f1adf9c455357f18fe183f6faa7492fbcdeb78f2032e80cc WHIRLPOOL ce0ffce6b3a210e5e11226284f85881b5b7d120cd5474c46503902c35ebce23585fab9c00f03da220148199743ac266c9aa211ebd0c90394fb4f206c940c5317
+MISC ChangeLog 18059 SHA256 152e4e868398621b00620040135f5e1e546e291d7fa02d8f3e3dda3f3592263f SHA512 01b791e8855c9662db4ec718ff0c932562ba8560dd49c9a47207547dbc44afcc46c411f60cd56ae8ce2cfb5f93841321afda5807801323b3ecc4e8ddc1a248b5 WHIRLPOOL d7803d406fbdee5af54663bd28868b8e23c516816112dcce982e4fdb2e4a2de69c190b0272b2879c48f831d9da5c8827d528d58b6c2188ad044f3810ef606c47
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUwqNUAAoJEPiazRVxLXTFmDEQAIelhXmEfQeJXx6LH0lSa4ZC
-D1S4ZPs5YElxnT3wYGWzUer9veXSqJ/3Ss7m1eTCVOL5MfiP0f/ukSwIAxZs302L
-r2QUbdOY6pKAS0OXVCoyOa3m2cIBlZfDr61ayIUwpzuugmbfruPf4H5PvD0Yw75U
-Pcf2hUWWOPW1Dhnft1QFpukIYKUvZGu0s9fD3iMlsWDLXKuuu8VP0tBYMex6vj4M
-XKvXmMvSQefEl+zZQ8NxW7UHw5t7/2YWwLiCJjW6zEQ5FjvzPLY/73GSYHCqQxXH
-ZzvVvyao9ICz947juXclzVLERnnspkB5tYkxtePOpH1/VByrfhBIZqL2756Q9vbj
-CUnrSF4zZnV8Dm8m5d8p4jFtzgNON2H9gf5FYfdiBW5i2UCL+mB8x1cnJ8BeLroH
-lvq+vQYM2EkoXQ9BH4BQli718kWKO32+rZ20D/ihVVqdLVrtMHP22t/Oda4V/R1F
-FW0pzoIZcleQBBEr9iqdd/p9f55TzOHArmBNHu3e0gX/Y0c2LC+j/9sQ/o7OdNyL
-trCUSqX8V29bEjDqQGXVS1PUqiLpWuMXWyRvWpawpfJrTMe4wZoDSGXjdiNmmn3P
-2wmpJme8nLnZ5Lu45eqO4chIVw4c5ZD2p7CSWIqRc1d1juBQrgAVm8931JHU4jCt
-FEide+/rcN3HFljjbjCN
-=cQTQ
+iQIcBAEBCAAGBQJVHjtQAAoJEPGu1DbS6WIAy00P/2gE0bUhlOl3BoBTPRJQPgSA
+YJCY7sUKLT7QEE7Wpc8Bg2gWOZ4x4JfRFn+mWQFgrcCfXSVcL7MASmja4erY2yyD
+Q9RqhZNpyO5rhwyOk4XBMpawUqLujyBa5a7GvYlt3s5B+ucpWjCirPQdldFrOID7
+nms9BtTSLG83CaQEEPffE8rWCP81NXil9jT+J7wNwCt1sBfA7zSNO3mLiYZpNJhH
+ZpQjBW0wbob95Vc8m6gaoq4sDT8hOV5+YfSatE8clVSjnGzDm5qHlKtvLVBBTkxI
+H0BIOclseVkBLXdfD4AMmc5OVYe2x/NGJ2g56ITzMN3dJixY4MjDB4ar45xUi068
+yq7N/bwjBYEObFx6l/3RfgcpH/GgYBrYk84mYSiKQGAFnkcPbkKTPvYlS89XlSGr
+sEabTiaao80oxfihXUv9Oj53KZ+my6+aLxVt8IZka7wyOoPQsGitC8sfONYQD1oU
+jFXfgSD72eQaB0KCmQoLZuLkdjGh8uwzEThmpainDnLWxR2aXP2/NBmLE3WAIJmP
+FDYieoMFzougtR2jc616PSIvS6ujvuSCMSieN/WQjl3HXI4qBKHitp/soxK4qhPg
+z2OGo0uYADbAAP65Cw1WtQeV42/gk7MAtnNswYPsOcnqrBKLYYGS3kdVzh5ET3WI
+myY8OTWem8DJxMS/XPlX
+=IYOU
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
new file mode 100644 (file)
index 0000000..e096f29
--- /dev/null
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-3.0.4-r1.ebuild,v 1.1 2015/04/03 07:03:42 vapier Exp $
+
+EAPI=5
+
+inherit flag-o-matic eutils autotools
+
+DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
+HOMEPAGE="http://www.gnu.org/software/bison/"
+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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 "${FILESDIR}"/${P}-optional-perl.patch #538300
+       eautoreconf
+}
+
+src_configure() {
+       use static && append-ldflags -static
+
+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/files/bison-3.0.4-optional-perl.patch b/sys-devel/bison/files/bison-3.0.4-optional-perl.patch
new file mode 100644 (file)
index 0000000..1661415
--- /dev/null
+++ b/sys-devel/bison/files/bison-3.0.4-optional-perl.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/538300
+
+From 3da25ddd011c169b9857ed2f6a2e82988f059ba5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 3 Apr 2015 02:39:21 -0400
+Subject: [PATCH] make perl & examples optional
+
+The normal bison program does not require perl to build or run, so lets
+soften that requirement in the configure script.  We now warn if its not
+found, and we make the examples logic depend on that.
+
+* configure.ac: Change AC_MSG_ERROR to AC_MSG_WARN for perl.
+Add an --enable-examples flag.
+* Makefile.am: Only include examples/local.mk when ENABLE_EXAMPLES.
+---
+ Makefile.am  |  2 ++
+ configure.ac | 21 ++++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b6135cb..50ea0a0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -59,7 +59,9 @@ include data/local.mk
+ include djgpp/local.mk
+ include doc/local.mk
+ include etc/local.mk
++if ENABLE_EXAMPLES
+ include examples/local.mk
++endif
+ include lib/local.mk
+ include src/local.mk
+ include tests/local.mk
+diff --git a/configure.ac b/configure.ac
+index 6f20040..e67249b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,12 +179,31 @@ AC_DEFINE_UNQUOTED([M4_GNU_OPTION], ["$M4_GNU"], [Define to "-g" if GNU M4
+ supports -g, otherwise to "".])
+ AC_PATH_PROG([PERL], [perl])
+ if test -z "$PERL"; then
+-   AC_MSG_ERROR([perl not found])
++  AC_MSG_WARN([perl required for the testsuites])
+ fi
+ AM_MISSING_PROG([HELP2MAN], [help2man])
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ AC_SUBST([XSLTPROC])
+ 
++AC_ARG_ENABLE([examples],
++  [AC_HELP_STRING([--disable-examples],
++     [do not build and install examples])])
++# Enable the examles by default if perl is available.
++case $enable_examples in
++no) ;;
++yes)
++  if test -z "$PERL"; then
++    AC_MSG_ERROR([perl required for the examples])
++  fi
++  ;;
++*)
++  if test -n "$PERL"; then
++    enable_examples=yes
++  fi
++  ;;
++esac
++AM_CONDITIONAL([ENABLE_EXAMPLES], [test "xenable_examples" = xyes])
++
+ # Checks for header files.
+ AC_CHECK_HEADERS_ONCE([locale.h])
+ 
+-- 
+2.3.4