Create a real new version rather than mucking with the FILESDIR.

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

4 files changed, 201 insertions, 6 deletions

diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog
index 04335f22496c..6e6f7e8448fd 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.34 2009/05/17 13:01:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.35 2009/05/17 21:36:03 vapier Exp $
+
+*automake-wrapper-4 (17 May 2009)
+
+  17 May 2009; Mike Frysinger <vapier@gentoo.org>
+  +automake-wrapper-4.ebuild, +files/am-wrapper-4.sh:
+  Create a real new version rather than mucking with the FILESDIR.
 
 *automake-wrapper-3-r2 (17 May 2009)
 
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 596df67aa9b0..1948037d34a3 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX am-wrapper-3.sh 4342 RMD160 fcd76fcca6209c6705a5398d99ae9011bc01e579 SHA1 3af0a2f00e09463aa3d7604ebefd0141aa693799 SHA256 b18f4938a53c8c86100f41aedb88ff43568e5a4a4329b87ffa118b66e2983e25
+AUX am-wrapper-4.sh 4347 RMD160 90dc5189338514c00627794e24ae819676f0b4ba SHA1 3cae9921af6f9713cc30e45d61a7e17d4b37c6e3 SHA256 b2b6b3988f9bff50db5029dca5c21c0d6a9c9b95cd2ab1406994a20d92de818c
 EBUILD automake-wrapper-3-r1.ebuild 786 RMD160 1d2e30563262ded5b30f703b868e425b1ae02c05 SHA1 d6af8b8f1348247efa569bae5134195758b2f556 SHA256 5f97f5291690397f90b3149d683eb04240bd6ca3da2833f63993e4a76ece366d
-EBUILD automake-wrapper-3-r2.ebuild 893 RMD160 59c50e16ec51e3bde23c36625470378e7d0ee4ac SHA1 aab170296fc7d74dfcc0207d74fad332573e901d SHA256 6d6c45d3af9ce77229d6e57ea46f6a245b8d8c47ee888f4b82115ff70516956b
-MISC ChangeLog 3859 RMD160 246ff6524397ac0cb84163044b22ab18b62bcae8 SHA1 5da2f69e0fa2543ad421999ecf2718bd20889249 SHA256 3c7c9ec30bb21d77061277a6c926cba0df33ba512d3e7eb278dbcb87ff4a8405
+EBUILD automake-wrapper-4.ebuild 795 RMD160 86fd29d2474b052587e617245f597447245db53d SHA1 d74bdca4e9ec2f473d5f92c1aa5a1f667b03a75a SHA256 26039be6c281c38c61b5442e41b8224350b2ae0664331120c51801634ec3272e
+MISC ChangeLog 4063 RMD160 6ab2dc3c5ca6719b81a7b584c19fa4f04ce615ca SHA1 f9b404a4330985ccd8abdeb817c70fdf2425411d SHA256 72b1fdc98cf5f58d67c5cd7c9414352ca0e5837f1dca26bc8411531968e818ed
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoQCrwACgkQAiZjviIA2XjFzACgp0vmx8R/UL/yVSy2yOaECrqr
-RHMAoKKmiVbtSDCvmG5fxxisW1WY/A2g
-=yqQj
+iEYEARECAAYFAkoQg0kACgkQn/5bYzqsSmGRpACcCkkRKzFduAo2h4WOPVzKenYO
+V9IAoL/NEpIOrR8Q87psqUDeQYUkG9CJ
+=ZcLt
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake-wrapper/automake-wrapper-4.ebuild b/sys-devel/automake-wrapper/automake-wrapper-4.ebuild
new file mode 100644
index 000000000000..269b4934a03c
--- /dev/null
+++ b/sys-devel/automake-wrapper/automake-wrapper-4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-4.ebuild,v 1.1 2009/05/17 21:36:03 vapier Exp $
+
+inherit multilib
+
+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 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	newexe "${FILESDIR}"/am-wrapper-${PV}.sh am-wrapper.sh || die
+
+	keepdir /usr/share/aclocal
+
+	dodir /usr/bin
+	local x=
+	for x in aclocal automake ; do
+		dosym ../$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x}
+	done
+}
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-4.sh b/sys-devel/automake-wrapper/files/am-wrapper-4.sh
new file mode 100755
index 000000000000..b2adc427ea92
--- /dev/null
+++ b/sys-devel/automake-wrapper/files/am-wrapper-4.sh
@@ -0,0 +1,159 @@
+#!/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/automake-wrapper/files/am-wrapper-4.sh,v 1.1 2009/05/17 21:36:04 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.10)
+# - runs automake-1.9 if:
+#   - envvar WANT_AUTOMAKE is set to `1.9'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.9
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.9
+# - runs automake-1.8 if:
+#   - envvar WANT_AUTOMAKE is set to `1.8'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.8
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8
+# - runs automake-1.7 if:
+#   - envvar WANT_AUTOMAKE is set to `1.7'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.7
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.7
+# - runs automake-1.6 if:
+#   - envvar WANT_AUTOMAKE is set to `1.6'
+#     -or-
+#   - `Makefile.in'
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.6
+# - runs automake-1.5 if:
+#   - envvar WANT_AUTOMAKE is set to `1.5'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.5
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.5
+# - runs automake-1.4 if:
+#   - envvar WANT_AUTOMAKE is set to `1.4'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.4
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.4
+
+if [ "${0##*/}" = "am-wrapper.sh" ] ; then
+	echo "Don't call this script directly." >&2
+	exit 1
+fi
+
+vers="1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4"
+
+#
+# Export the proper variable/versions and try to locate a usuable
+# default (newer versions are preferred)
+#
+binary=""
+for v in ${vers} ; do
+	eval binary_${v/./_}="${0}-${v}"
+
+	if [ -z "${binary}" ] && [ -x "${0}-${v}" ] ; then
+		binary="${0}-${v}"
+	fi
+done
+if [ -z "${binary}" ] ; then
+	echo "am-wrapper: Unable to locate any usuable version of automake." >&2
+	echo "            I tried these versions: ${vers}" >&2
+	echo "            With a base name of '${0}'." >&2
+	exit 1
+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
+			echo "am-wrapper: warning: invalid WANT_AUTOMAKE '${WANT_AUTOMAKE}'; ignoring." >&2
+			unset WANT_AUTOMAKE
+			break
+		fi
+
+		for wx in ${WANT_AUTOMAKE} ; do
+			if [ "${wx}" = "${v}" ] ; then
+				binary="binary_${v/./_}"
+				binary="${!binary}"
+				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="binary_${v/./_}"
+			binary="${!binary}"
+			break
+		fi
+	done
+fi
+
+if [ "${WANT_AMWRAPPER_DEBUG}" ] ; then
+	if [ "${WANT_AUTOMAKE}" ] ; then
+		echo "am-wrapper: DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}" >&2
+	fi
+	echo "am-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+	mybin="binary_${v/./_}"
+	if [ "${binary}" = "${!mybin}" ] ; then
+		export WANT_AUTOMAKE="${v}"
+	fi
+done
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${binary}" ] ; then
+	echo "am-wrapper: $binary is missing or not executable." >&2
+	echo "            Please try emerging the correct version of automake." >&2
+	exit 1
+fi
+
+exec "$binary" "$@"
+
+echo "am-wrapper: was unable to exec $binary !?" >&2
+exit 1