sys-devel/autogen: fix tests with dash, bug #576674

Package-Manager: portage-2.2.26

2 files changed, 27 insertions, 1 deletions

diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild b/sys-devel/autogen/autogen-5.18.4.ebuild
index 04beaec880e3..8c41b065f052 100644
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.18.4-tmp-log.patch #563352
+	epatch "${FILESDIR}"/${PN}-5.18.4_fix_format.test_for_dash.patch #576674
 }
 
 src_configure() {
diff --git a/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch b/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch
new file mode 100644
index 000000000000..644df648f59a
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch
@@ -0,0 +1,25 @@
+agen5/test/format.test: export AUTOGEN_DNE_DATE explicitly. DASH does
+not export when the assignment is on the same line as a shell function
+invocation.
+
+This is a backport of part of upstreams' commit 89f12c15.
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=576674
+
+--- a/agen5/test/format.test
++++ b/agen5/test/format.test
+@@ -79,12 +79,12 @@
+ </script>
+ _EOF_
+ 
+-AUTOGEN_DNE_DATE=false \
++export AUTOGEN_DNE_DATE=false
+     run_ag x ${testname}.def || failure autogen failed
+ cmp -s ${testname}.base ${testname}.test || \
+    failure "`diff ${testname}.base ${testname}.test`"
+ 
+-AUTOGEN_DNE_DATE=true \
++AUTOGEN_DNE_DATE=true
+     run_ag x ${testname}.def || failure autogen failed
+ dte=`sed -n 's/.*It has been AutoGen-ed *//p' ${testname}.test`
+ test "X${dte}" = "X" && \