Update version closing bug #32830. Change to automake's style of selecting

version, closing bug #31016.

3 files changed, 188 insertions, 0 deletions

diff --git a/sys-devel/autoconf/files/ac-wrapper-2.pl b/sys-devel/autoconf/files/ac-wrapper-2.pl
new file mode 100644
index 000000000000..561cea33a3e2
--- /dev/null
+++ b/sys-devel/autoconf/files/ac-wrapper-2.pl
@@ -0,0 +1,72 @@
+#!/usr/bin/perl
+#
+#
+# Guillaume Cottenceau (gc@mandrakesoft.com)
+#
+# Copyright 2001 MandrakeSoft
+#
+# This software may be freely redistributed under the terms of the GNU
+# public license.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#
+# Executes the correct autoconf version.
+#
+# - defaults to autoconf-2.13
+# - runs autoconf-2.5x if it exists and...
+#   - 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'
+#     -or-
+#   - `configure' is already present and was generated by autoconf greater than
+#     '2.1'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.6 or superior, which
+#     specifically needs autoconf-2.5x
+#
+
+#use MDK::Common;
+
+sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
+
+my $binary     = "$0-2.13";
+my $binary_new = "$0-2.5x";
+
+# 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} 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'
+	        || (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';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary 	    = $binary_new;
+    } else {
+	$ENV{WANT_AUTOCONF} = '2.1';    # for further consistency
+    }
+}
+
+$ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
+
+exec $binary, @ARGV;
+
+die "ac-wrapper: ouch, couldn't call binary ($binary).\n";
diff --git a/sys-devel/autoconf/files/autoconf-2.58-infopage-namechange.patch b/sys-devel/autoconf/files/autoconf-2.58-infopage-namechange.patch
new file mode 100644
index 000000000000..b1ef64cd7bbf
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.58-infopage-namechange.patch
@@ -0,0 +1,114 @@
+diff -urN autoconf-2.58/doc/Makefile.in autoconf-2.58.info/doc/Makefile.in
+--- autoconf-2.58/doc/Makefile.in	2003-09-28 16:42:23.267768088 +0200
++++ autoconf-2.58.info/doc/Makefile.in	2003-09-28 16:42:47.480087256 +0200
+@@ -44,12 +44,12 @@
+ DIST_SOURCES =
+ TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/config
+-INFO_DEPS = autoconf.info standards.info
++INFO_DEPS = autoconf25.info standards.info
+ DVIS = autoconf.dvi standards.dvi
+ PDFS = autoconf.pdf standards.pdf
+ PSS = autoconf.ps standards.ps
+ HTMLS = autoconf.html standards.html
+-TEXINFOS = autoconf.texi standards.texi
++TEXINFOS = autoconf25.texi standards.texi
+ TEXI2PDF = $(TEXI2DVI) --pdf --batch
+ DVIPS = dvips
+ am__installdirs = $(DESTDIR)$(infodir)
+@@ -116,7 +116,7 @@
+ TEXI2DVI = texi2dvi --batch
+ TEXI2HTML = texi2html
+ TEXI2HTML_FLAGS = -split_chapter
+-info_TEXINFOS = autoconf.texi standards.texi
++info_TEXINFOS = autoconf25.texi standards.texi
+ autoconf_TEXINFOS = fdl.texi install.texi
+ standards_TEXINFOS = make-stds.texi
+ 
+@@ -192,14 +192,14 @@
+ .texi.html:
+ 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --html -I $(srcdir) \
+ 	 -o $@ $<
+-autoconf.info: autoconf.texi version.texi $(autoconf_TEXINFOS)
+-autoconf.dvi: autoconf.texi version.texi $(autoconf_TEXINFOS)
+-autoconf.pdf: autoconf.texi version.texi $(autoconf_TEXINFOS)
+-autoconf.html: autoconf.texi version.texi $(autoconf_TEXINFOS)
++autoconf25.info: autoconf25.texi version.texi $(autoconf_TEXINFOS)
++autoconf.dvi: autoconf25.texi version.texi $(autoconf_TEXINFOS)
++autoconf.pdf: autoconf25.texi version.texi $(autoconf_TEXINFOS)
++autoconf.html: autoconf25.texi version.texi $(autoconf_TEXINFOS)
+ version.texi:  stamp-vti
+-stamp-vti: autoconf.texi $(top_srcdir)/configure
+-	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
+-	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf.texi`; \
++stamp-vti: autoconf25.texi $(top_srcdir)/configure
++	@(dir=.; test -f ./autoconf25.texi || dir=$(srcdir); \
++	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf25.texi`; \
+ 	echo "@set UPDATED $$1 $$2 $$3"; \
+ 	echo "@set UPDATED-MONTH $$2 $$3"; \
+ 	echo "@set EDITION $(VERSION)"; \
+@@ -430,8 +430,8 @@
+ 
+ html: autoconf_1.html standards_1.html
+ 
+-autoconf_1.html: autoconf.texi install.texi
+-	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf.texi
++autoconf_1.html: autoconf25.texi install.texi
++	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf25.texi
+ 
+ standards_1.html: standards.texi make-stds.texi
+ 	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/standards.texi
+diff -urN autoconf-2.58/doc/autoconf.texi autoconf-2.58.info/doc/autoconf.texi
+--- autoconf-2.58/doc/autoconf.texi	2003-09-28 16:42:23.283765656 +0200
++++ autoconf-2.58.info/doc/autoconf.texi	2003-09-28 16:43:17.728488800 +0200
+@@ -1,9 +1,9 @@
+ \input texinfo @c -*-texinfo-*-
+ @comment ========================================================
+ @comment %**start of header
+-@setfilename autoconf.info
++@setfilename autoconf25.info
+ @include version.texi
+-@settitle Autoconf
++@settitle Autoconf v2.5
+ @setchapternewpage odd
+ @setcontentsaftertitlepage
+ @finalout
+@@ -210,27 +210,27 @@
+ 
+ @dircategory Software development
+ @direntry
+-* Autoconf: (autoconf).         Create source code configuration scripts.
++* Autoconf v2.5: (autoconf25).         Create source code configuration scripts.
+ @end direntry
+ 
+ @dircategory Individual utilities
+ @direntry
+-* autoscan: (autoconf)autoscan Invocation.
++* autoscan v2.5: (autoconf25)autoscan Invocation.
+                                 Semi-automatic @file{configure.ac} writing
+-* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
+-* autoconf: (autoconf)autoconf Invocation.
++* ifnames v2.5: (autoconf25)ifnames Invocation.        Listing conditionals in source.
++* autoconf v2.5: (autoconf25)autoconf Invocation.
+                                 How to create configuration scripts
+-* autoreconf: (autoconf)autoreconf Invocation.
++* autoreconf v2.5: (autoconf25)autoreconf Invocation.
+                                 Remaking multiple @command{configure} scripts
+-* autoheader: (autoconf)autoheader Invocation.
++* autoheader v2.5: (autoconf25)autoheader Invocation.
+                                 How to create configuration templates
+-* autom4te: (autoconf)autom4te Invocation.
++* autom4te v2.5: (autoconf25)autom4te Invocation.
+                                 The Autoconf executables backbone
+-* configure: (autoconf)configure Invocation.    Configuring a package.
+-* autoupdate: (autoconf)autoupdate Invocation.
++* configure v2.5: (autoconf25)configure Invocation.    Configuring a package.
++* autoupdate v2.5: (autoconf25)autoupdate Invocation.
+                                 Automatic update of @file{configure.ac}
+-* config.status: (autoconf)config.status Invocation. Recreating configurations.
+-* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
++* config.status v2.5: (autoconf25)config.status Invocation. Recreating configurations.
++* testsuite v2.5: (autoconf25)testsuite Invocation.    Running an Autotest test suite.
+ @end direntry
+ 
+ @titlepage
diff --git a/sys-devel/autoconf/files/digest-autoconf-2.58 b/sys-devel/autoconf/files/digest-autoconf-2.58
new file mode 100644
index 000000000000..0331bc77f727
--- /dev/null
+++ b/sys-devel/autoconf/files/digest-autoconf-2.58
@@ -0,0 +1,2 @@
+MD5 db3fa3069c6554b3505799c7e1022e2b autoconf-2.58.tar.bz2 925208
+MD5 9de56d4a161a723228220b0f425dc711 autoconf-2.13.tar.gz 443844