Support multislot-ed autoconf versions.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 252 insertions, 5 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index f684968ed381..c70575706ca1 100644
--- a/sys-devel/autoconf-wrapper/ChangeLog
+++ b/sys-devel/autoconf-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/autoconf-wrapper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.97 2013/02/17 20:36:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.98 2013/04/16 18:48:33 vapier Exp $
+
+*autoconf-wrapper-13 (16 Apr 2013)
+
+  16 Apr 2013; Mike Frysinger <vapier@gentoo.org> +autoconf-wrapper-13.ebuild,
+  +files/ac-wrapper-13.sh:
+  Support multislot-ed autoconf versions.
 
   17 Feb 2013; Zac Medico <zmedico@gentoo.org> autoconf-wrapper-12.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index d9c38a3b0351..d7140659700d 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -4,19 +4,31 @@ Hash: SHA256
 AUX ac-wrapper-10.sh 4406 SHA256 398c89d3034e44345e42f8c5c5c0ec7812d7fc3e4d3dc3e110ae80bdb3ef45f0 SHA512 a42e7385fc3f4a9fce1fb9811a5bfbbe6984b2113a04cae5cb211aecf68ad4cbb78e74a32b163e989325a8332c81a1c3bc936397cc68d377971416059e783f6a WHIRLPOOL 64b763e7326897231688114274839d3d8bf7a27205425b9d4aad7d3044eb69a311093dc7eb60605e90d599bee9f5048854be6a5d6b80a11c25b1425de072f813
 AUX ac-wrapper-11.sh 4415 SHA256 2fc934060ff42917124aaf3604097463366cd05bf9e350411a9144b31513e53c SHA512 24ef3f3dfb6d13e1d05995f0ddbf18c20caa78eb803428043222b781223c466f65f4224afe95ae1b6b16d45d71a3d1c35dd3d43cbb345a7aa3a94a62ceb416cf WHIRLPOOL f43676c4d8db9dc4c41af37716321c6a557f6f456e696fa6b31c8f287d8a5400f133f1a8cacdf3a8c9d01cf3b84bf141ba284291ebf2dd0b93567b1811826c64
 AUX ac-wrapper-12.sh 5091 SHA256 e11cb556d1c42d577ab8e6985abe3a5e607fe59ad3a22cfa35ddbe1716ad252a SHA512 e560e04015f1cc1657ec034c9b8b8ab18585a542d5597e382073db68b5e8b5027374ac5369e40723a36b5edfe831f8d38150e5bb77cfac1305a07d6b3bd80071 WHIRLPOOL f1d6fc227e9334b17a60bd15b201c06678cae356a065ce669b8baf7fefe28c8d5412c6cf2f636dc4ba1ca61f89ba7865ff47b3bc46093b6f1b657baf1ed504ed
+AUX ac-wrapper-13.sh 5168 SHA256 854beba87d785f927ac9bd78a43b1995ca1b4f9be7c85c94e917e18d99e0fe9f SHA512 ec1aae43333e8d9ba64319dc59ccd82a94200d13fd254e198a7c240842d536586976614ddca37706d19fc0fb1064e245be6f03027ac030b44969c9983e858aae WHIRLPOOL 6ee5f12c2676d7bd57e30452ebcd6d1e4ef4ae4116f81d9cf05ebb11cc4d91c02f5994e163ff5bebdf4cebc4f2cb8010798cb98cab6b809187614d090716094d
 AUX ac-wrapper-8.sh 4132 SHA256 42dbd01eb411bbe58c590ad63d3e406860ab090cf5c971aeeaa7764f66f20a2d SHA512 e8603dbe049fdca9d941612f42e18a31e5b23ba74f5cf5f035108742e3ca383df37d0c883124d4bffb547235a15cc82bc2d1c8772c07386d552b68631a74e09a WHIRLPOOL 8a006081a42db8c72f7408e53bcfce1dd1060a2af388a842cbcc6cdc243c38f243b170763386e030f1ad4cd5738496dec5af854df9214b79f4a1e004c189d890
 AUX ac-wrapper-9.sh 4150 SHA256 91ce1047aec2f4ab3f748b91635202b4684985e77cce712573161f8729e04f9b SHA512 3e30ddab180beec6da43697f88d47ab8a69a84a88e98ca340e3d2462ab963dbe7256412f66fe86e46a6c7afce32247c1fa6f336d60206348dc1351d1bc5443b0 WHIRLPOOL f5c4d47ef756b57a9c5359709efa6fa1699da8148495f12e00182d45efcf0a5881319cd33a40c9bfdb553e8f03cbd807d6137dda1896eb8fac08886a4884c26e
 EBUILD autoconf-wrapper-10-r1.ebuild 1006 SHA256 7b898d2cbbfb2609850424248b5312e9165bf982bfef041ed1a98916cbd98ab3 SHA512 921dcecc7acfec6079a5043ac8adfa1320e73798139a47033c0d1a1dfc365380bdb8b7ecd047f1a346213b0ec40685de3ee9c5193cec7c3f8e3a5d139e745c95 WHIRLPOOL ef0ca30c7efae3adf2c2799d0b75cfd1c269220fcb3d9b62030c5b8bfefcc6ec4b70bf6bdcc7ad9eecbe2aa063c50224f77a8f35bfd250451b78cd2f6cde9f76
 EBUILD autoconf-wrapper-11.ebuild 1015 SHA256 3836efc6325593b4b2f5c3e4a1588bacccc3218bcca1dff497072cd8497ff8f4 SHA512 bebfcd3ca486105d0588a8094cc85d34a0b9427e7000452716850e2694788e8812a69aaea1992ca46bbe8d394446512f71bc0cf214856d088523af1c1e6b786d WHIRLPOOL e0e9827831aa924204db1fc9004a78793855294127f8d2cbc9caed910b6245de8ddd70a92da4c70d26b123ca9d7a62603622ef137f6cbd0ddb61487c552949c6
 EBUILD autoconf-wrapper-12.ebuild 1028 SHA256 f64bc9743e170417038caf1932ad6e3c2e9069dd66379c8a6f9ca3a8e5ce1edf SHA512 26ad61dd33510a211fa23183e43ae85b877b4a246efda2b2c6543bff8d21e2157f7072bffc7a35000f68753048d3af89ac1e66f0440181e841c2a7652c070a9b WHIRLPOOL a0232065ae1e97bea115813a321bb68605952996fa9b780cb97133bb1a53749b11573b6acd53cda32bc1d4cde4af6539b100fd92af0f06ce6bf80af4328eadce
+EBUILD autoconf-wrapper-13.ebuild 1038 SHA256 acc4dae2f85a2204cd7ab3f56f812e443b83b931fbb0d0618577b8f7f2d5f750 SHA512 40713b97eb1eebb76a51b5d6483febfdeaf37f5abc92ff09a32c91c0dc18e112eb523bf13136c0d9af522e613602c36bbe2b14d07ded3c69b5d056a706b5f289 WHIRLPOOL 42985f273d2e7d37c22ac09a618721d2b4392f224322350078b4423b23037ad4271126d136faf094969efbdde521c8830d101a91f74262e86c82c0f27ce04cf6
 EBUILD autoconf-wrapper-8.ebuild 1005 SHA256 9abffe402d5753068757cb98b05025d989ee356897f8dd3bc03d48b1e24c98df SHA512 51fbd3cdbf1cde0e231cd3d3e81ccc4b46c9bd40fbb05b8bd70bb2ea37de386229147c87913b64038f66cb850f9ef54ddeda96b16bd933dadac65158e54c7c94 WHIRLPOOL d5318a27a8bc95fb8be4249b2ef0503390de497a519d38c4b3b968425bcb26e47c5c812392d5b29e2b625037effef5190a1364add517920a3af36fae91630edd
 EBUILD autoconf-wrapper-9-r1.ebuild 1017 SHA256 a04d1437b20a431a32a068443b458a4575cffebad1e8dd5f90b796026e495a7d SHA512 4499ee5720cfc576cabf4a10d954f7218410207561e2549b6d253947ec31f738bf5b288a493e02a50b8ab9cf3fac4c4332f652d871b71bf7b63f284af7f648bc WHIRLPOOL 492a9935674082e687c2b31db81abd0a2a1931e5ba2872489c05785d63db4758bb1d835f4978f6a15b5e6aacdd942e3ec872bf52cccb76db3ea22f37a66e5e8a
-MISC ChangeLog 12984 SHA256 6e04158d34b85c2f45f6261fc60a58545d7e20d010249d4723deab1a1e867261 SHA512 51cde923fcb580eb0e07d6c1c8e21f3ff8475ba2bf9ba427b51d73491770f8dc260e8d3b2989caa0ecc68d8f8ab8cd8bfea22e252a7de6043eb30a0c923a5799 WHIRLPOOL 447d995eebb236e0b68cd3d8d3b129a405f19b1b27b0fca671e0b4752e8f037a2d9aa0bbe5ad9c617fee99d6cffffadc3f3b1bacaaf6dfbbf58b41723284c7a5
+MISC ChangeLog 13168 SHA256 7979a78d1bf8049e17b17ac49ca2b514717fb8c4a3ae895d63527f88025df031 SHA512 5ebe387e5a02d79c04a40bf49548fa129078b998d1934db63a227582ecdbf8eb2d709eb593e49c1b1cb78dbec2c412f7694459ebc0abc18dd6ad34c27133beaf WHIRLPOOL aa13251719d7ccb5e4b28f4be069dc34c8186df2402a3d6a76d35728343c3769439451757a9a70a76b4fcccdf2b46e5e3a519d0b2eab619c4a4928dcc217310f
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEhPzQACgkQ/ejvha5XGaMfKQCfTU+9vCOzll0An6Wcsd18RJLg
-CX8AnRM5wdx38I8mxnNaXiLrYgeHW/Jb
-=OdyA
+iQIcBAEBCAAGBQJRbZ2cAAoJELEHsLL7fEFWen8QAIf4x2gUMevCf7ZqZNhfVLOm
+L3Aa7ySDL6ANtQKJ9Nj/dyTyaUrARWZ6m88nVyKZpuaiJunU5F6Arw6oBKvxbSXr
+a5c84t3BEH2Lq51eP8hrZRQ0vEnkzRZS4Hy9Qt7sesf3pYQ0D5Yox+B/QW+uDguS
+g0QO6VYRmFMhmzTWlBKO7ZrdoEbINYldbb1YQHzkYXEQj/1Ej6KC42jKfEOv2pNB
+HHf6iKXUmDLCnLiRYSePUIQASVqkli0JVlA/X3eO3ohg1uVuJ9zav7ESduU2pnYN
+zAxtWYCKCCZNSp9XT3sYeXC242DF3TNE+fdk9fxsqJqlEm9JW05ZLDnFlQ+P6iGT
+Jlf78WZpVt/5V34HPcksWa40EqJNUXraW0xP5JxLw5+AxAWJ4L+/BQ/7TGPUIFQy
++sFNFIT9Uog00bAE4sVuphFjDyc6+Le115riDaFAiA+dohA0vpr15EE31F2ye/gc
+9XT4k3pYGnznDKHiindSQrRWC1adnSxHJJ4wbJckv2GQlym72El8mGL30X4LA+k1
+r4npaF/RCIG15oUfZbvLjb/JOPPuSGE//aoOeCpx9k9bb6CL88fgDtvPgLvqRG9x
+yGUf862f0Aw+fSCBP842gC2Kw4D1NePIo5oM+mC9iTPsJsUP9KdBBGowA895WSeW
+PMRXOdElFjKkgCLIRqvU
+=0bho
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild
new file mode 100644
index 000000000000..f79e4aa89a9a
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild,v 1.1 2013/04/16 18:48:33 vapier Exp $
+
+inherit multilib
+
+DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh || die
+
+	dodir /usr/bin
+	local x=
+	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
+		dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} || die
+	done
+}
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
new file mode 100755
index 000000000000..9d07d35fd77d
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
@@ -0,0 +1,202 @@
+#!/bin/sh
+# Copyright 1999-2013 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-13.sh,v 1.1 2013/04/16 18:48:33 vapier Exp $
+
+# Based on the ac-wrapper.pl script provided by MandrakeSoft
+# Rewritten in bash by Gregorio Guidi
+#
+# Executes the correct autoconf version.
+#
+# - defaults to newest version available (hopefully autoconf-2.60)
+# - runs autoconf 2.13 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
+
+warn() { printf "ac-wrapper: $*\n" 1>&2; }
+err() { warn "$@"; exit 1; }
+unset IFS
+which() {
+	local p
+	IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
+	for p in ${PATH} ; do
+		p="${p}/$1"
+		[ -e "${p}" ] && echo "${p}" && return 0
+	done
+	unset IFS
+	return 1
+}
+
+#
+# Sanitize argv[0] since it isn't always a full path #385201
+#
+argv0=${0##*/}
+case ${0} in
+	${argv0})
+		# find it in PATH
+		if ! full_argv0=$(which "${argv0}") ; then
+			err "could not locate ${argv0}; file a bug"
+		fi
+		;;
+	*)
+		# re-use full/relative paths
+		full_argv0=$0
+		;;
+esac
+
+if [ "${argv0}" = "ac-wrapper.sh" ] ; then
+	err "Don't call this script directly"
+fi
+
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${argv0}" = "autom4te" ] ; then
+	err "Autoconf 2.13 doesn't contain autom4te.\n" \
+	    "   Either unset WANT_AUTOCONF or don't execute anything\n" \
+	    "   that would use autom4te."
+fi
+
+if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
+	seq() {
+		local f l i
+		case $# in
+			1) f=1 i=1 l=$1;;
+			2) f=$1 i=1 l=$2;;
+			3) f=$1 i=$2 l=$3;;
+		esac
+		while :; do
+			[ $l -lt $f -a $i -gt 0 ] && break
+			[ $f -lt $l -a $i -lt 0 ] && break
+			echo $f
+			: $(( f += i ))
+		done
+		return 0
+	}
+fi
+
+#
+# Set up bindings between actual version and WANT_AUTOCONF;
+# Start at last known unstable/stable versions to speed up lookup process.
+#
+KNOWN_AUTOCONF="2.69:2.5 2.68:2.5"
+vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
+
+binary=""
+for v in ${vers} ; do
+	auto_ver=${v%:*}
+	if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
+		binary="${full_argv0}-${auto_ver}"
+		break
+	fi
+done
+if [ -z "${binary}" ] ; then
+	err "Unable to locate any usuable version of autoconf.\n" \
+	    "\tI tried these versions: ${vers}\n" \
+	    "\tWith a base name of '${full_argv0}'."
+fi
+
+#
+# Check the WANT_AUTOCONF setting.  We accept a whitespace delimited
+# list of autoconf versions.
+#
+if [ -n "${WANT_AUTOCONF}" ] ; then
+	for v in ${vers} x ; do
+		if [ "${v}" = "x" ] ; then
+			warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring."
+			unset WANT_AUTOCONF
+			break
+		fi
+
+		auto_ver=${v%:*}
+		want_ver=${v#*:}
+		for wx in ${WANT_AUTOCONF} ; do
+			if [ -x "${full_argv0}-${wx}" ] ; then
+				binary="${full_argv0}-${wx}"
+				v="x"
+			elif [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
+				binary="${full_argv0}-${auto_ver}"
+				v="x"
+			fi
+		done
+		[ "${v}" = "x" ] && break
+	done
+fi
+
+#
+# autodetect helpers
+#
+acprereq_version() {
+	sed -n -r \
+		-e '/^\s*(#|dnl)/d' \
+		-e '/AC_PREREQ/s:.*AC_PREREQ\s*\(\[?\s*([0-9.]+)\s*\]?\):\1:p' \
+		"$@" |
+	LC_ALL=C sort -n -t . |
+	tail -1
+}
+
+generated_version() {
+	local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*'
+	sed -n -r "/${re}/{s:${re}:\3:;p;q}" "$@"
+}
+
+#
+# autodetect routine
+#
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then
+	err "Since configure.ac is present, aclocal always use\n" \
+	    "\tautoconf 2.59+, which conflicts with your choice and\n" \
+	    "\tcauses error. You have two options:\n" \
+	    "\t1. Try execute command again after removing configure.ac\n" \
+	    "\t2. Don't set WANT_AUTOCONF"
+fi
+
+if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
+	# Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
+	# is set to an older version, let's do some sanity checks.
+	case "${WANT_AUTOMAKE}" in
+	1.[456])
+		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="${full_argv0}-2.13"
+		fi
+	esac
+fi
+
+if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then
+	if [ -n "${WANT_AUTOCONF}" ] ; then
+		warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}"
+	fi
+	warn "DEBUG: will execute <${binary}>"
+fi
+
+#
+# for further consistency
+#
+if [ -z "${WANT_AUTOCONF}" ] ; then
+	for v in ${vers} ; do
+		auto_ver=${v%:*}
+		want_ver=${v#*:}
+		if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then
+			export WANT_AUTOCONF="${want_ver}"
+			break
+		fi
+	done
+fi
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${binary}" ] ; then
+	# this shouldn't happen
+	err "${binary} is missing or not executable.\n" \
+	    "\tPlease try emerging the correct version of autoconf."
+fi
+
+exec "${binary}" "$@"
+# The shell will error out if `exec` failed.