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

(Portage version: 2.1.2_rc1-r2)
 (Signed Manifest commit)

3 files changed, 18 insertions, 47 deletions

diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 06e45d5a4820..611887d46735 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -9,10 +9,10 @@ AUX am-wrapper-2.sh 3619 RMD160 3061b207b1295e29272ccd5408692bb009c135d8 SHA1 e9
 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-3.sh 4289 RMD160 f027a0450fe8d62849f85be8897a9250c5ae139c SHA1 27d087d16093dfbf6a3b95f59f0f50ded15eb6e0 SHA256 b536820c2722d2d6fb302ec2181777b7d5a4aff61e9bf20ea7ce1df4ae872e0b
-MD5 0e65d7f2d1370bb34678603ca36a867a files/am-wrapper-3.sh 4289
-RMD160 f027a0450fe8d62849f85be8897a9250c5ae139c files/am-wrapper-3.sh 4289
-SHA256 b536820c2722d2d6fb302ec2181777b7d5a4aff61e9bf20ea7ce1df4ae872e0b files/am-wrapper-3.sh 4289
+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
+SHA256 b18f4938a53c8c86100f41aedb88ff43568e5a4a4329b87ffa118b66e2983e25 files/am-wrapper-3.sh 4342
 EBUILD automake-wrapper-1-r1.ebuild 774 RMD160 e87bc49669ff7f3d5a3554f45e3ad1921a8778e2 SHA1 087d0d44cc2fbf0522112737a8a881eb87402aa4 SHA256 5ce6aff80a660d47752de9e74e43ba40853a94b21f19ac57769a8e14ad546242
 MD5 b31042b0af883c9bf0a9ba4f100b6a23 automake-wrapper-1-r1.ebuild 774
 RMD160 e87bc49669ff7f3d5a3554f45e3ad1921a8778e2 automake-wrapper-1-r1.ebuild 774
@@ -21,14 +21,14 @@ EBUILD automake-wrapper-2.ebuild 791 RMD160 cf0e86023d7fcdd6c315c035b02c577b0578
 MD5 d8bf076e2cc360fde4e598b6fd77cb28 automake-wrapper-2.ebuild 791
 RMD160 cf0e86023d7fcdd6c315c035b02c577b05784518 automake-wrapper-2.ebuild 791
 SHA256 b8ee0aa4616ca7fb3ea4bc6eeb7bbfbb6cb801f8ac35770bce0a390f76ef9a17 automake-wrapper-2.ebuild 791
-EBUILD automake-wrapper-3.ebuild 795 RMD160 2c6a0c9e58126df7956f52fbe8b5af3c4b22965b SHA1 d78e25c7d03958e5233211f202164d0cd1b16f21 SHA256 fa2d78801ea751d91415a72bc05de21d999ee302f1aaeac5587c56370429dc60
-MD5 85191346982423d1106fd67a949b9800 automake-wrapper-3.ebuild 795
-RMD160 2c6a0c9e58126df7956f52fbe8b5af3c4b22965b automake-wrapper-3.ebuild 795
-SHA256 fa2d78801ea751d91415a72bc05de21d999ee302f1aaeac5587c56370429dc60 automake-wrapper-3.ebuild 795
-MISC ChangeLog 1593 RMD160 9727990cb83a8550144a586e8999e66bf6098b3b SHA1 a8d8b8523482f24568b252d9a6c145a9bc4d7ef0 SHA256 3e391178b07bc891b0e31bdb19c27322e73bb0c0b4949edb9afe7a2a434346ec
-MD5 6f4c276eb0bf3519c97b588c6ef2c86d ChangeLog 1593
-RMD160 9727990cb83a8550144a586e8999e66bf6098b3b ChangeLog 1593
-SHA256 3e391178b07bc891b0e31bdb19c27322e73bb0c0b4949edb9afe7a2a434346ec ChangeLog 1593
+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 1806 RMD160 2bb8a5217437fcedacd8da73c6b4ab741b71f27e SHA1 a268f5ab2c84d706a099c3645c0fd3e56991e726 SHA256 51d45b0954b4ac32b98e11260f5f394e464aa9df3a0e8d40eb99fef9d4d51d4e
+MD5 f3f5810648bab977f2abf59b4f137653 ChangeLog 1806
+RMD160 2bb8a5217437fcedacd8da73c6b4ab741b71f27e ChangeLog 1806
+SHA256 51d45b0954b4ac32b98e11260f5f394e464aa9df3a0e8d40eb99fef9d4d51d4e ChangeLog 1806
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -39,13 +39,13 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-automake-wrapper-2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-automake-wrapper-2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-automake-wrapper-3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-automake-wrapper-3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-automake-wrapper-3 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)
 
-iD8DBQFFTZ90amhnQswr0vIRAsbbAJoDWyHtwY65XKitOrkufUW9Sm+CTQCdEjOj
-jhcrYQ+awY4ISXSxLUn0eas=
-=qWBn
+iD8DBQFFTbtoamhnQswr0vIRAgoJAJ9uSbpFL4OiuYTevA+7/g1RczrJDQCgiq50
+yTBUgqePmiOF0TmjXOx46ZI=
+=V5nM
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake-wrapper/automake-wrapper-3.ebuild b/sys-devel/automake-wrapper/automake-wrapper-3.ebuild
deleted file mode 100644
index db44cb4a708b..000000000000
--- a/sys-devel/automake-wrapper/automake-wrapper-3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.ebuild,v 1.1 2006/11/05 08:11:18 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/digest-automake-wrapper-3 b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sys-devel/automake-wrapper/files/digest-automake-wrapper-3
+++ /dev/null