| 1 |
commit: 68b674d3521a1e08d57b51270de888bfff0beeac |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 31 14:36:48 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 31 14:41:13 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b674d3 |
| 7 |
|
| 8 |
app-shells/dash: make dumb-echo patch optional |
| 9 |
|
| 10 |
ACKed by Lars (polynomial-c). |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/590696 |
| 13 |
Package-Manager: portage-2.3.2_p1 |
| 14 |
|
| 15 |
app-shells/dash/{dash-0.5.9.1.ebuild => dash-0.5.9.1-r1.ebuild} | 6 ++++-- |
| 16 |
app-shells/dash/metadata.xml | 3 +++ |
| 17 |
2 files changed, 7 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-shells/dash/dash-0.5.9.1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild |
| 20 |
similarity index 94% |
| 21 |
rename from app-shells/dash/dash-0.5.9.1.ebuild |
| 22 |
rename to app-shells/dash/dash-0.5.9.1-r1.ebuild |
| 23 |
index 39d1f83..4942b9d 100644 |
| 24 |
--- a/app-shells/dash/dash-0.5.9.1.ebuild |
| 25 |
+++ b/app-shells/dash/dash-0.5.9.1-r1.ebuild |
| 26 |
@@ -21,7 +21,7 @@ fi |
| 27 |
LICENSE="BSD" |
| 28 |
SLOT="0" |
| 29 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 30 |
-IUSE="libedit static" |
| 31 |
+IUSE="dumb-echo libedit static" |
| 32 |
|
| 33 |
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" |
| 34 |
DEPEND="${RDEPEND} |
| 35 |
@@ -31,7 +31,6 @@ DEPEND="${RDEPEND} |
| 36 |
#S=${WORKDIR}/${MY_P} |
| 37 |
|
| 38 |
PATCHES=( |
| 39 |
- "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch #337329 #527848 |
| 40 |
"${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch |
| 41 |
) |
| 42 |
|
| 43 |
@@ -42,6 +41,9 @@ src_prepare() { |
| 44 |
fi |
| 45 |
epatch "${PATCHES[@]}" |
| 46 |
|
| 47 |
+ #337329 #527848 |
| 48 |
+ use dumb-echo && epatch "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch |
| 49 |
+ |
| 50 |
# Fix the invalid sort |
| 51 |
sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins |
| 52 |
|
| 53 |
|
| 54 |
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml |
| 55 |
index ce044cc..0a565e1 100644 |
| 56 |
--- a/app-shells/dash/metadata.xml |
| 57 |
+++ b/app-shells/dash/metadata.xml |
| 58 |
@@ -8,4 +8,7 @@ |
| 59 |
<upstream> |
| 60 |
<remote-id type="cpe">cpe:/a:dash:dash</remote-id> |
| 61 |
</upstream> |
| 62 |
+ <use> |
| 63 |
+ <flag name="dumb-echo">Disable echo -n for added fun</flag> |
| 64 |
+ </use> |
| 65 |
</pkgmetadata> |
Archives