summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-10-31 10:36:48 -0400
committerMike Gilbert <floppym@gentoo.org>2016-10-31 10:41:13 -0400
commit68b674d3521a1e08d57b51270de888bfff0beeac (patch)
treec4a44c82f7274ffc285d3697e754f443ce59741d /app-shells/dash
parentapp-backup/bareos: bump: added version 16.2.4 (diff)
downloadgentoo-68b674d3521a1e08d57b51270de888bfff0beeac.tar.gz
gentoo-68b674d3521a1e08d57b51270de888bfff0beeac.tar.bz2
gentoo-68b674d3521a1e08d57b51270de888bfff0beeac.zip
app-shells/dash: make dumb-echo patch optional
ACKed by Lars (polynomial-c). Bug: https://bugs.gentoo.org/590696 Package-Manager: portage-2.3.2_p1
Diffstat (limited to 'app-shells/dash')
-rw-r--r--app-shells/dash/dash-0.5.9.1-r1.ebuild (renamed from app-shells/dash/dash-0.5.9.1.ebuild)6
-rw-r--r--app-shells/dash/metadata.xml3
2 files changed, 7 insertions, 2 deletions
diff --git a/app-shells/dash/dash-0.5.9.1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild
index 39d1f83baaa..4942b9dca72 100644
--- a/app-shells/dash/dash-0.5.9.1.ebuild
+++ b/app-shells/dash/dash-0.5.9.1-r1.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libedit static"
+IUSE="dumb-echo libedit static"
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
DEPEND="${RDEPEND}
@@ -31,7 +31,6 @@ DEPEND="${RDEPEND}
#S=${WORKDIR}/${MY_P}
PATCHES=(
- "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch #337329 #527848
"${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch
)
@@ -42,6 +41,9 @@ src_prepare() {
fi
epatch "${PATCHES[@]}"
+ #337329 #527848
+ use dumb-echo && epatch "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
+
# Fix the invalid sort
sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml
index ce044cc2418..0a565e1c2ab 100644
--- a/app-shells/dash/metadata.xml
+++ b/app-shells/dash/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="cpe">cpe:/a:dash:dash</remote-id>
</upstream>
+ <use>
+ <flag name="dumb-echo">Disable echo -n for added fun</flag>
+ </use>
</pkgmetadata>