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

version, closing bug #31016.

6 files changed, 350 insertions, 3 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index 069124637765..e9241d222569 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.29 2003/10/31 00:03:07 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.30 2003/11/07 23:47:20 azarah Exp $
+
+*autoconf-2.58 (08 Nov 2003)
+
+  08 Nov 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.58.ebuild,
+  files/ac-wrapper-2.pl, files/autoconf-2.58-infopage-namechange.patch:
+  Update version closing bug #32830. Change to automake's style of selecting
+  version, closing bug #31016.
 
   30 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: all ebuilds: modified
   pkg_preinst() to use $ROOT and prevent non-ROOT="/" autoconf merges from
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 502539b738c0..e82bed225016 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,10 +1,10 @@
 MD5 20a91c88e56e5c5472616093f8eb83ed autoconf-2.54-r1.ebuild 3221
 MD5 cce411fa2ad2abf61cc502f677469549 autoconf-2.57.ebuild 3226
-MD5 2f7335f180cabdc961027a94d1915452 autoconf-2.58.ebuild 3414
+MD5 d2f6047ae2a672b303694424426dc455 autoconf-2.58.ebuild 3498
 MD5 95cd9367a4df2e554aa7db8e0a5cb27f autoconf-2.53a.ebuild 2796
 MD5 0cc339109d2c3012c3e811d430344916 autoconf-2.54.ebuild 3219
 MD5 f73eea253e36a72484edff7fe1ca1086 autoconf-2.13-r2.ebuild 989
-MD5 4411cdf314bc25e89cc9e4b558254975 ChangeLog 5046
+MD5 bdab3dfc5baf9523c22bb49667801886 ChangeLog 5329
 MD5 c7580522df96c95bfb223bebf6cdf1ff autoconf-2.57-r1.ebuild 3233
 MD5 edd322cb328dc943b8731a9d43faf3ba autoconf-2.57a-r1.ebuild 3390
 MD5 28795f22763ef0683a8a1e72e8dd4646 files/ac-wrapper.pl 2133
@@ -14,6 +14,7 @@ MD5 ac8caa17f05e56e10927af757cf12f99 files/digest-autoconf-2.54 131
 MD5 12f8fb67eaf50f87ed7825356503e8d7 files/autoconf-2.13-configure-gentoo.diff 958
 MD5 f935499520b964a1fcfc23b68d8c8558 files/autoconf-2.13-configure.in-gentoo.diff 443
 MD5 c39fbf4a2c9bd249b6062e5b1cb67eae files/autoconf-2.57-infopage-namechange.patch 4628
+MD5 372cd1fdd18a95f5a6af7cb36bfd12de files/autoconf-2.58-infopage-namechange.patch 5117
 MD5 d7f6caec3dfd602a77238546246b91b7 files/digest-autoconf-2.58 131
 MD5 cff703b5ddfcb647f18aeed0111b8138 files/digest-autoconf-2.57 131
 MD5 e3137dce2883f1c5fa9adbee73a86113 files/autoconf-2.5-infopage-namechange.patch 4043
diff --git a/sys-devel/autoconf/autoconf-2.58.ebuild b/sys-devel/autoconf/autoconf-2.58.ebuild
new file mode 100644
index 000000000000..b36b33f59b24
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.58.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.58.ebuild,v 1.1 2003/11/07 23:47:20 azarah Exp $
+
+IUSE=""
+
+inherit eutils
+
+OLD_PV="2.13"
+OLD_P="${PN}-${OLD_PV}"
+S="${WORKDIR}/${P}"
+OLD_S="${WORKDIR}/${OLD_P}"
+DESCRIPTION="Used to create autoconfiguration files"
+SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2
+	mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gnu/${PN}/${OLD_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64"
+
+DEPEND=">=sys-apps/texinfo-4.3
+	~sys-devel/m4-1.4
+	dev-lang/perl"
+
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${OLD_S}
+	epatch ${FILESDIR}/${OLD_P}-configure-gentoo.diff
+	epatch ${FILESDIR}/${OLD_P}-configure.in-gentoo.diff
+
+	cd ${S}
+	# Enable both autoconf-2.1 and autoconf-2.5 info pages
+	epatch ${FILESDIR}/${PN}-2.58-infopage-namechange.patch
+	ln -snf ${S}/doc/autoconf.texi ${S}/doc/autoconf25.texi
+}
+
+src_compile() {
+
+	#
+	# ************ autoconf-2.5x ************
+	#
+	cd ${S}
+	./configure --prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--target=${CHOST} || die
+
+	emake || die
+
+	#
+	# ************ autoconf-2.13 ************
+	#
+	cd ${OLD_S}
+
+	perl -pi -e 's|\* Autoconf:|\* Autoconf v2.1:|' autoconf.texi
+	cp autoconf.texi autoconf.texi.orig
+	sed -e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \
+		autoconf.texi.orig > autoconf.texi
+
+	./configure --prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--target=${CHOST} || die
+
+	emake || die
+}
+
+src_install() {
+
+	# install wrapper script for autodetecting the proper version
+	# to use.
+	exeinto /usr/lib/${PN}
+	newexe ${FILESDIR}/ac-wrapper-2.pl ac-wrapper.pl
+	dosed "s:2\.5x:${PV}:g" /usr/lib/${PN}/ac-wrapper.pl
+
+	#
+	# ************ autoconf-2.5x ************
+	#
+
+	# need to use 'DESTDIR' here, else perl stuff puke
+	cd ${S}
+	make DESTDIR=${D} \
+		install || die
+
+	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
+	do
+		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${PV}
+	done
+	# new in 2.5x
+	dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/autom4te
+
+#	mv ${D}/usr/share/info/autoconf.info ${D}/usr/share/info/autoconf-2.5.info
+
+	docinto ${PV}
+	dodoc COPYING AUTHORS BUGS NEWS README TODO THANKS
+	dodoc ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
+
+	#
+	# ************ autoconf-2.13 ************
+	#
+
+	# need to use 'prefix' here, else we get sandbox problems
+	cd ${OLD_S}
+	make prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames
+	do
+		mv ${D}/usr/bin/${x} ${D}/usr/bin/${x}-${OLD_PV}
+		dosym ../lib/${PN}/ac-wrapper.pl /usr/bin/${x}
+	done
+
+	docinto ${OLD_PV}
+	dodoc COPYING AUTHORS NEWS README TODO
+	dodoc ChangeLog ChangeLog.0 ChangeLog.1
+
+	# from binutils
+	rm -f ${D}/usr/share/info/standards.info*
+}
+
+pkg_preinst() {
+
+	# remove these to make sure symlinks install properly if old versions
+	# was binaries
+	for x in autoconf autoheader autoreconf autoscan autoupdate ifnames autom4te
+	do
+		if [ -e ${ROOT}/usr/bin/${x} ]
+		then
+			rm -f ${ROOT}/usr/bin/${x}
+		fi
+	done
+}
+
+pkg_postinst() {
+
+	echo
+	einfo "Please note that the 'WANT_AUTOCONF_?_?=1' have changed to:"
+	echo
+	einfo "  WANT_AUTOCONF=<required version>"
+	echo
+	einfo "For instance:  WANT_AUTOCONF=2.5"
+	echo
+}
+
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