push out fixed ac-wrapper #66854

4 files changed, 43 insertions, 14 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index f273c30a4ece..ada96d7fcb17 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.55 2004/09/03 19:37:35 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.56 2004/10/09 22:38:53 vapier Exp $
+
+*autoconf-2.59-r5 (09 Oct 2004)
+
+  09 Oct 2004; Mike Frysinger <vapier@gentoo.org> files/ac-wrapper.pl,
+  -autoconf-2.59-r4.ebuild, +autoconf-2.59-r5.ebuild:
+  Version bump to push out fixed ac-wrapper.pl that cvs missed from before
+  #66854.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   autoconf-2.59-r3.ebuild:
diff --git a/sys-devel/autoconf/autoconf-2.59-r4.ebuild b/sys-devel/autoconf/autoconf-2.59-r5.ebuild
index e34ca4d559da..130ae5e78c38 100644
--- a/sys-devel/autoconf/autoconf-2.59-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.59-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r4.ebuild,v 1.11 2004/10/06 17:55:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r5.ebuild,v 1.1 2004/10/09 22:38:53 vapier Exp $
 
 inherit eutils
 
diff --git a/sys-devel/autoconf/files/ac-wrapper.pl b/sys-devel/autoconf/files/ac-wrapper.pl
index 86797efbb912..984ce670f378 100644
--- a/sys-devel/autoconf/files/ac-wrapper.pl
+++ b/sys-devel/autoconf/files/ac-wrapper.pl
@@ -17,15 +17,15 @@
 #
 # - defaults to autoconf-2.13
 # - runs autoconf-2.5x if it exists and...
-#   - envvar WANT_AUTOCONF_2_5 is set to `1'
+#   - envvar WANT_AUTOCONF is set to `2.5'
 #     -or-
 #   - configure.ac is present
 #     -or-
 #   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#     are stringwise greater than '2.1'
+#     are stringwise greater than '2.13'
 #     -or-
 #   - `configure' is already present and was generated by autoconf greater than
-#     '2.1'
+#     '2.13'
 #     -or-
 #   - `Makefile.in' was generated by automake-1.6 or superior, which
 #     specifically needs autoconf-2.5x
@@ -34,26 +34,48 @@
 #use MDK::Common;
 
 sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
+sub ac_version {
+	return ((@versions = cat_(shift) =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : '');
+}
 
 my $binary     = "$0-2.13";
 my $binary_new = "$0-2.5x";
 
-if (!$ENV{WANT_AUTOCONF_2_1}) {
-    if ((! -x $binary)              # handle stuff like autom4te, where only 2.5x have the binary
+# Autoconf is really getting out of hand, so rather start supporting
+# WANT_AUTOCONF = "2.5" the like.  Unfortunately it override the old
+# variables, so if not set, just convert the old variables ....
+if ($ENV{WANT_AUTOCONF} eq "") {
+	if ($ENV{WANT_AUTOCONF_2_1}) {
+		$ENV{WANT_AUTOCONF} = '2.1';
+	} elsif ($ENV{WANT_AUTOCONF_2_5}) {
+		$ENV{WANT_AUTOCONF} = '2.5';
+	}
+}
+
+if ($ENV{WANT_AUTOCONF} ne '2.1') {
+    if ((! -x $binary)                  # handle stuff like autom4te, where only 2.5x have the binary
 	|| (-x $binary_new              # user may have only 2.13
-	    && ($ENV{WANT_AUTOCONF_2_5}
+	    && (($ENV{WANT_AUTOCONF} eq '2.5')
 	        || -r 'configure.ac'
-	   	    || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' 
-	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
+		|| ac_version('configure.in') gt '2.13'
+	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.13'
 	        || (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'))) {
-	$ENV{WANT_AUTOCONF_2_5} = 1;    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 		= $binary_new;
+		|| ac_version('aclocal.m4') gt '2.13'))) {
+	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary 	    = $binary_new;
     } else {
-	$ENV{WANT_AUTOCONF_2_1} = 1;    # for further consistency
+	$ENV{WANT_AUTOCONF} = '2.1';    # for further consistency
     }
 }
 
+# Set AUTOM4TE to the proper version (bug #40983).
+# Do not set it for 2.13 though, as it does not ship autom4te.
+if(($ENV{AUTOM4TE} eq "")
+   && ($ENV{WANT_AUTOCONF} = '2.5')
+   && ($0 ne 'autom4te')) {
+	$ENV{AUTOM4TE} = "autom4te-2.5x";
+}
+
 $ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
 
 exec $binary, @ARGV;
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.59-r4 b/sys-devel/autoconf/files/digest-autoconf-2.59-r5
index a9ae401381fd..a9ae401381fd 100644
--- a/sys-devel/autoconf/files/digest-autoconf-2.59-r4
+++ b/sys-devel/autoconf/files/digest-autoconf-2.59-r5