Consolidate loops in pkg_preinst.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 18 insertions, 23 deletions

diff --git a/dev-lang/v8/ChangeLog b/dev-lang/v8/ChangeLog
index 61baa10140bc..bbb6e1ba6a66 100644
--- a/dev-lang/v8/ChangeLog
+++ b/dev-lang/v8/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/v8
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.113 2011/11/23 22:28:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.114 2011/11/23 22:47:56 floppym Exp $
+
+  23 Nov 2011; Mike Gilbert <floppym@gentoo.org> v8-3.7.7.ebuild,
+  v8-9999.ebuild:
+  Consolidate loops in pkg_preinst.
 
   23 Nov 2011; Mike Gilbert <floppym@gentoo.org> v8-3.7.7.ebuild,
   v8-9999.ebuild:
diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest
index 25a0bf2a7022..4c960514a5d1 100644
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@@ -12,14 +12,15 @@ EBUILD v8-3.5.10.24.ebuild 2124 RMD160 a95ebbe814c6aac48417133926c14b16c18056fe
 EBUILD v8-3.6.6.5.ebuild 3271 RMD160 8c4d62f5f9bb1edfe5fa5023fa82bd8b20d78dab SHA1 df848b52a29d744473d32571dd4032bbf500645b SHA256 99a7b84234a1e5f98475334956601745e683659d5943e6219104f2ff48219eae
 EBUILD v8-3.6.6.6.ebuild 3271 RMD160 717fdc451e34be674f7d5b57f32faa0e79fd3876 SHA1 41bef0bef5ce44f5f991879e924b5ef40ae9dcc9 SHA256 2e5510081f17330ae7630c9728f32e3bd07537b171f07a974ef9713cc2d264c9
 EBUILD v8-3.7.6.ebuild 3155 RMD160 158713da2d54c910e2fe8f547758685669748e1c SHA1 32db399f78f7d665955419ebaa6799a5a0bf54be SHA256 0b4a5a441393bb2496181d8532fa9aaab96911b73bde33f434fb8dfe2da401bf
-EBUILD v8-3.7.7.ebuild 3046 RMD160 48d2b9b35ad676caf94f64ca78cdd69d59f0ef97 SHA1 cdd7a32bdf724f95aad79ed0917bbad25e3fdf2b SHA256 feb5a67119d48c15a7890ff18f762b36e79520a0694f22fa2629223dbed221b7
-EBUILD v8-9999.ebuild 3099 RMD160 15561e634b3553fe970aea647be06959b7cb0b49 SHA1 a0d7528433c9e93862b9e44735467f5aaffa1cb0 SHA256 612d4f022508528cbd9ccb6b8c458171696b5d92e4612c6fe93df364a723ecc1
-MISC ChangeLog 18679 RMD160 dadc5809da3ef73e0b8029c396a58a29e351bc59 SHA1 1d0081d2a6e3c216a836fff2be27c29cb6b3da70 SHA256 7dc24459900bd7b0c77778d1b931c7dde0a0d9692aebab3aa0e11e6a38c6bcf0
+EBUILD v8-3.7.7.ebuild 2867 RMD160 c12c669636aa60d27fd0a6d5ba31f35f9688ce08 SHA1 966b43f992c824296031a87331c9f7a5cf0cd232 SHA256 2853f32637991f83203b075961104be98915db21e31949dcdc1675620c91abb3
+EBUILD v8-9999.ebuild 2920 RMD160 e7949f1c910a17e05b0865fb9c90d3049c2f5dd8 SHA1 c98db14af34c9693cde021e8217dfed206a05d78 SHA256 ed372e5467a0292554e7d04770fd4edfa9758ce672c998f95c7b6cd14d4913e6
+MISC ChangeLog 18800 RMD160 ac03106ad8fa2a1c2c23d327cc4805f796f7878b SHA1 c1fced307f388ec85b8f7b7b852da4ecfeb91d79 SHA256 2d869a7ec12030213c08accd5f8f51b7338e64242f81e40fcdb08a99980b7557
 MISC metadata.xml 162 RMD160 3485b95578a49782c3188a0f963f90c688287fe1 SHA1 46226eeaf4948209a093253f92010abea501daef SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8
+MISC v8-9999.ebuild.orig 3099 RMD160 15561e634b3553fe970aea647be06959b7cb0b49 SHA1 a0d7528433c9e93862b9e44735467f5aaffa1cb0 SHA256 612d4f022508528cbd9ccb6b8c458171696b5d92e4612c6fe93df364a723ecc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7Nc58ACgkQC77qH+pIQ6QuWAEAulYONAamhTZf5e2IoMw+i2mO
-Rw531mM2uejQBhqP0tQBAJi6s6bftShcTV1lSWGrN3dNTK22Kh7UoQbWzaE4JIKl
-=jiMN
+iF4EAREIAAYFAk7NeCIACgkQC77qH+pIQ6Qo+QEAkqzpHXHOAvZ8ejrjouafy+Z1
+fO52f9I5WcuLftPSbE0A/0kKsNOpDAz48j0LXx23IBD5Eq75932nf/2q+dd5FgSz
+=LegC
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/v8/v8-3.7.7.ebuild b/dev-lang/v8/v8-3.7.7.ebuild
index 76610de78300..ac4cb6a406d7 100644
--- a/dev-lang/v8/v8-3.7.7.ebuild
+++ b/dev-lang/v8/v8-3.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.7.7.ebuild,v 1.4 2011/11/23 22:28:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.7.7.ebuild,v 1.5 2011/11/23 22:47:56 floppym Exp $
 
 EAPI="4"
 
@@ -98,13 +98,8 @@ pkg_preinst() {
 
 	eshopts_push -s nullglob
 
-	for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname); do
-		baselib=${candidate##*/}
-		if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
-			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
-		fi
-	done
-	for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
+	for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname) \
+		"${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
 		baselib=${candidate##*/}
 		if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
 			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
diff --git a/dev-lang/v8/v8-9999.ebuild b/dev-lang/v8/v8-9999.ebuild
index 6e9bfb5b8c02..4286088c2372 100644
--- a/dev-lang/v8/v8-9999.ebuild
+++ b/dev-lang/v8/v8-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.23 2011/11/23 22:28:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.24 2011/11/23 22:47:56 floppym Exp $
 
 EAPI="4"
 
@@ -105,13 +105,8 @@ pkg_preinst() {
 
 	eshopts_push -s nullglob
 
-	for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname); do
-		baselib=${candidate##*/}
-		if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
-			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
-		fi
-	done
-	for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
+	for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname) \
+		"${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
 		baselib=${candidate##*/}
 		if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
 			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )