Support autoconf-2.66.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 210 insertions, 6 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index 8f580a9b99f4..2cbc032f2257 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.73 2010/06/04 05:33:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.74 2010/07/03 17:58:12 vapier Exp $
+
+*autoconf-wrapper-9 (03 Jul 2010)
+
+  03 Jul 2010; Mike Frysinger <vapier@gentoo.org>
+  +autoconf-wrapper-9.ebuild, +files/ac-wrapper-9.sh:
+  Support autoconf-2.66.
 
   04 Jun 2010; Jeroen Roovers <jer@gentoo.org> autoconf-wrapper-8.ebuild:
   Stable for HPPA (bug #311967).
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index df67d03f189e..0186f9cb5136 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ac-wrapper-7.sh 4325 RMD160 e52f8df68baa9503f6e18ea4048cae5704d5a6bd SHA1 4d581cd816b7c3bef77b54e3990f91ba11ff3767 SHA256 1f126a3fcd45fec152b6fcc77f71a682bd12586ee9c457a4c5c27d184f4c29b6
 AUX ac-wrapper-8.sh 4132 RMD160 f68600c5bb48cc7a103efed83f66261fce2475fc SHA1 9626122a8395a4f68259441dd6f65db6b3f5b5c9 SHA256 42dbd01eb411bbe58c590ad63d3e406860ab090cf5c971aeeaa7764f66f20a2d
+AUX ac-wrapper-9.sh 4141 RMD160 694067c056411f8e47fec4116ae8887a097b70ed SHA1 8e2deb858365f4e411e7c1b14e4c47f9cdf34f46 SHA256 41f44396482977f20f2fbc5446ec123c2e662bb780efc671acf3a6431a92e2eb
 EBUILD autoconf-wrapper-7.ebuild 794 RMD160 f0a96dbfa8447595cffafa305be80a1dd960a88b SHA1 9796574b6b8b7e6448fd5c4cba28fd9c6fae972a SHA256 13dc42cb33f3296f33b6b12470dc9b35da57272c890026852187da84a13beb41
 EBUILD autoconf-wrapper-8.ebuild 1000 RMD160 ea0753024afac82ce5807c3fccfc25d32c129d3b SHA1 6bfaf82f9c97ccd31a46560cbaef7cec4e9c269f SHA256 21f8652ac4396a5a0b9d46f358744e71555b976cd2b47dd7b12721325f8ee47b
-MISC ChangeLog 9547 RMD160 552ea1964d680f78a683165170b8f3275bac814d SHA1 b7366b2817949d20fbcdb2ccc998542dd4e3cbc5 SHA256 ed28bf9277968849a4c6d375e510b7bde5a3ab0e7155e1c24acd322f36f43d3e
+EBUILD autoconf-wrapper-9.ebuild 1014 RMD160 e1461e5a34b8d0f36da4e584615a004b90398fa1 SHA1 c53b071a2e37787b5aea6cce38a6f6a5af3bed0e SHA256 a8ceb3fdf09d8d5e4e2e55d95b71e90f54d80f2ed3ed5e1f9c0b6a365a97e76b
+MISC ChangeLog 9715 RMD160 f4d6efeaa0f7a7cbd23ad0cc51bb0e6957d16e61 SHA1 96991717eb746a92c5a125ab50b22e8320a526c9 SHA256 2233a9af78e00261d25098bd38dc2fe6b422cfefb412fc63fac4ea424066e403
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwveeoACgkQTwhj9JtAlp7YcQD/f8MB8349rwoMawAr274ZM8zc
+s5dXCyuiPQEHUTB2jysA/1UGJi+ZugcxR9Y7XZSakoNtJVayW/aFOg0Vw9k76tUc
+=Tlua
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild
new file mode 100644
index 000000000000..2cff9747994a
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-9.ebuild,v 1.1 2010/07/03 17:58:12 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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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-9.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh
new file mode 100755
index 000000000000..8d876534e484
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh
@@ -0,0 +1,159 @@
+#!/bin/sh
+# Copyright 1999-2010 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-9.sh,v 1.1 2010/07/03 17:58:12 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; }
+
+if [ "${0##*/}" = "ac-wrapper.sh" ] ; then
+	err "Don't call this script directly"
+fi
+
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${0##*/}" = "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
+
+#
+# Set up bindings between actual version and WANT_AUTOCONF
+#
+vers="2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+
+binary=""
+for v in ${vers} ; do
+	auto_ver=${v%:*}
+	if [ -z "${binary}" ] && [ -x "${0}-${auto_ver}" ] ; then
+		binary="${0}-${auto_ver}"
+	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 '${0}'."
+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 [ "${wx}" = "${want_ver}" ] && [ -x "${0}-${auto_ver}" ] ; then
+				binary="${0}-${auto_ver}"
+				v="x"
+			fi
+		done
+		[ "${v}" = "x" ] && break
+	done
+fi
+
+#
+# autodetect helpers
+#
+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.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.5" ] && [ -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="${0}-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
+#
+for v in ${vers} ; do
+	auto_ver=${v%:*}
+	want_ver=${v#*:}
+	if [ "${binary}" = "${0}-${auto_ver}" ] ; then
+		export WANT_AUTOCONF="${want_ver}"
+	fi
+done
+
+#
+# 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}" "$@"
+
+err "was unable to exec ${binary} !?"
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index da30049ee346..bb296206f22e 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -28,14 +28,14 @@ EBUILD autoconf-2.63-r1.ebuild 1309 RMD160 9b8dc1c85f0e9997915b990bb252003095651
 EBUILD autoconf-2.64.ebuild 1265 RMD160 198cc7c6e170c0202acf3e7403aec0e446bfebb4 SHA1 138586af69e0fd9ca6b5993492654f6b89bb4c77 SHA256 0f3cb30fbf863bc186108a71a685f62c7f59a5decd803f18e95daa038e5c2691
 EBUILD autoconf-2.65-r1.ebuild 1381 RMD160 5b86d38d4ace842c344833a047434cfc8e7535e9 SHA1 a1a10a013cdfaab22843857408b0670a901d0e32 SHA256 5743df6f5a6468bbbc65f8dfaa15ce90707245717eb42e90213381f482ef8c11
 EBUILD autoconf-2.65.ebuild 1251 RMD160 0d665090b143b535c692d07f71710e7840965bc9 SHA1 1a9745694bd8eb34f565dd1a50fe1ab18815b7ae SHA256 4235043afaf6a57ba96db8675df4ba864a0af53db21f52603049c527fb80b338
-EBUILD autoconf-2.66.ebuild 1187 RMD160 bee5ea20201b0a96059e6b30182e653f3ec712ee SHA1 469e594dce7b31f851af80e3c04fb826617e32b7 SHA256 ff21368c47002408569695f36594cc2e505c2e4d421d8db9220039b4e458d1b8
+EBUILD autoconf-2.66.ebuild 1187 RMD160 f9682d8513e35311ac833e75c9d1f57038d78b9b SHA1 256574ca57f2105889926e94908418f5f27b6b89 SHA256 a663f31722894d5e4e78ab9603c487253999b89258d96d8fd1467248e403e280
 EBUILD autoconf-9999.ebuild 1262 RMD160 46da23705fa4033b0a420507aaba52eeb3364af1 SHA1 b64c10c9fbd1cf34e2802474e021576e712d78c8 SHA256 0fc59822d4289bbd38a6f0a55374b7cc5c3ff61fafeb25301728e6cd11d68d31
 MISC ChangeLog 20057 RMD160 859a6a1ec102f54052db28fd78c35db194356dfc SHA1 4aa3ba6d6f461128cd012070d28c4c1d072fb2f4 SHA256 e80c9fb5b43bb40903e6fd311e6c37dce17fd78d3aaf390651a37c9aac931474
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwuqokACgkQTwhj9JtAlp5srwEAjvWOIMrupfjakhn5SVlr8YdF
-ZYc/51cSkl89rdfLKToBALClGxIN4fSYZsINMbYcgvH3DRfPEjANGQd2wTJR0ryy
-=fpJW
+iF4EAREIAAYFAkwvepkACgkQTwhj9JtAlp4yCwD7Bk70k9RhQv+yQ+QsFGWh9Z+A
+wYi9sS7+XOMiIzY/CFUA+wdSmi/jk6HcOxr48mH4KZdUVcYfO+pud0r6E96Ct1gC
+=ZCiO
 -----END PGP SIGNATURE-----