Support new automake-1.12.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 237 insertions, 16 deletions

diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog
index 4560234109ec..617cb99cdede 100644
--- a/sys-devel/automake-wrapper/ChangeLog
+++ b/sys-devel/automake-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake-wrapper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.56 2012/02/24 22:13:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.57 2012/04/26 05:42:10 vapier Exp $
+
+*automake-wrapper-7 (26 Apr 2012)
+
+  26 Apr 2012; Mike Frysinger <vapier@gentoo.org> +automake-wrapper-7.ebuild,
+  +files/am-wrapper-7.sh:
+  Support new automake-1.12.
 
   24 Feb 2012; Mike Frysinger <vapier@gentoo.org> automake-wrapper-6.ebuild:
   Stabilize for all #404861 by Paweł Hajdan, Jr..
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index faf7c6a98037..337bb3f718e7 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -5,26 +5,28 @@ AUX am-wrapper-3.sh 4342 RMD160 fcd76fcca6209c6705a5398d99ae9011bc01e579 SHA1 3a
 AUX am-wrapper-4.sh 4354 RMD160 0dc2880dc64e639500a38ac04c0f0345eb9175ac SHA1 2da9888c74a68bb5ba6d4a2b189e04693bf4bfca SHA256 882eb17bd3b8d195143eecfbc533ddaf8bef77f719ff070de855ae337e4b7504
 AUX am-wrapper-5.sh 4130 RMD160 eab77be481f142c3d7918bd8c53162c1a1d95d23 SHA1 a66b2d390546da297b68ae8a4385e43a8554dba7 SHA256 0546150d48e71d25ed3c909982fe30bdaccc6c79382ad1989538c2b0ce7a0d77
 AUX am-wrapper-6.sh 4715 RMD160 ede6f852269975a9e5871c59811d6e4b4d74db67 SHA1 cab65b108bc72c59e43a3138193b4ce51d6af88b SHA256 6606032f25ef1253caa6ecb38ae8f196581157db1d83a6e2475001ab38c589b1
+AUX am-wrapper-7.sh 4278 RMD160 1bbe8b22b1388cd2c1a8c210620b315f2b52a48c SHA1 48a4d821c8a5762a9834e46b528cc7776e32ac5f SHA256 c607adc7c6aedf94ceb00626bc0becd770c9fa26579118729c31789f3661ef0e
 EBUILD automake-wrapper-3-r1.ebuild 785 RMD160 2cb5ca9a18addd67ea5763b7746efd7bb7356d5c SHA1 e9971e483bd29786f7ea35c994c8cbfce6a56be4 SHA256 1d198667a858c507ecb0c28f07aa27a141d70c3d1707f759d568b96363af9a57
 EBUILD automake-wrapper-4.ebuild 991 RMD160 4d02bfe5ca2bcf088905ca9c4bc647e2d0eb47f0 SHA1 b7fd47b0aa6e93e1a51b1e19a317d7b2cf3119bc SHA256 0fc2b9d42af0586fba0da45aa723da93a92159d72f29a232ef4e8457277f60fe
 EBUILD automake-wrapper-5.ebuild 1215 RMD160 839480cafc0334c3078c49fe75642feeaad6c999 SHA1 91632946bc073625fe1b826417516d3998678851 SHA256 7d277e0299fc6d30b6d0c2011a1269743bc54ada7e85a81c18df282e5132926e
 EBUILD automake-wrapper-6.ebuild 1212 RMD160 75e08e8203cdbc74207a3bce7b293a21445685eb SHA1 dc60d48e4c5a17f80f2adc4e3a808f866c765686 SHA256 d09b28fe9c616750b7a67ea8ed56ac68850bffbbae851f03e27c41c547f1a44c
-MISC ChangeLog 6812 RMD160 f483cfd2b506ac4142826cfde27a3b55c149f108 SHA1 d6da7511ccd42a870141f9e7b694f7e0d8b43a17 SHA256 93fd567ef90ae84b1491441ad86eed0b7ffcade544184da703ced2be6873d7ee
+EBUILD automake-wrapper-7.ebuild 1078 RMD160 219c9417a3b5639dd5062663744c188078abeb54 SHA1 1f0c601b592bf595f8c435b66aa7f8873c18846c SHA256 6a575b4c3fdc0e7afbb4ef733deb8ecc5f1dd8540b1bff9ebca56e0f3b25007d
+MISC ChangeLog 6981 RMD160 dd16343d1894e59b1672c4bb31e53e6cab156ded SHA1 dde5989d88c6d18ac822ec6a33049831abd81465 SHA256 b54f14d4c022188f0d4a2547a01e497674779db503d1a2bacebc933813efde92
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPSAumAAoJELEHsLL7fEFWjhcP/R9e+iSB+PB/yghLLsJSHVtt
-sdgekkbq2E40DKDwdzAt//89h2L6jVUwO9LUu5NisJq/HWT2O/vvFMGUYew9FKHH
-tZZr4qtYDVqxWrpOU/x5ueD8yXIXsUQfsTNu7JkPiZT8zU3RkSOjSrpR5z3aZWht
-jER2nQ43f9uqgrcN2Tr7zIxDaW56/l6mtS3RhiGTWOAWy7d7w0LDBSdfCTR0PILa
-dc1GiHBm/GFK8J+80URfQe8SVdeB2HABhIQq2ZNcb8Zcn/YYrNS42zz+olRB8hVm
-FseE4DRRarVcj7TxSSGYtPkQBcdthBFgWouoQV3T/jfCaMJCvZetttCzUf+xw1Ox
-TLYJBO+nP4o8dCrevqd8hNS7b09vrAEgjzYvrySfhyeq/TpENRhKaT1hd+++SAz6
-i+quFrIIhdOFyBUSOW0SAjUpFzejU+6eOsIRzV7IwmaSRo+T2w5A0tY1uCw2bYGI
-d78I/yssTHgbhARx3pDIUdYfQH8O4otYXJ6n5WpqO2QS2BmBipmpCesYNgN+FzIg
-1nwIK9iuiFKYvXXcrwGCdACr8IRZ9atNEWPWxAsFcD3f1IJHhkv4+spUvkK09I/M
-gyA6L7PBKdEbo/G/S9C06FeHukOkGcyxKHLV0k8sMMiHWcBKY/Krd55KM3fGX+W9
-+O1pbPXVSHkNXm6CG6AI
-=836y
+iQIcBAEBAgAGBQJPmOCgAAoJELEHsLL7fEFW8n8QAKkJm5/xtbCWIGSoPijuEB7O
+oDoX/xGtlI0gOF+iQYYDV5fmSURgU3wZfDJ0eg4b6e/4CjtHqK73lKYgyBssidBi
+l6DaAGipEP7wmqaQppgGXeHGxXIQ4XetpO06NALa3jgKXnkuCNmedXKngzxZ/Q/P
+BWqdl4aWj556QO1BOMbAROdJ94Zr0BRGNdSPWGNnupte4/rPV2NbUGAiIVh/WOBZ
+gcwbEmYBEXui8r2VA2TuYgLmSakjJTThUhb87Hl/KT0NlpuuGt+EJadqOZ4rkkKS
+Ib0XUpjHEZaFNoLoi7pwv6Q77S2uKuee937YBS3skW5GFrb0iql9LX4Lj4HWMTHg
++TplZl9DTNI7iPHezwLE9NG9tHFU+YU1gaRSjus3Urj7mA20/d0lWAVU07kyyWZw
+4cBUMAq9echrIOzkb872qmODu6h+Nq+/UQGHWKbywnTw5SVr/mC1FZuXN1NvLalq
+UA0ZqJBnWaPSO5BshuFuvVGzlfBdZnGR033t/Q49H/tdCsOMrEH0oYB1PWhUx8J4
+S4ifH3dab+Z1foaY6HCsbYgXdR93TIrLg+2feAYIk6uBuyDKFPkt2mD2u48r7SrI
+lYsU3qDtLkl55Xl4Gl70206St/XgKS5Mnot6O+TRtqzM9O2xpTUd2Jgrz5P7MSlr
+jCPTET0iuyyFF2lvm1kp
+=S3Zf
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake-wrapper/automake-wrapper-7.ebuild b/sys-devel/automake-wrapper/automake-wrapper-7.ebuild
new file mode 100644
index 000000000000..ca1ccc17d455
--- /dev/null
+++ b/sys-devel/automake-wrapper/automake-wrapper-7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-7.ebuild,v 1.1 2012/04/26 05:42:10 vapier Exp $
+
+DESCRIPTION="wrapper for automake to manage multiple automake 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_unpack() {
+	cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/
+	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
+	if use prefix ; then
+		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' "${S}"/am-wrapper-${PV}.sh || die
+	fi
+}
+
+src_install() {
+	newbin "${S}"/am-wrapper-${PV}.sh automake || die
+	dosym automake /usr/bin/aclocal
+
+	keepdir /usr/share/aclocal
+}
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-7.sh b/sys-devel/automake-wrapper/files/am-wrapper-7.sh
new file mode 100755
index 000000000000..dd0920f46be9
--- /dev/null
+++ b/sys-devel/automake-wrapper/files/am-wrapper-7.sh
@@ -0,0 +1,184 @@
+#!/bin/sh
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-7.sh,v 1.1 2012/04/26 05:42:10 vapier Exp $
+
+# Based on the am-wrapper.pl script provided by MandrakeSoft
+# Rewritten in bash by Gregorio Guidi
+#
+# Executes the correct automake version.
+#
+# - defaults to newest version available (hopefully automake-1.12)
+# - runs automake-1.X (where X is a valid automake version) if:
+#   - envvar WANT_AUTOMAKE is set to `1.X'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.X
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.X
+
+warn() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 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}" = "am-wrapper.sh" ] ; then
+	err "Don't call this script directly"
+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_AUTOMAKE;
+# Start with last known versions to speed up lookup process.
+#
+LAST_KNOWN_AUTOMAKE_VER="12"
+vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
+
+find_binary() {
+	local v
+	all_vers="${all_vers} $*"
+	for v in "$@" ; do
+		if [ -x "${full_argv0}-${v}" ] ; then
+			binary="${full_argv0}-${v}"
+			return 0
+		fi
+	done
+	return 1
+}
+binary=""
+all_vers=""
+if ! find_binary ${vers} ; then
+	find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
+fi
+
+if [ -z "${binary}" ] ; then
+	err "Unable to locate any usuable version of automake.\n" \
+	    "\tI tried these versions:${all_vers}\n" \
+	    "\tWith a base name of '${full_argv0}'."
+fi
+
+#
+# Check the WANT_AUTOMAKE setting.  We accept a whitespace delimited
+# list of automake versions.
+#
+if [ -n "${WANT_AUTOMAKE}" ] ; then
+	for v in ${vers} x ; do
+		if [ "${v}" = "x" ] ; then
+			warn "warning: invalid WANT_AUTOMAKE '${WANT_AUTOMAKE}'; ignoring."
+			unset WANT_AUTOMAKE
+			break
+		fi
+
+		for wx in ${WANT_AUTOMAKE} ; do
+			if [ "${wx}" = "${v}" ] ; then
+				binary="${full_argv0}-${v}"
+				v="x"
+			fi
+		done
+		[ "${v}" = "x" ] && break
+	done
+fi
+
+#
+# autodetect helpers
+#
+do_awk() {
+	local file=$1 ; shift
+	local arg=$1 ; shift
+	echo $(gawk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" ${file})
+}
+
+#
+# autodetect routine
+#
+if [ -z "${WANT_AUTOMAKE}" ] ; then
+	if [ -r "Makefile.in" ] ; then
+		confversion_mf=$(do_awk Makefile.in 2 "^# Makefile.in generated (automatically )?by automake ([0-9].[0-9]+)")
+	fi
+	if [ -r "aclocal.m4" ] ; then
+		confversion_ac=$(do_awk aclocal.m4 1 'generated automatically by aclocal ([0-9].[0-9]+)')
+		confversion_am=$(do_awk aclocal.m4 1 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?([0-9].[0-9]+)[^)]*\\]?\\)')
+	fi
+
+	for v in ${vers} ; do
+		if [ "${confversion_mf}" = "${v}" ] || \
+		   [ "${confversion_ac}" = "${v}" ] || \
+		   [ "${confversion_am}" = "${v}" ]
+		then
+			binary="${full_argv0}-${v}"
+			break
+		fi
+	done
+fi
+
+if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
+	if [ -n "${WANT_AUTOMAKE}" ] ; then
+		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
+	fi
+	warn "DEBUG: will execute <${binary}>"
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+	if [ "${binary}" = "${full_argv0}-${v}" ] ; then
+		export WANT_AUTOMAKE="${v}"
+		break
+	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 automake."
+fi
+
+exec "${binary}" "$@"
+
+err "was unable to exec ${binary} !?"