[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     68b674d3521a1e08d57b51270de888bfff0beeac
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 14:36:48 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 14:41:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b674d3

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

 app-shells/dash/{dash-0.5.9.1.ebuild => dash-0.5.9.1-r1.ebuild} | 6 ++++--
 app-shells/dash/metadata.xml                                    | 3 +++
 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
similarity index 94%
rename from app-shells/dash/dash-0.5.9.1.ebuild
rename to app-shells/dash/dash-0.5.9.1-r1.ebuild
index 39d1f83..4942b9d 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 ce044cc..0a565e1 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>