Update wrapper to be more generic with different versions of autconf-2.59 or later.

Package-Manager: portage-2.1.1_pre1-r5

3 files changed, 143 insertions, 9 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index 36c8dd43fc94..1594d56ed77a 100644
--- a/sys-devel/autoconf-wrapper/ChangeLog
+++ b/sys-devel/autoconf-wrapper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/autoconf-wrapper
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.32 2006/06/27 00:51:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.33 2006/06/29 06:45:51 azarah Exp $
+
+  29 Jun 2006; Martin Schlemmer <azarah@gentoo.org>
+  +files/ac-wrapper-3.3.sh:
+  Update wrapper to be more generic with different versions of autconf-2.59 or
+  later.
 
 *autoconf-wrapper-3.2-r2 (27 Jun 2006)
 
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 1e0fc32e664f..f91dbf6f9505 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -9,6 +9,10 @@ AUX ac-wrapper-3.2.sh 3242 RMD160 9fb11d8fcac9b33e9d9eda56e663e26bc8ef4b48 SHA1
 MD5 0a542dd224e861aba771526c9b75edca files/ac-wrapper-3.2.sh 3242
 RMD160 9fb11d8fcac9b33e9d9eda56e663e26bc8ef4b48 files/ac-wrapper-3.2.sh 3242
 SHA256 4fecc535d7dd0f0424e637a2e3a8f0837832a32ec517ac0912b28a428f00941e files/ac-wrapper-3.2.sh 3242
+AUX ac-wrapper-3.3.sh 3391 RMD160 b2284feb1b3ec0824e0cb489fc963f362172dff9 SHA1 0f1ad6df590521ea77235f0667bdd84c7fd6a741 SHA256 6c910191a5354f4263ba246feaba2c70f51da6a243014209c4bce669803ffe8f
+MD5 3e3b1d52e34a14ca54c220ea08295cc9 files/ac-wrapper-3.3.sh 3391
+RMD160 b2284feb1b3ec0824e0cb489fc963f362172dff9 files/ac-wrapper-3.3.sh 3391
+SHA256 6c910191a5354f4263ba246feaba2c70f51da6a243014209c4bce669803ffe8f files/ac-wrapper-3.3.sh 3391
 AUX ac-wrapper-3.sh 3077 RMD160 8f43c09264294322ea6830e1d11ea4d10c9be871 SHA1 51d1202055526486c8fda3d1f9f215f20da7882a SHA256 5f62964eb31e42f3896229d7c8f993e557bb9a3488110118a7594d3cb0fe979f
 MD5 baa08513b5000a1ecf58715b8d654eae files/ac-wrapper-3.sh 3077
 RMD160 8f43c09264294322ea6830e1d11ea4d10c9be871 files/ac-wrapper-3.sh 3077
@@ -33,10 +37,10 @@ EBUILD autoconf-wrapper-3.ebuild 821 RMD160 66e720049f26fa66733d11cb64a282f21e39
 MD5 5893addbc67d6e0d2fff9560a7e5198f autoconf-wrapper-3.ebuild 821
 RMD160 66e720049f26fa66733d11cb64a282f21e3920ef autoconf-wrapper-3.ebuild 821
 SHA256 22c571655bd8e6005b76c16255ee837db318f780db871062d58e043ef5aff2d9 autoconf-wrapper-3.ebuild 821
-MISC ChangeLog 4275 RMD160 06b720bbfcff7048c0c56fec71089626c18305be SHA1 0aa486723a4e2d96752109665230c86342f2e30b SHA256 0f1d46622be1c3556a04106c65fad76c422dad3c85411513b4b889c15d32419d
-MD5 0c27034cc5ed1e7113391fad1ead1e01 ChangeLog 4275
-RMD160 06b720bbfcff7048c0c56fec71089626c18305be ChangeLog 4275
-SHA256 0f1d46622be1c3556a04106c65fad76c422dad3c85411513b4b889c15d32419d ChangeLog 4275
+MISC ChangeLog 4444 RMD160 2e7f2a61956b37b3dc2a30f53e6da14ae6752011 SHA1 b1b5c8761817b18f69daa7a41c45e88366de3b57 SHA256 0386505b2833566cb7cde64c97f663be2c3289c25119b64383a2c6bc308b3863
+MD5 ff4c1092d44c898c9e4a525cb4a0e894 ChangeLog 4444
+RMD160 2e7f2a61956b37b3dc2a30f53e6da14ae6752011 ChangeLog 4444
+SHA256 0386505b2833566cb7cde64c97f663be2c3289c25119b64383a2c6bc308b3863 ChangeLog 4444
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -57,9 +61,9 @@ MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-autoconf-wrapper-3.2-r2 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-autoconf-wrapper-3.2-r2 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-autoconf-wrapper-3.2-r2 1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEoIJKamhnQswr0vIRAiRoAJ9IuErIIuzfMNZLt5KGx9hOiI7BXwCeMAqv
-ADrYaZZQIS8qd8K8kmft70c=
-=aOb8
+iD8DBQFEo3df1ZcsMnZjRyIRAm1TAJ9er4tC4WlASrcZ+gQHXjPgXGZciACdEFYN
+czmuaiJeDPhu0XVQmmqCMes=
+=raBM
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-3.3.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.3.sh
new file mode 100755
index 000000000000..ad4ca4a069c5
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-3.3.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.3.sh,v 1.1 2006/06/29 06:45:51 azarah Exp $
+
+# Based on the ac-wrapper.pl script provided by MandrakeSoft
+# Rewritten in bash by Gregorio Guidi
+#
+# Executes the correct autoconf version.
+#
+# - defaults to latest version (2.5x)
+# - runs autoconf 2.13 only if:
+#   - envvar WANT_AUTOCONF is set to `2.1'
+#     -or-
+#   - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher)
+#     -or-
+#   - `configure' is already present and was generated by autoconf 2.13
+
+if [[ ${0##*/} == "ac-wrapper.sh" ]] ; then
+	echo "Don't call this script directly" >&2
+	exit 1
+fi
+
+if [[ ${WANT_AUTOCONF} == "2.1" && ${0##*/} == "autom4te" ]] ; then
+	echo "ac-wrapper: Autoconf 2.13 doesn't contain autom4te." >&2
+	echo "            Either unset WANT_AUTOCONF or don't execute anything" >&2
+	echo "            that would use autom4te." >&2
+	exit 1
+fi
+
+if type -p autoconf-2.60 &>/dev/null ; then
+	binary_new="${0}-2.60"
+elif type -p autoconf-2.59d &>/dev/null ; then
+	binary_new="${0}-2.59d"
+else
+	binary_new="${0}-2.59"
+fi
+binary_old="${0}-2.13"
+binary=${binary_new}
+
+acprereq_version() {
+	gawk \
+	'($0 !~ /^[[:space:]]*(#|dnl)/) {
+		if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
+			VERSIONS[COUNT++] = res[1]
+	}
+
+	END {
+		asort(VERSIONS)
+		print VERSIONS[COUNT]
+	}' "$@"
+}
+
+generated_version() {
+	gawk \
+	'{
+		if (match($0,
+		          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
+		          res)) {
+			print res[3]
+			exit
+		}
+	}' "$@"
+}
+
+#
+# autodetect routine
+#
+if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then 
+	if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then
+		if [[ ! -f "configure.ac" ]] ; then
+			binary=${binary_old}
+		else
+			echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
+			echo "            autoconf 2.59, which conflicts with your choice and" >&2
+			echo "            causes error. You have two options:" >&2
+			echo "            1. Try execute command again after removing configure.ac" >&2
+			echo "            2. Don't set WANT_AUTOCONF" >&2
+			exit 1
+		fi
+	else
+		# Automake-1.7 and better requie autoconf-2.5x
+		case "${WANT_AUTOMAKE}" in
+		1.[7-9]) ;;
+		*)
+			acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
+			[[ -n ${acfiles} ]] && confversion=$(acprereq_version ${acfiles})
+			
+			[[ -z ${confversion} && -r "configure" ]] && \
+				confversion=$(generated_version configure)
+
+			if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
+				binary="${binary_old}"
+			fi
+		esac
+	fi
+fi
+
+if [[ -n ${WANT_ACWRAPPER_DEBUG} ]] ; then
+	if [[ -n ${WANT_AUTOCONF} ]] ; then
+		echo "ac-wrapper: DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" >&2
+	fi
+	echo "ac-wrapper: DEBUG: will execute <${binary}>" >&2
+fi
+
+#
+# for further consistency
+#
+if [[ ${binary} == "${binary_new}" ]] ; then
+	export WANT_AUTOCONF="2.5"
+elif [[ ${binary} == "${binary_old}" ]] ; then
+	export WANT_AUTOCONF="2.1"
+fi
+
+if [[ ! -x ${binary} ]] ; then
+	# this shouldn't happen
+	echo "ac-wrapper: ${binary} is missing or not executable." >&2
+	echo "            Please try emerging the correct version of autoconf." >&2
+	exit 1
+fi
+
+exec "${binary}" "$@"
+
+echo "ac-wrapper: was unable to exec ${binary} !?" >&2
+exit 1