Fix ac-wrapper.pl to also work with AC_PREREQ(2.50) (note the 2.50 and not 2.5).

3 files changed, 15 insertions, 11 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index be3e6bf4b43e..bfc0871b531a 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.37 2004/01/30 22:32:06 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.38 2004/02/15 09:07:07 azarah Exp $
+
+  14 Feb 2004; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-2.pl:
+  Fix ac-wrapper.pl to also work with AC_PREREQ(2.50) (note the 2.50 and not
+  2.5).
 
   30 Jan 2004; <tuxus@gentoo.org> autoconf-2.58.ebuild:
   stable on mips.
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index abf23b0e9d3e..6d1830ee15cc 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,19 +1,19 @@
-MD5 262b1bded345d0f707fd793f5c10c8df ChangeLog 6278
+MD5 aed6ac760b0c9b058f8c4e18396cafd0 autoconf-2.58.ebuild 3491
+MD5 ce99d2584f3a5394396f6cc33bd31a38 ChangeLog 6440
 MD5 5df277d0dd4f6b32cded989d223e241f autoconf-2.57-r1.ebuild 3227
 MD5 c787626b1e0a3f2e490acc0ed05a312f autoconf-2.57a-r1.ebuild 3383
-MD5 aed6ac760b0c9b058f8c4e18396cafd0 autoconf-2.58.ebuild 3491
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 f3bce77a88077f845fb539c192e70eda autoconf-2.59.ebuild 3499
-MD5 f7e1b9cc603a3c0f7388724417bd3526 files/ac-wrapper-2.pl 2521
 MD5 28795f22763ef0683a8a1e72e8dd4646 files/ac-wrapper.pl 2133
+MD5 c98042870fa4228b40ce57442d91ca47 files/autoconf-2.57a-infopage-namechange.patch 5119
 MD5 12f8fb67eaf50f87ed7825356503e8d7 files/autoconf-2.13-configure-gentoo.diff 958
 MD5 f935499520b964a1fcfc23b68d8c8558 files/autoconf-2.13-configure.in-gentoo.diff 443
-MD5 e3137dce2883f1c5fa9adbee73a86113 files/autoconf-2.5-infopage-namechange.patch 4043
 MD5 c39fbf4a2c9bd249b6062e5b1cb67eae files/autoconf-2.57-infopage-namechange.patch 4628
-MD5 1e532467a5e16fbc8acf85b00d89ca85 files/autoconf-2.57a-AC_HELP_STRING.patch 403
-MD5 c98042870fa4228b40ce57442d91ca47 files/autoconf-2.57a-infopage-namechange.patch 5119
 MD5 372cd1fdd18a95f5a6af7cb36bfd12de files/autoconf-2.58-infopage-namechange.patch 5117
-MD5 cff703b5ddfcb647f18aeed0111b8138 files/digest-autoconf-2.57-r1 131
-MD5 f2802f3155defa9299baf6e5d0d79571 files/digest-autoconf-2.57a-r1 132
 MD5 d7f6caec3dfd602a77238546246b91b7 files/digest-autoconf-2.58 131
 MD5 b310d32d1d5c26cb84206bfda473da1c files/digest-autoconf-2.59 131
+MD5 e3137dce2883f1c5fa9adbee73a86113 files/autoconf-2.5-infopage-namechange.patch 4043
+MD5 1afb97b888b8302d8083fc7a794b0e39 files/ac-wrapper-2.pl 2527
+MD5 1e532467a5e16fbc8acf85b00d89ca85 files/autoconf-2.57a-AC_HELP_STRING.patch 403
+MD5 f2802f3155defa9299baf6e5d0d79571 files/digest-autoconf-2.57a-r1 132
+MD5 cff703b5ddfcb647f18aeed0111b8138 files/digest-autoconf-2.57-r1 131
diff --git a/sys-devel/autoconf/files/ac-wrapper-2.pl b/sys-devel/autoconf/files/ac-wrapper-2.pl
index 561cea33a3e2..c720d9fefa10 100644
--- a/sys-devel/autoconf/files/ac-wrapper-2.pl
+++ b/sys-devel/autoconf/files/ac-wrapper-2.pl
@@ -54,10 +54,10 @@ if ($ENV{WANT_AUTOCONF} ne '2.1') {
 	|| (-x $binary_new              # user may have only 2.13
 	    && (($ENV{WANT_AUTOCONF} eq '2.5')
 	        || -r 'configure.ac'
-	   	    || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
+	        || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
 	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
 	        || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-	        || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) {
+	        || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) {
 	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
 	$binary 	    = $binary_new;
     } else {