Add support for autoconf-2.63.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

4 files changed, 209 insertions, 2 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index 80a1afea8658..dcf2458e14d8 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.53 2008/05/28 13:28:40 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.54 2008/09/20 17:46:46 vapier Exp $
+
+*autoconf-wrapper-6 (20 Sep 2008)
+
+  20 Sep 2008; Mike Frysinger <vapier@gentoo.org> +files/ac-wrapper-6.sh,
+  +autoconf-wrapper-6.ebuild:
+  Add support for autoconf-2.63.
 
   28 May 2008; Guy Martin <gmsoft@gentoo.org> autoconf-wrapper-5.ebuild:
   Stable on hppa.
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 1b406eb0f80a..bb391b3e6970 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ac-wrapper-4.sh 4298 RMD160 6dd4c587191a5ff3d1231c1900783cff1665a99b SHA1 4bd7d8738dfa391ba2597e02fdf12dd651153972 SHA256 227328e6debb1f224b7af70d9c24ed92e942e7b43330d16e88707daac1e384df
 AUX ac-wrapper-5.sh 4307 RMD160 e6fd213184ee63d5dfbdabb98a289ba347bface4 SHA1 30f68d0f004376e7c07046c82f7fc95e1d2b0dd2 SHA256 02d574a75b9ca5028df2e805dc5bb08043aef1120338fe9610f6ecd1000dbd5c
+AUX ac-wrapper-6.sh 4316 RMD160 57aa77455852fe10b4f41eb29c7679b98efdb9d3 SHA1 b42bc805ea57d6ec31932c1bbfefd352a308eaac SHA256 ed6869552cb5f12f0b5c48cbdae1652644fb63e48c96269e88acec6c1c05d426
 EBUILD autoconf-wrapper-4-r3.ebuild 797 RMD160 3deec188da4487603bcdeaf91b0052a94e61ca40 SHA1 37939489ce7cd0834edf1de7b0e9e03e3bcc4e21 SHA256 3386447274e985ade38565a03eb9e610846be733d047be722fb4297a8b449027
 EBUILD autoconf-wrapper-5.ebuild 805 RMD160 d92aff474591ae552aa4c9b8a71436edf4544392 SHA1 0ddbe081b28579604600fc9053c5a8b369c2bfca SHA256 8364bf5b6c5ce628775b3a450202313cd6381dd2133cfc0bb0218e4765d1f775
-MISC ChangeLog 7226 RMD160 6450d0ee9c5e210b76edbb9e0853c44e50d782ed SHA1 c2ef23134acba804775d9a9768d6dbfb165391db SHA256 18bc7f6b48d7de79e014c82ed513d718727b9f2da0b3c8ce0983509790b0653d
+EBUILD autoconf-wrapper-6.ebuild 806 RMD160 8318c8dc4e5d772d22aca431a8d28b6b62704f87 SHA1 06b779e299bb3b8bc6711283517ddf6743b56b69 SHA256 0eaf946da2efddb74237be3934e3e13bccb93b03a14215436d89c067034c7bd0
+MISC ChangeLog 7399 RMD160 cbd2d28c0b20e7e4f063ff04f5146c955a7161d6 SHA1 2fb8864063f6ec47f2eae67d3d7240474e3d75b2 SHA256 49e0e4ce8de4eb35c33e4f86e224ef67db943f0235c4c0e0b07d7f5192f982ff
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjVNwwACgkQ67wieSYcaxdNOACgxs0yp2aA9zz8UG3aWBFnB7Kc
+6mMAoINRUu/1o9LgKQDcS79dZ7mFKjRI
+=K5tg
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-6.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-6.ebuild
new file mode 100644
index 000000000000..a0c5fd2543aa
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-6.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-6.ebuild,v 1.1 2008/09/20 17:46:46 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-6.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-6.sh
new file mode 100755
index 000000000000..cc0328bf33b6
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-6.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-6.sh,v 1.1 2008/09/20 17:46:47 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.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
+	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