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

Package-Manager: portage-2.1.2_rc1-r5

7 files changed, 73 insertions, 29 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/Manifest b/sys-devel/automake-wrapper/Manifest
index 96e1fe2074a6..41720b254da6 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -5,10 +5,10 @@ AUX am-wrapper-1.sh 3394 RMD160 e19271412760a770cb89c9f432d68e10568dda50 SHA1 cf
 MD5 d0c6c645c4dc1ad71a2e017dae4185be files/am-wrapper-1.sh 3394
 RMD160 e19271412760a770cb89c9f432d68e10568dda50 files/am-wrapper-1.sh 3394
 SHA256 4c918ca693e06a91380677cad1d2bbf0c6a972cee83ab00408e17c3473ca331a files/am-wrapper-1.sh 3394
-AUX am-wrapper-2.sh 3619 RMD160 3061b207b1295e29272ccd5408692bb009c135d8 SHA1 e92e6ffea59b6276bd2f4487e50737a17b7caa83 SHA256 78775190704bee7b67c2b4f28cb84ed999e3f43f23c5054e8a48a90e7d80d8b8
-MD5 421009f3057f211f8d6f817b4544bebc files/am-wrapper-2.sh 3619
-RMD160 3061b207b1295e29272ccd5408692bb009c135d8 files/am-wrapper-2.sh 3619
-SHA256 78775190704bee7b67c2b4f28cb84ed999e3f43f23c5054e8a48a90e7d80d8b8 files/am-wrapper-2.sh 3619
+AUX am-wrapper-2.sh 3905 RMD160 e2a1e6fcd90a4ffd6aada2d125128feebf42d191 SHA1 8d8d70ec8150a0b46cba410ddfec2bc632997c0e SHA256 fa7ee002449b3daa5161b287c8e5166af74b4f6f1bb89f597df6a1d78ae7aa6a
+MD5 2e83387c40a144299ce794a66c5eb22a files/am-wrapper-2.sh 3905
+RMD160 e2a1e6fcd90a4ffd6aada2d125128feebf42d191 files/am-wrapper-2.sh 3905
+SHA256 fa7ee002449b3daa5161b287c8e5166af74b4f6f1bb89f597df6a1d78ae7aa6a files/am-wrapper-2.sh 3905
 AUX am-wrapper-3.sh 4342 RMD160 fcd76fcca6209c6705a5398d99ae9011bc01e579 SHA1 3af0a2f00e09463aa3d7604ebefd0141aa693799 SHA256 b18f4938a53c8c86100f41aedb88ff43568e5a4a4329b87ffa118b66e2983e25
 MD5 6bb4aa88a0d6a8630ec50b61647a6b3a files/am-wrapper-3.sh 4342
 RMD160 fcd76fcca6209c6705a5398d99ae9011bc01e579 files/am-wrapper-3.sh 4342
@@ -17,35 +17,35 @@ EBUILD automake-wrapper-1-r1.ebuild 774 RMD160 e87bc49669ff7f3d5a3554f45e3ad1921
 MD5 b31042b0af883c9bf0a9ba4f100b6a23 automake-wrapper-1-r1.ebuild 774
 RMD160 e87bc49669ff7f3d5a3554f45e3ad1921a8778e2 automake-wrapper-1-r1.ebuild 774
 SHA256 5ce6aff80a660d47752de9e74e43ba40853a94b21f19ac57769a8e14ad546242 automake-wrapper-1-r1.ebuild 774
-EBUILD automake-wrapper-2.ebuild 786 RMD160 a8454ae350dd80390f5168d1b901db4f28c621dd SHA1 7f8d4cc1c360cc16cf065a370e83d5d8ed5fcec6 SHA256 4f7dc9b2398315c808e22cc3e2dd7430ff5622031ea69022b174d2d57ec17fae
-MD5 9a5c2e2134bb65ab9e5c960b759fb6f3 automake-wrapper-2.ebuild 786
-RMD160 a8454ae350dd80390f5168d1b901db4f28c621dd automake-wrapper-2.ebuild 786
-SHA256 4f7dc9b2398315c808e22cc3e2dd7430ff5622031ea69022b174d2d57ec17fae automake-wrapper-2.ebuild 786
+EBUILD automake-wrapper-2-r1.ebuild 789 RMD160 8a2efe9cd5cb4c24d965782213d412177d502757 SHA1 86089b0a127d188b1d6879d2b7a4896ae610cd97 SHA256 19d8509b946611b336aac238dd60655d4f7c100f0dc8efec793237ab00a4de67
+MD5 381a76df6e092b5e1919d407432ecf13 automake-wrapper-2-r1.ebuild 789
+RMD160 8a2efe9cd5cb4c24d965782213d412177d502757 automake-wrapper-2-r1.ebuild 789
+SHA256 19d8509b946611b336aac238dd60655d4f7c100f0dc8efec793237ab00a4de67 automake-wrapper-2-r1.ebuild 789
 EBUILD automake-wrapper-3-r1.ebuild 798 RMD160 a5b6c917340d5457184c01d31c7191f0923c8015 SHA1 f6c9b02b0ec978189780656c18100d0d2e6e4e4b SHA256 38c48e4c3194cbddc53637ac6c4af39c7ad8bf47779afbb293be2f4ac6bed8ce
 MD5 a9b59aa37e0371f61356d5df9266b7ac automake-wrapper-3-r1.ebuild 798
 RMD160 a5b6c917340d5457184c01d31c7191f0923c8015 automake-wrapper-3-r1.ebuild 798
 SHA256 38c48e4c3194cbddc53637ac6c4af39c7ad8bf47779afbb293be2f4ac6bed8ce automake-wrapper-3-r1.ebuild 798
-MISC ChangeLog 2306 RMD160 0a43d9e274fa38e8949a587d83615d8e16562840 SHA1 52345cbb7cfaebb95e29bb4473460d4b1b75a0e9 SHA256 7fd27116e0715983c61b30a00c0d1545394ca919823eec8b367de3a4853f3444
-MD5 826a06a1f1e0da642296576103a83d1d ChangeLog 2306
-RMD160 0a43d9e274fa38e8949a587d83615d8e16562840 ChangeLog 2306
-SHA256 7fd27116e0715983c61b30a00c0d1545394ca919823eec8b367de3a4853f3444 ChangeLog 2306
+MISC ChangeLog 2543 RMD160 7a20536c303e64aaeaae7532cf133ee204bb22c9 SHA1 2123fa9988a4400b2315b4dad775017c56728810 SHA256 f88de5c0a1d445e5f40dd79bdfc044521f9286684ff3b41b0356145f34b8552e
+MD5 5573b10151bb7adf6586b698cd842d27 ChangeLog 2543
+RMD160 7a20536c303e64aaeaae7532cf133ee204bb22c9 ChangeLog 2543
+SHA256 f88de5c0a1d445e5f40dd79bdfc044521f9286684ff3b41b0356145f34b8552e ChangeLog 2543
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-automake-wrapper-1-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-automake-wrapper-1-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-automake-wrapper-1-r1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-automake-wrapper-2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-automake-wrapper-2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-automake-wrapper-2 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-automake-wrapper-3-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-automake-wrapper-3-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-automake-wrapper-3-r1 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-1-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-automake-wrapper-1-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-automake-wrapper-1-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-2-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-automake-wrapper-2-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-automake-wrapper-2-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-3-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-automake-wrapper-3-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-automake-wrapper-3-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUEAUNQqtfCuFneMRAmDiAJ9lL4zFd7zGg92cC8YL3gngTI6ibwCfb13K
-m/FNzQSfNTcDuIBWBhiWq4k=
-=+XVj
+iD8DBQFFU8JPamhnQswr0vIRAmAVAJ4sAwdjpm8+A3wr+bJZrfkmNKDk7QCdHTdp
+UIYTQgxaYo8EgxK13Z5Jd+w=
+=N3S0
 -----END PGP SIGNATURE-----
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 @@
-