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

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 6f00929967daf711dd85b00f3c01e75262c2e9c7..1cd07c36c0ca51db2d3122076791d4ad6ae11d31 100644 (file)
--- 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 (file)
index 0000000..79b81e6
--- /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
+ 
+ :