[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

[Lars Wendler]

commit:     7e5b180cb88a4b730af851e326065baf6b9bc2c8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 15:42:50 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 15:43:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5b180c

sys-apps/attr: Fixed test suite error with perl-5.26

Closes: https://bugs.gentoo.org/644058
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/attr/attr-2.4.48.ebuild                |  4 ++++
 sys-apps/attr/files/attr-2.4.48-perl-5.26.patch | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/sys-apps/attr/attr-2.4.48.ebuild b/sys-apps/attr/attr-2.4.48.ebuild
index b6a1fef64ad..378bc2b6cd4 100644
--- a/sys-apps/attr/attr-2.4.48.ebuild
+++ b/sys-apps/attr/attr-2.4.48.ebuild
@@ -21,6 +21,10 @@ DEPEND="
 	sys-devel/gettext
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-perl-5.26.patch"
+)
+
 src_prepare() {
 	default
 	elibtoolize #580792

diff --git a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
new file mode 100644
index 00000000000..6f3d2a22c14
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
@@ -0,0 +1,23 @@
+... to fix test-suite failure with perl-5.26.0
+
+Bug: https://bugzilla.redhat.com/1473853
+Upstream: http://lists.nongnu.org/archive/html/acl-devel/2017-07/msg00001.html
+---
+ test/run | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/run b/test/run
+index 4b1f8d0..07e916c 100755
+--- a/test/run
++++ b/test/run
+@@ -106,7 +106,7 @@ for (;;) {
+   if (defined $line) {
+     # Substitute %VAR and %{VAR} with environment variables.
+     $line =~ s[%(\w+)][$ENV{$1}]eg;
+-    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
++    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
+   }
+   if (defined $line) {
+     if ($line =~ s/^\s*< ?//) {
+-- 
+2.13.0
\ No newline at end of file