Add support for autoconf-2.62 #217087.

Package-Manager: portage-2.2_pre5

4 files changed, 210 insertions, 6 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index bc66964d48d8..de46a76d862d 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.51 2007/01/05 16:04:43 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.52 2008/04/10 08:05:51 vapier Exp $
+
+*autoconf-wrapper-5 (10 Apr 2008)
+
+  10 Apr 2008; Mike Frysinger <vapier@gentoo.org> +files/ac-wrapper-5.sh,
+  +autoconf-wrapper-5.ebuild:
+  Add support for autoconf-2.62 #217087.
 
   05 Jan 2007; Jeroen Roovers <jer@gentoo.org> autoconf-wrapper-4-r3.ebuild:
   Stable for HPPA (bug #159416).
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 779ccc9ff180..a41c73a9475e 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,7 +1,16 @@
-AUX ac-wrapper-3.2.sh 3242 RMD160 9fb11d8fcac9b33e9d9eda56e663e26bc8ef4b48 SHA1 af1a44f0f82739ec449dab75871528caceb9e63d SHA256 4fecc535d7dd0f0424e637a2e3a8f0837832a32ec517ac0912b28a428f00941e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ac-wrapper-4.sh 4298 RMD160 6dd4c587191a5ff3d1231c1900783cff1665a99b SHA1 4bd7d8738dfa391ba2597e02fdf12dd651153972 SHA256 227328e6debb1f224b7af70d9c24ed92e942e7b43330d16e88707daac1e384df
-EBUILD autoconf-wrapper-3.2-r2.ebuild 873 RMD160 ea46faec55543a51b2395c6546b7ca82aee47fb7 SHA1 d848bd29eb9866fd693b51a5bd84b20d78bf3f18 SHA256 d9b3b021b42858c61ea52196c450b3c74550b9b7a57d65c69e50559d1d532985
-EBUILD autoconf-wrapper-3.2.ebuild 811 RMD160 ba39e87c02681c04d247298efbfb0564515e73d9 SHA1 5b3de39170d79119def0b24046664a420ace4ba2 SHA256 bf6968012027f744ee0d940747baf3763bbbc94a2a59d9155c1d4d14a5dbbb11
+AUX ac-wrapper-5.sh 4307 RMD160 e6fd213184ee63d5dfbdabb98a289ba347bface4 SHA1 30f68d0f004376e7c07046c82f7fc95e1d2b0dd2 SHA256 02d574a75b9ca5028df2e805dc5bb08043aef1120338fe9610f6ecd1000dbd5c
 EBUILD autoconf-wrapper-4-r3.ebuild 797 RMD160 3deec188da4487603bcdeaf91b0052a94e61ca40 SHA1 37939489ce7cd0834edf1de7b0e9e03e3bcc4e21 SHA256 3386447274e985ade38565a03eb9e610846be733d047be722fb4297a8b449027
-MISC ChangeLog 6950 RMD160 bfc41930de2e6352abde4ac5705c3ecc1aca20b4 SHA1 28eeba1dd82193b1aadc54b61eb20f1cc9be3496 SHA256 6b6453c01d30d6105ca74a477f9e33221ed6b0d40ddb9f9b9202da5c6241a6dc
+EBUILD autoconf-wrapper-5.ebuild 806 RMD160 8b175b6c77754a0bbafa3b93bf4397d48c76452a SHA1 055b0a4a4c97254daf5f19136f086eaf3d2dc87b SHA256 daf88dadb158ce3377dd7c77ddff2a72f3eeaec7f75f1a2379e6559f0122c3a7
+MISC ChangeLog 7134 RMD160 aba406d38874fd03e2cb20c72c7aa21db3b081e9 SHA1 5c74d5ac92e8e21820461d48902f35bf3731b066 SHA256 5c3a6d811a5cd9bd9e6ce961453d435fc376110ffad71b68fdeb363c60e4296d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH/cplj9hvisErhMIRAqpFAJ99eWIj7EEknzDJWiJF/tIb5m6r7ACeP48J
+s9gacHcAVvzYqxJ2mJL8T78=
+=/qvE
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-5.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-5.ebuild
new file mode 100644
index 000000000000..169c5ca7b2d0
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-5.ebuild,v 1.1 2008/04/10 08:05:51 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+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-5.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-5.sh
new file mode 100755
index 000000000000..baf11316e6ad
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-5.sh
@@ -0,0 +1,162 @@
+#!/bin/bash
+# Copyright 1999-2006 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-5.sh,v 1.1 2008/04/10 08:05:52 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
+
+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
+
+#
+# Set up bindings between actual version and WANT_AUTOCONF
+#
+vers="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
+	echo "ac-wrapper: Unable to locate any usuable version of autoconf." >&2
+	echo "            I tried these versions: ${vers}" >&2
+	echo "            With a base name of '${0}'." >&2
+	exit 1
+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
+			echo "ac-wrapper: warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring." >&2
+			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
+	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
+
+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
+		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
+#
+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
+	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