Fix live ebuild after upstream changed library naming scheme.

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 38 insertions, 16 deletions

diff --git a/dev-lang/v8/ChangeLog b/dev-lang/v8/ChangeLog
index 79013a6849a8..9bcd876929f5 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.102 2011/11/11 11:56:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.103 2011/11/14 12:45:41 phajdan.jr Exp $
+
+  14 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> v8-3.6.6.5.ebuild,
+  v8-3.6.6.6.ebuild, v8-9999.ebuild:
+  Fix live ebuild after upstream changed library naming scheme.
 
   11 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> v8-3.5.10.23.ebuild:
   x86 stable wrt security bug #390113
diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest
index 7976ffde33ff..b60e64b361cb 100644
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@@ -9,15 +9,15 @@ DIST v8-3.6.6.5.tar.bz2 9621910 RMD160 b704bdfc7ea535210a2c8881becff6f81e0c6da3
 DIST v8-3.6.6.6.tar.bz2 9619754 RMD160 8d8af502c4b90a534e302850349cc62c64e330b1 SHA1 25b65a7246731b5f91db3a0a8a0c6bd377b1fff5 SHA256 f51de4710c547373df546810e8d51c60cc90dd07881bf575191ade065964d6d6
 EBUILD v8-3.5.10.22.ebuild 2124 RMD160 37e42b52041f7fcfffcb77941b10ec5fd05503f1 SHA1 751f9c70e332caa0ae28d3ff72ee0bf381464e01 SHA256 62217a76fd6a17a69f5b0f1b463e5341db4d4239dcd92749b67c92e6816bc8a2
 EBUILD v8-3.5.10.23.ebuild 2124 RMD160 40ffc297ad9fe4c8201c4b4c6a7a3919b6ab11bc SHA1 bbd153a898cd54c6a9a9291c72af2cf57978ec55 SHA256 acf869da004387afd0cb2cc71bae8943304efe793288314c5720e14a56417dca
-EBUILD v8-3.6.6.5.ebuild 2770 RMD160 db2ce42000d3c3f1bc05fbbc6563bff87b6c51c3 SHA1 2d3d420af6074d0da0c494d42e427f4d130cce6a SHA256 001dcaacf10a0110bd33dce79151975f26cb5a23452c55ac3d622ff95e64abca
-EBUILD v8-3.6.6.6.ebuild 2770 RMD160 f3091657d1d2bf05e2a7ef1ceacee72b073dd1d1 SHA1 11294dbd2c4fed022006c3025457ab115ce042c4 SHA256 00f9796c9cf150e7e9fb039f4a5adb3d8fce4ed70de4d08ce02ac9bc9b49211c
-EBUILD v8-9999.ebuild 2667 RMD160 a67b1cd469fb745a09d4ccf58f211cfe57e5e1e3 SHA1 45d2c8487c72a6ce658402d1cf27aeffff7e548d SHA256 1184e5352924ed48f96fc50973db87c3bf6604478eed05113fc6a8f68381e636
-MISC ChangeLog 17036 RMD160 1f045a4416ec51f34d50acf225dc6df7760b50a5 SHA1 f15b7ca47ed1293955c999d3eba33ec57b47312e SHA256 076fcea94bbf2cac9b1acd1614725602a2dfe8e4c5353ffb82b044c0f5d44124
+EBUILD v8-3.6.6.5.ebuild 3006 RMD160 cad73e3c25517edfd06904b1c5bd0cd60deb97a8 SHA1 7fca92af0176b962843ba60b83a39af38a1fd4c2 SHA256 f89583a91b8de49844601d7ae03d38986cf538efbeb893451bd47857c9803ec9
+EBUILD v8-3.6.6.6.ebuild 3006 RMD160 ee5cf12d356481e76ce86b79080d291bf72a730f SHA1 9253f33abfbd3b4f3f38339806da5e7fef126a86 SHA256 074b3a3f0e2266bdda3958b1920d4960a4f9d6aba9a02150d2d961f1fc279f28
+EBUILD v8-9999.ebuild 2903 RMD160 88eafc135090437082918d14ec88f72e029f6a97 SHA1 52bb54a4a817bc7e1de87b95af563649553b7ea9 SHA256 9b651af4990499b18babdb6277f5744509ff3e3c0b66a9b181d0acf7efdb4bf5
+MISC ChangeLog 17212 RMD160 74a6d7e1fd47c0e551ef2c47aab1fc634da42f07 SHA1 f7b5a5e8c82367d7e6a88e1c2b32e84e1fe45d22 SHA256 9b06311d7b408ab3b7fb3145862ae8ca06cde5500314ad27725292db71f5e4af
 MISC metadata.xml 162 RMD160 3485b95578a49782c3188a0f963f90c688287fe1 SHA1 46226eeaf4948209a093253f92010abea501daef SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk69DWUACgkQuUQtlDBCeQJquwCfeD6BATkjwNdfQUB69XkhIDXs
-zSAAnieB45Vih8RZMrYvm6vKSxvxI3+t
-=lmLu
+iEYEAREKAAYFAk7BDX0ACgkQuUQtlDBCeQIlQgCfeYm9jQUi5OjsEaCNFFbbfHkh
+/nIAn3LO4Uu2IvvLxWDWYnVObnXNPtIn
+=C7SN
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/v8/v8-3.6.6.5.ebuild b/dev-lang/v8/v8-3.6.6.5.ebuild
index 6ce84105905a..65e02d655a00 100644
--- a/dev-lang/v8/v8-3.6.6.5.ebuild
+++ b/dev-lang/v8/v8-3.6.6.5.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.6.6.5.ebuild,v 1.5 2011/10/26 17:02:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.6.6.5.ebuild,v 1.6 2011/11/14 12:45:41 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -105,6 +105,12 @@ pkg_preinst() {
 			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
 		fi
 	done
+	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
 
 	eshopts_pop
 
diff --git a/dev-lang/v8/v8-3.6.6.6.ebuild b/dev-lang/v8/v8-3.6.6.6.ebuild
index 200d8d26ed9c..7e7aa0ec1553 100644
--- a/dev-lang/v8/v8-3.6.6.6.ebuild
+++ b/dev-lang/v8/v8-3.6.6.6.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.6.6.6.ebuild,v 1.1 2011/11/02 02:33:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.6.6.6.ebuild,v 1.2 2011/11/14 12:45:41 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -105,6 +105,12 @@ pkg_preinst() {
 			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
 		fi
 	done
+	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
 
 	eshopts_pop
 
diff --git a/dev-lang/v8/v8-9999.ebuild b/dev-lang/v8/v8-9999.ebuild
index ee36192c24bc..003a5a0dce38 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.20 2011/10/26 17:02:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.21 2011/11/14 12:45:41 phajdan.jr Exp $
 
 EAPI="3"
 
@@ -48,7 +48,7 @@ src_compile() {
 
 	if [[ ${PV} == "9999" ]]; then
 		subversion_wc_info
-		soname_version="${PV}-${ESVN_WC_REVISION}"
+		soname_version="${PV}.${ESVN_WC_REVISION}"
 	else
 		soname_version="${PV}"
 	fi
@@ -84,12 +84,12 @@ src_install() {
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libv8-${soname_version}$(get_libname) \
-			out/${mytarget}/lib.target/libv8-${soname_version}$(get_libname) || die
+			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname).${soname_version} \
+			out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
 	fi
 
-	dolib out/${mytarget}/lib.target/libv8-${soname_version}$(get_libname) || die
-	dosym libv8-${soname_version}$(get_libname) /usr/$(get_libdir)/libv8$(get_libname) || die
+	dolib out/${mytarget}/lib.target/libv8$(get_libname).${soname_version} || die
+	dosym libv8$(get_libname).${soname_version} /usr/$(get_libdir)/libv8$(get_libname) || die
 
 	dodoc AUTHORS ChangeLog || die
 }
@@ -106,6 +106,12 @@ pkg_preinst() {
 			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
 		fi
 	done
+	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
 
 	eshopts_pop