Backport some tweaks to select best available version when running outside of portage.

(Portage version: 2.1.2_rc1-r5)

6 files changed, 49 insertions, 5 deletions

diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog
index c0b3a09adf32..b6255eda2a79 100644
--- a/sys-devel/automake-wrapper/ChangeLog
+++ b/sys-devel/automake-wrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/automake-wrapper
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.22 2006/11/07 08:12:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.23 2006/11/10 00:04:41 vapier Exp $
+
+*automake-wrapper-2-r1 (10 Nov 2006)
+
+  10 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/am-wrapper-2.sh,
+  +automake-wrapper-2-r1.ebuild:
+  Backport some tweaks to select best available version when running outside
+  of portage.
 
   07 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
   automake-wrapper-2.ebuild:
diff --git a/sys-devel/automake-wrapper/automake-wrapper-2-r1.ebuild b/sys-devel/automake-wrapper/automake-wrapper-2-r1.ebuild
new file mode 100644
index 000000000000..4bcfb3260f3c
--- /dev/null
+++ b/sys-devel/automake-wrapper/automake-wrapper-2-r1.ebuild
@@ -0,0 +1,29 @@
+# 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/automake-wrapper-2-r1.ebuild,v 1.1 2006/11/10 00:04:41 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 ~sparc-fbsd x86 ~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-2.sh b/sys-devel/automake-wrapper/files/am-wrapper-2.sh
index e3d84a884283..84c99e30d6a2 100755
--- a/sys-devel/automake-wrapper/files/am-wrapper-2.sh
+++ b/sys-devel/automake-wrapper/files/am-wrapper-2.sh
@@ -1,7 +1,7 @@
 #!/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-2.sh,v 1.1 2006/10/16 01:38:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-2.sh,v 1.2 2006/11/10 00:04:41 vapier Exp $
 
 # Based on the am-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -53,10 +53,20 @@ fi
 
 vers="1.10 1.9 1.8 1.7 1.6 1.5 1.4"
 
+binary=""
 for v in ${vers} ; do
 	eval binary_${v/./_}="${0}-${v}"
+
+	if [ -z "${binary}" ] && [ -x "${0}-${v}" ] ; then
+		binary="${0}-${v}"
+	fi
 done
-binary="${binary_1_10}"
+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
diff --git a/sys-devel/automake-wrapper/files/digest-automake-wrapper-1-r1 b/sys-devel/automake-wrapper/files/digest-automake-wrapper-1-r1
index 8b137891791f..e69de29bb2d1 100644
--- a/sys-devel/automake-wrapper/files/digest-automake-wrapper-1-r1
+++ b/sys-devel/automake-wrapper/files/digest-automake-wrapper-1-r1
@@ -1 +0,0 @@
-
diff --git a/sys-devel/automake-wrapper/files/digest-automake-wrapper-2-r1 b/sys-devel/automake-wrapper/files/digest-automake-wrapper-2-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/automake-wrapper/files/digest-automake-wrapper-2-r1
diff --git a/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1 b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1
index 8b137891791f..e69de29bb2d1 100644
--- a/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1
+++ b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1
@@ -1 +0,0 @@
-