From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sun, 4 Mar 2018 04:06:22 +0000 (+0100)
Subject: sys-devel/automake: Fix primary-prefix-invalid-couples.tap test failure due to change... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6c4b4150232cc25072b3b81c18341a0486d5c305;p=gentoo.git

sys-devel/automake: Fix primary-prefix-invalid-couples.tap test failure due to changed hash order

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 6f00929967da..1cd07c36c0ca 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
 	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
+	"${FILESDIR}"/${PN}-1.13-hash-order-workaround.patch
 	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
 )
 
diff --git a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch
new file mode 100644
index 000000000000..79b81e6fa407
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch
@@ -0,0 +1,14 @@
+--- a/t/primary-prefix-invalid-couples.tap
++++ b/t/primary-prefix-invalid-couples.tap
+@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1
+ # Check that the same failures are present without the '--add-missing'
+ # option.
+ mv stderr stderr.old
++cat stderr.old | sort > a
+ AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
++cat stderr | sort > b
+ command_ok_ "... and with the same diagnostic of 'automake -a'" \
+-            diff stderr.old stderr
++            diff a b
+ 
+ :