| 1 |
commit: ceba04a47e4f86462451230f74988b245d3f71b6 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 31 02:07:58 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 31 02:08:21 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceba04a4 |
| 7 |
|
| 8 |
sys-devel/bison: backport ebuild fixes from v3.1 |
| 9 |
|
| 10 |
- Due to touching right files we can avoid regeneration of |
| 11 |
files in tests/. |
| 12 |
|
| 13 |
- build-aux/missing hack removed, no longer necessary. |
| 14 |
|
| 15 |
- USE=examples fixed: Due to a bug in previous patch to avoid |
| 16 |
perl dependencies, examples were never installed even if |
| 17 |
requested. |
| 18 |
|
| 19 |
Bug: https://bugs.gentoo.org/648012 |
| 20 |
Closes: https://bugs.gentoo.org/656776 |
| 21 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 22 |
|
| 23 |
sys-devel/bison/Manifest | 2 +- |
| 24 |
.../{bison-3.0.5.ebuild => bison-3.0.5-r1.ebuild} | 22 +++++++++++++++------- |
| 25 |
2 files changed, 16 insertions(+), 8 deletions(-) |
| 26 |
|
| 27 |
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest |
| 28 |
index 3c5ad4be51d..2d86eaf7d70 100644 |
| 29 |
--- a/sys-devel/bison/Manifest |
| 30 |
+++ b/sys-devel/bison/Manifest |
| 31 |
@@ -1,7 +1,7 @@ |
| 32 |
DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f942d48326a9ac869cf31fd8f127759167dced662b826fa54a24cd0cf87b0c096814c84e34afed8078368828a1 SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370 |
| 33 |
DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b |
| 34 |
DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412 |
| 35 |
-DIST bison-3.0.5-patches-01.tar.xz 5192 BLAKE2B ee5bbd59569b484e62dbd820a9795fa6d89c79fed96aa0615ec3baa067ae1f0f7ea6eadccf94d20458fc18d5977e8eac4e50a1a5f41f51519d8ff9f58dc78ab4 SHA512 f5df3896a113b6ce4a361d61b0139ee2ed4e0bda4a46e6312ae2ded0c7a1b2d2b67b37545c0bcad806f9289954022ff446c00bc2384dfff4049afb53e4657ed5 |
| 36 |
+DIST bison-3.0.5-patches-1.1.tar.xz 5188 BLAKE2B 437a202cfc2431a5fe9a31ea6bcce5978d5a6ca5e812f3a45928a67aa78ec7c93327e0520516aa5f79a0d7c395e7b959f22d3f2f962eab5a5b826d3f9816786a SHA512 54371d28f3d0ec7a2709684030f4f008cff4cb1a74ba30586615caace5417d4d475a7453ba956d8d10ee819391779d74725c203412339388d4131ddebd46f93d |
| 37 |
DIST bison-3.0.5.tar.xz 1954868 BLAKE2B b6a8b426304f414c1b7601e75dcae8a63847b71361fba2538ad5cc52f3527fe464b066add670a236d5e1d2aff65bbe7a99c282ee3c72a0bfaa498d40e3a50398 SHA512 00b448db8abe91b07e32ff5273c6617bc1350d806f92073a9472f4c2f0de5d22c152795674171b74f2eb9eff8d36f8173b82dacb215601bb071ae39404d4a8a2 |
| 38 |
DIST bison-3.1-patches-1.0.tar.xz 7268 BLAKE2B 9195c00be1706664762598926913cd8fc18a32a6ae6ae4ec58748d5e8fc4877f63258db51cbe3bf84f3345ea0fc7c27d2e1190632c529615d9e6922baef74915 SHA512 5569b7901b40ea01eb7bccdc1b090207bc1ea6c50d144b561b2725ae79f3bcd51e7ea4e8ea37b60ea50ff4882e82110a07986cba1d2397a0333e7e01ae466e79 |
| 39 |
DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d981875ca2224f5aa344a43efbbbea34e79dff94ea489853e505b1d7f5920f4d159d1464ce61d8956ca0401ad SHA512 2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152 |
| 40 |
|
| 41 |
diff --git a/sys-devel/bison/bison-3.0.5.ebuild b/sys-devel/bison/bison-3.0.5-r1.ebuild |
| 42 |
similarity index 81% |
| 43 |
rename from sys-devel/bison/bison-3.0.5.ebuild |
| 44 |
rename to sys-devel/bison/bison-3.0.5-r1.ebuild |
| 45 |
index 1863af1d30b..ef028b65216 100644 |
| 46 |
--- a/sys-devel/bison/bison-3.0.5.ebuild |
| 47 |
+++ b/sys-devel/bison/bison-3.0.5-r1.ebuild |
| 48 |
@@ -1,14 +1,14 @@ |
| 49 |
# Copyright 1999-2018 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
-EAPI=6 |
| 53 |
+EAPI="6" |
| 54 |
|
| 55 |
inherit flag-o-matic |
| 56 |
|
| 57 |
DESCRIPTION="A general-purpose (yacc-compatible) parser generator" |
| 58 |
HOMEPAGE="https://www.gnu.org/software/bison/" |
| 59 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
| 60 |
- https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz" |
| 61 |
+ https://dev.gentoo.org/~whissi/dist/bison/${P}-patches-1.1.tar.xz" |
| 62 |
|
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
@@ -30,14 +30,22 @@ PATCHES=( |
| 66 |
) |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
+ # Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4' |
| 70 |
+ touch -r configure.ac old.configure.ac || die |
| 71 |
+ touch -r configure old.configure || die |
| 72 |
+ |
| 73 |
default |
| 74 |
+ |
| 75 |
+ # Restore date after patching |
| 76 |
+ touch -r old.configure.ac configure.ac || die |
| 77 |
+ touch -r old.configure configure || die |
| 78 |
+ |
| 79 |
# The makefiles make the man page depend on the configure script |
| 80 |
# which we patched above. Touch it to prevent regeneration. |
| 81 |
- touch doc/bison.1 #548778 #538300#9 |
| 82 |
+ touch doc/bison.1 || die #548778 #538300#9 |
| 83 |
+ |
| 84 |
# Avoid regenerating the info page when the timezone is diff. #574492 |
| 85 |
sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die |
| 86 |
- # ugly workaround to avoid maintainer mode (see #647410 and #648012) |
| 87 |
- printf '#!/bin/sh\nexit 0\n' > build-aux/missing || die |
| 88 |
} |
| 89 |
|
| 90 |
src_configure() { |
| 91 |
@@ -68,7 +76,7 @@ src_install() { |
| 92 |
} |
| 93 |
|
| 94 |
pkg_postinst() { |
| 95 |
- local f="${EROOT}/usr/bin/yacc" |
| 96 |
+ local f="${EROOT%/}/usr/bin/yacc" |
| 97 |
if [[ ! -e ${f} ]] ; then |
| 98 |
ln -s yacc.bison "${f}" |
| 99 |
fi |
| 100 |
@@ -76,7 +84,7 @@ pkg_postinst() { |
| 101 |
|
| 102 |
pkg_postrm() { |
| 103 |
# clean up the dead symlink when we get unmerged #377469 |
| 104 |
- local f="${EROOT}/usr/bin/yacc" |
| 105 |
+ local f="${EROOT%/}/usr/bin/yacc" |
| 106 |
if [[ -L ${f} && ! -e ${f} ]] ; then |
| 107 |
rm -f "${f}" |
| 108 |
fi |
Archives