Make sure we break out of new loop as reported by Alexis Ballier.

Package-Manager: portage-2.1.2_rc1-r2

5 files changed, 60 insertions, 21 deletions

diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 59d671a93e16..79fd50613731 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -5,10 +5,10 @@ AUX ac-wrapper-3.2.sh 3242 RMD160 9fb11d8fcac9b33e9d9eda56e663e26bc8ef4b48 SHA1
 MD5 0a542dd224e861aba771526c9b75edca files/ac-wrapper-3.2.sh 3242
 RMD160 9fb11d8fcac9b33e9d9eda56e663e26bc8ef4b48 files/ac-wrapper-3.2.sh 3242
 SHA256 4fecc535d7dd0f0424e637a2e3a8f0837832a32ec517ac0912b28a428f00941e files/ac-wrapper-3.2.sh 3242
-AUX ac-wrapper-4.sh 4342 RMD160 0ca13233e73c93a1ee10edb1faab2f4078bc716e SHA1 c92aa5424332c8e8ec4bc1ef8fef07fed441806d SHA256 f1a5d8cc9ff3a8b209f329f36d01b1b738b93ab84bfab893655b764eeab391f1
-MD5 ea6c877476ae51a154ba37ba84a4043d files/ac-wrapper-4.sh 4342
-RMD160 0ca13233e73c93a1ee10edb1faab2f4078bc716e files/ac-wrapper-4.sh 4342
-SHA256 f1a5d8cc9ff3a8b209f329f36d01b1b738b93ab84bfab893655b764eeab391f1 files/ac-wrapper-4.sh 4342
+AUX ac-wrapper-4.sh 4289 RMD160 3cd45d5cdf92a8ebd16c76a792cab046a6031966 SHA1 08fe892df390ebeeca6500b967b83dd0cf911ea7 SHA256 9fa8862ac5f3734823e41d913a5a143b74d9fa0f0d1b0cffbe57f9d66cb4d72b
+MD5 e19ff4070b38712724b8894f22a966fb files/ac-wrapper-4.sh 4289
+RMD160 3cd45d5cdf92a8ebd16c76a792cab046a6031966 files/ac-wrapper-4.sh 4289
+SHA256 9fa8862ac5f3734823e41d913a5a143b74d9fa0f0d1b0cffbe57f9d66cb4d72b files/ac-wrapper-4.sh 4289
 EBUILD autoconf-wrapper-3.2-r2.ebuild 878 RMD160 85f245c96e3b93e86526f0e1ca2869e6ad044d26 SHA1 2f88e53f531c697492e93802ea4194b61a6719db SHA256 fdf95510fc62c410be1c7b34c2e25e32344c9bab74f455d8d675064b8807b205
 MD5 139ff4ec5c3af22d28e8fe32247dfd5c autoconf-wrapper-3.2-r2.ebuild 878
 RMD160 85f245c96e3b93e86526f0e1ca2869e6ad044d26 autoconf-wrapper-3.2-r2.ebuild 878
@@ -17,14 +17,14 @@ EBUILD autoconf-wrapper-3.2.ebuild 811 RMD160 ba39e87c02681c04d247298efbfb056451
 MD5 cc6b3037a9ca81c88ec00a38190e768a autoconf-wrapper-3.2.ebuild 811
 RMD160 ba39e87c02681c04d247298efbfb0564515e73d9 autoconf-wrapper-3.2.ebuild 811
 SHA256 bf6968012027f744ee0d940747baf3763bbbc94a2a59d9155c1d4d14a5dbbb11 autoconf-wrapper-3.2.ebuild 811
-EBUILD autoconf-wrapper-4.ebuild 806 RMD160 a63c278a5a7b85f7a94940b52840796aa381fa25 SHA1 17345637b3bc34161d3975469b3078514e0e1c94 SHA256 dbb9b528a95cf07d40f0a1ea7c06619cacf9dbb009974ae70fe29095a78da155
-MD5 a7bbc74d35e75b6ac0523f47f0087d99 autoconf-wrapper-4.ebuild 806
-RMD160 a63c278a5a7b85f7a94940b52840796aa381fa25 autoconf-wrapper-4.ebuild 806
-SHA256 dbb9b528a95cf07d40f0a1ea7c06619cacf9dbb009974ae70fe29095a78da155 autoconf-wrapper-4.ebuild 806
-MISC ChangeLog 5224 RMD160 ad786789a49a12965b5d3a97866a403c2fcf3aca SHA1 ecb442876c1874621270d6e17c124e6434749334 SHA256 cdcd2631a7fa5ea4ffb6924a107913d54036b3b7881383b6385ceb01e88393b4
-MD5 0b7d27efe3374cbf39f1f238a5a84817 ChangeLog 5224
-RMD160 ad786789a49a12965b5d3a97866a403c2fcf3aca ChangeLog 5224
-SHA256 cdcd2631a7fa5ea4ffb6924a107913d54036b3b7881383b6385ceb01e88393b4 ChangeLog 5224
+EBUILD autoconf-wrapper-4-r1.ebuild 809 RMD160 ef835900b3d05e7d2ca205f8d555a6f3c00a86de SHA1 9c653eac01e5280ff1a2359095131ce585f6b4f6 SHA256 10125d7746241e95238b4f8fa9cb867185b4d7fb0d39942fbb997ddd826a46f2
+MD5 fd9cc570f310b34a10572f7e1dfb1f58 autoconf-wrapper-4-r1.ebuild 809
+RMD160 ef835900b3d05e7d2ca205f8d555a6f3c00a86de autoconf-wrapper-4-r1.ebuild 809
+SHA256 10125d7746241e95238b4f8fa9cb867185b4d7fb0d39942fbb997ddd826a46f2 autoconf-wrapper-4-r1.ebuild 809
+MISC ChangeLog 5431 RMD160 5cb9123746b0188e7cff90f45b3749123a00b4bd SHA1 e449813997d411d69d5ba54283beac5ed238e5ea SHA256 fd172ed3ce2afffa1f5ad7df543f7f33fa0bfbf831d650f346a619d0a9d7e0bd
+MD5 6cefcc67eaa567d9afba23301121d83d ChangeLog 5431
+RMD160 5cb9123746b0188e7cff90f45b3749123a00b4bd ChangeLog 5431
+SHA256 fd172ed3ce2afffa1f5ad7df543f7f33fa0bfbf831d650f346a619d0a9d7e0bd ChangeLog 5431
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -35,13 +35,13 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-3.2-r2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-autoconf-wrapper-3.2-r2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-autoconf-wrapper-3.2-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-4 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-autoconf-wrapper-4 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-autoconf-wrapper-4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-4-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-autoconf-wrapper-4-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-autoconf-wrapper-4-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTaSZamhnQswr0vIRAgyBAKC6ydqiy7RphCxR68hkltaYQoyRzwCfdBo+
-4UI9eCFKsVY2lS8qd4wLUnM=
-=9ZAO
+iD8DBQFFTbwFamhnQswr0vIRAkG9AJ9QKD3iu0VMrs/OA/XWX5+dfLixHwCgpe/s
+7MBN8Jvg6UsmSNycX5ke8uU=
+=yvnF
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog
index fd22773fb23b..bdb3bc7fe297 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.17 2006/11/05 08:11:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.18 2006/11/05 10:22:00 vapier Exp $
+
+*automake-wrapper-3-r1 (05 Nov 2006)
+
+  05 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/am-wrapper-3.sh,
+  +automake-wrapper-3-r1.ebuild:
+  Make sure we break out of new loop as reported by Alexis Ballier.
 
 *automake-wrapper-3 (05 Nov 2006)
 
diff --git a/sys-devel/automake-wrapper/automake-wrapper-3-r1.ebuild b/sys-devel/automake-wrapper/automake-wrapper-3-r1.ebuild
new file mode 100644
index 000000000000..3bc808748a07
--- /dev/null
+++ b/sys-devel/automake-wrapper/automake-wrapper-3-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-3-r1.ebuild,v 1.1 2006/11/05 10:22:00 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-3.sh b/sys-devel/automake-wrapper/files/am-wrapper-3.sh
index ff8cde7b22c5..5596468e64ea 100755
--- a/sys-devel/automake-wrapper/files/am-wrapper-3.sh
+++ b/sys-devel/automake-wrapper/files/am-wrapper-3.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-3.sh,v 1.2 2006/11/05 08:22:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-3.sh,v 1.3 2006/11/05 10:22:00 vapier Exp $
 
 # Based on the am-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -88,12 +88,16 @@ if [ -n "${WANT_AUTOMAKE}" ] ; then
 			if [ "${wx}" = "${v}" ] ; then
 				binary="binary_${v/./_}"
 				binary="${!binary}"
-				break
+				v="x"
 			fi
 		done
+		[ "${v}" = "x" ] && break
 	done
 fi
 
+#
+# autodetect helpers
+#
 do_awk() {
 	local file=$1 ; shift
 	local arg=$1 ; shift
diff --git a/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1 b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1