From: Andreas K. Hüttel Date: Sat, 22 Dec 2018 19:02:05 +0000 (+0100) Subject: sys-devel/autoconf: Revision bump 2.13-r1 for Perl 5.26 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=27f80f1f403f17a8dd7fd3108d178adaafda5e80;p=gentoo.git sys-devel/autoconf: Revision bump 2.13-r1 for Perl 5.26 Only one patch needed, the other one modifies code that does not exist in this version yet. Test suite passes in either case, not catching the problem. Closes: https://bugs.gentoo.org/625576 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas K. Hüttel --- diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild similarity index 94% rename from sys-devel/autoconf/autoconf-2.13.ebuild rename to sys-devel/autoconf/autoconf-2.13-r1.ebuild index 760263724fb2..a908a4d5d6f7 100644 --- a/sys-devel/autoconf/autoconf-2.13.ebuild +++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,6 +24,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-destdir.patch "${FILESDIR}"/${P}-test-fixes.patch #146592 + "${FILESDIR}"/${PN}-2.13-perl-5.26.patch ) src_configure() { diff --git a/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch b/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch new file mode 100644 index 000000000000..6fbc0cd1bc89 --- /dev/null +++ b/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch @@ -0,0 +1,12 @@ +diff -ruN autoconf-2.13.orig/autoscan.pl autoconf-2.13/autoscan.pl +--- autoconf-2.13.orig/autoscan.pl 1999-01-05 14:28:42.000000000 +0100 ++++ autoconf-2.13/autoscan.pl 2018-12-22 19:55:10.986732296 +0100 +@@ -232,7 +232,7 @@ + # Strip out comments and variable references. + s/#.*//; + s/\$\([^\)]*\)//g; +- s/\${[^\}]*}//g; ++ s/\$\{[^\}]*}//g; + s/@[^@]*@//g; + + # Variable assignments.