From 0504dc5efe1edca1d94bf9556a6025a2989ae628 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 26 Oct 2011 17:02:43 +0000 Subject: [PATCH] Don't use soname_version in pkg_preinst. Check for the file in ${ED} instead. Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- dev-lang/v8/ChangeLog | 6 +++++- dev-lang/v8/Manifest | 12 ++++++------ dev-lang/v8/v8-3.6.6.5.ebuild | 4 ++-- dev-lang/v8/v8-9999.ebuild | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dev-lang/v8/ChangeLog b/dev-lang/v8/ChangeLog index 132833f20900..79af4b51d3ea 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.96 2011/10/25 21:47:25 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.97 2011/10/26 17:02:43 floppym Exp $ + + 26 Oct 2011; Mike Gilbert v8-3.6.6.5.ebuild, + v8-9999.ebuild: + Don't use soname_version in pkg_preinst. Check for the file in ${ED} instead. 25 Oct 2011; Mike Gilbert v8-3.5.10.22.ebuild: Stable on amd64 wrt bug 388461. Arch tested by ago. diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest index 37e2e4636828..48501bd95319 100644 --- a/dev-lang/v8/Manifest +++ b/dev-lang/v8/Manifest @@ -10,14 +10,14 @@ DIST v8-3.6.6.5.tar.bz2 9621910 RMD160 b704bdfc7ea535210a2c8881becff6f81e0c6da3 EBUILD v8-3.4.14.28.ebuild 2072 RMD160 f53e40da494c27cab9f93f203bf8724da77c9899 SHA1 d1a0a5604c2e33ba244ad0560169906a324b1e88 SHA256 0af984740f48b5717143d6eecc61d77b7579edcf9794a15972d0a75bc5dbfb27 EBUILD v8-3.5.10.22.ebuild 2122 RMD160 3cf7bca62f6b8390f76a06babd2ca9a0e1dcf4fa SHA1 ed25053fbbd72dffe315c23a433982bdb0daa931 SHA256 d0c8b4d82d50af02b92a85bb23ecba1f3f9d653bd776d91c5ad493f78ceb68a5 EBUILD v8-3.6.6.3.ebuild 2201 RMD160 a3b3b274823ab5ea114f69b8537ae07ba293debc SHA1 b791e2241c621ffd93105b6b9e0c799fbafc0a9e SHA256 86decb1d856582a50e501bf69f47ed0185e31b24511833edcaa260163f42006c -EBUILD v8-3.6.6.5.ebuild 2781 RMD160 94a8676acd6d064ad57cea3994291a0b3d8dcda5 SHA1 4a3a513719aefb9e167d1ab51562b4372ac2ffd7 SHA256 77c9e74cf9715c2bd3a08ebcf0c21a4c9f8bc851e56b29acdbd1ef03795c03eb -EBUILD v8-9999.ebuild 2678 RMD160 859a475a319d728ef044599dac333e5d7ad740fc SHA1 07cd7de9dcd4390a748237f19b69ed2a5fe224a8 SHA256 2a63f59bdc2584bdd2a036ea22757b31d597da2c081740242b77047ed68d2a9b -MISC ChangeLog 16160 RMD160 dfa01decdde53a72bb2f32803aabeaddbbe75dfe SHA1 16fb4a96dab8f400b30af11da0d20abfeb3bf78f SHA256 409d3c6ae2626020815cf90fba0a227a0e80fe70365d0d1fbbe1c4c139c18a3d +EBUILD v8-3.6.6.5.ebuild 2770 RMD160 db2ce42000d3c3f1bc05fbbc6563bff87b6c51c3 SHA1 2d3d420af6074d0da0c494d42e427f4d130cce6a SHA256 001dcaacf10a0110bd33dce79151975f26cb5a23452c55ac3d622ff95e64abca +EBUILD v8-9999.ebuild 2667 RMD160 a67b1cd469fb745a09d4ccf58f211cfe57e5e1e3 SHA1 45d2c8487c72a6ce658402d1cf27aeffff7e548d SHA256 1184e5352924ed48f96fc50973db87c3bf6604478eed05113fc6a8f68381e636 +MISC ChangeLog 16327 RMD160 9a7ec48c00c02531961b73bcdcc73860e42549cc SHA1 c9d7ff71c5083fe42055bb344f665ac28d9f3514 SHA256 ab7325cb805f031b49e950c580470cc0179ffb3f9a69bf4398666c24af789d73 MISC metadata.xml 162 RMD160 3485b95578a49782c3188a0f963f90c688287fe1 SHA1 46226eeaf4948209a093253f92010abea501daef SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6nLnYACgkQC77qH+pIQ6RwnAEAqhSyGna/qwsGHvVYI/m/NuJO -Pn8423mtATdiRSflQk0BALeFmAtLrkGnYbR1SBJ+Zdj12m6prr3uNX8uF6EDQ2o5 -=jpSF +iF4EAREIAAYFAk6oPTwACgkQC77qH+pIQ6SBigEAt25oRriEsNwpOtS3OPHZBT7m +ejmmoz/DDNwPi/KvOakA/iF30hbs1fQX0F4X55KXaAg1AX34f+fiLTmM8XsZeYBp +=C8IL -----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 089158977c88..6ce84105905a 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.4 2011/10/25 02:07:25 floppym Exp $ +# $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 $ EAPI="3" @@ -101,7 +101,7 @@ pkg_preinst() { for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname); do baselib=${candidate##*/} - if [[ ${baselib} != libv8-${soname_version}$(get_libname) ]]; then + if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" ) fi done diff --git a/dev-lang/v8/v8-9999.ebuild b/dev-lang/v8/v8-9999.ebuild index 07d7d87d266f..ee36192c24bc 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.19 2011/10/25 02:07:25 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.20 2011/10/26 17:02:43 floppym Exp $ EAPI="3" @@ -102,7 +102,7 @@ pkg_preinst() { for candidate in "${EROOT}usr/$(get_libdir)"/libv8-*$(get_libname); do baselib=${candidate##*/} - if [[ ${baselib} != libv8-${soname_version}$(get_libname) ]]; then + if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" ) fi done -- 2.26.2