[gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/

[Sergei Trofimovich]

commit:     4eeb3971eb856b8fdece1185f119a296d287cc2d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 10:04:31 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 10:34:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eeb3971

app-emulation/dosemu: tweak to support non-bash '/bin/sh'

Package-Manager: portage-2.3.2

 app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild           |  3 ++-
 app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild        |  3 ++-
 app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-dash.patch | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
index 8361552..5a56b8d 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,7 @@ S="${WORKDIR}/${PN}"
 
 src_compile() {
 	epatch "${FILESDIR}"/${P}-flex.patch #437074
+	epatch "${FILESDIR}"/${P}-dash.patch
 
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
index 1021590..4f04b5d 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,6 +45,7 @@ S="${WORKDIR}/${PN}-code-${COMMIT}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fortify.patch
+	epatch "${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch
 
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2

diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-dash.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-dash.patch
new file mode 100644
index 00000000..c48712e
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-dash.patch
@@ -0,0 +1,10 @@
+Dash does not support 'echo -n' and breaks default config sourcing.
+diff --git a/default-configure b/default-configure
+index 9e4b78b..a749f63 100755
+--- a/default-configure
++++ b/default-configure
+@@ -30,3 +30,3 @@ done
+ CONF=`cat $CONF_FILE`
+-CONF=`echo -n "$CONF"| sed '/^config {/d' | sed '/^}/d' | tr '\n' ' ' `
++CONF=`printf "%s" "$CONF"| sed '/^config {/d' | sed '/^}/d' | tr '\n' ' ' `
+