Only remove libs when installing this SLOT for the first time, and warn about it #340033 by Marcin Mirosław.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

3 files changed, 25 insertions, 9 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index fddb8119b6e6..449bc09ebe33 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.359 2010/10/07 15:47:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.360 2010/10/08 18:44:37 vapier Exp $
+
+  08 Oct 2010; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8o-r2.ebuild:
+  Only remove libs when installing this SLOT for the first time, and warn
+  about it #340033 by Marcin Mirosław.
 
   07 Oct 2010; Jeroen Roovers <jer@gentoo.org> openssl-1.0.0a-r3.ebuild:
   Stable for HPPA PPC (bug #332027).
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d06a568cb139..5e41cc5bdf34 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX alphacpuid.s 1641 RMD160 d17ba2ec61e0a380e74f554ba58b9cf9c31805c8 SHA1 5fab001dbd6af763a809eff5f68e5e2430059b46 SHA256 f754956f7de5ffa07762ac4b574b29a5de016c181382c233d17ac8009b770be9
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX gentoo.config-1.0.0 4525 RMD160 0bac1cee06a6b15738cb8b28c16bd9f0522e03f5 SHA1 25ec3def3d66f1ee4b0fcf4d1d1bab0919efad64 SHA256 f06b84570356d6445c4df16f00ee18530525c1c86e8e5fa37fa3b36fa75605c4
@@ -14,9 +17,16 @@ DIST openssl-0.9.8o.tar.gz 3772542 RMD160 c2e455a17bce59c8a54522ffaa26c3a5cb26b5
 DIST openssl-1.0.0a.tar.gz 4015794 RMD160 f46ea1d0875ef523662e652f22faf0f0f261f354 SHA1 b837a9f75a51f456bd533690cf04d3d5714812dc SHA256 18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63
 DIST openssl-c_rehash.sh.1.7 4167 RMD160 c87f12c5421593d160f0cc650921c2e3412869ab SHA1 54493c80be245f2da9b7d303e49d613d376d9609 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0
 EBUILD openssl-0.9.8o-r1.ebuild 4251 RMD160 ba06206d1d8a6d0109fe2b53f05f2a363fac1d91 SHA1 325676bb3cf3f14dea68d0c6aa9d0fe304a9f39d SHA256 7a7f2332bd226b0ee7719e3fcc3683897a0536731cdef18073c8ca46b7d69cda
-EBUILD openssl-0.9.8o-r2.ebuild 4315 RMD160 76910825e57f7135edb531a079f2d40bc9fffe29 SHA1 76eb7a700cb26a45bbe60e52b7e3f1e21aaa7f79 SHA256 24cf23ebfa497fcbe703ecf86c492137043cf3148f35f845e249922319357d9b
+EBUILD openssl-0.9.8o-r2.ebuild 4334 RMD160 ad2f09f3d09551c8286840e6e576acf887479237 SHA1 5d400e4aeb4eea2940729860613ce0717ef0f86a SHA256 86f91b2390b05c7cc2efe627b9da978c048a5267adb3df75e4bd9745d99467ea
 EBUILD openssl-0.9.8o.ebuild 5355 RMD160 944bcef12c47a34a29f9d41c071e084daec2e715 SHA1 8984a9f092d75365e9506999edab77a042dbd1d9 SHA256 aafeacde45a423a2ef7a43fff95dcc22776371ca9a5dd475ebf8fdf992d96786
 EBUILD openssl-1.0.0a-r1.ebuild 5608 RMD160 73338932e4f1b8447957a9b4b58351775f2d9c7f SHA1 03cb9241ca0b452f653a0b6922dfb0c05f99ae83 SHA256 798a8e68b20b305967eeb143a0310866b43b24f6eb11fbacdea402d752168d9c
 EBUILD openssl-1.0.0a-r3.ebuild 6090 RMD160 4885b3291f53823951a9b3ae8a7c4d6e3bf5ad0a SHA1 503f9ee44196c4040bf307bdf3f5acbd9922840a SHA256 7f83d500873be2ebb1f0a6a7ce8f7cefadad7a11fc93a01ddca745c57645a4f9
-MISC ChangeLog 54177 RMD160 f841b271688c24340a3c11af6c7012980cab209a SHA1 61b792678b7427d6fb83c696ad258334ce3766a5 SHA256 96d04d0a6fbd94dc26fa9ed1f07041c2a86085f5879b582c38d26186741adb4a
+MISC ChangeLog 54371 RMD160 7d95a98c7b7fc6b8eb78ae2d301d02347a044d3b SHA1 ac40181bce2a3249c135fe9f080242c947a3def0 SHA256 9056501ff29710e54f0dffc5bc838d840479e95249c2a6a052cfd81d6f6201bc
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkyvZjIACgkQTwhj9JtAlp5ltQD/UNMbwKoIR7lerhChdkLcX9Nh
+8yjvTyXbd6qqzDfUBXUBAIa644ftVtb3gMeA18yEOOow6W9/7tjDb5sLUr5oCXiW
+=XHAQ
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8o-r2.ebuild b/dev-libs/openssl/openssl-0.9.8o-r2.ebuild
index d970c57384b5..810bb85c8197 100644
--- a/dev-libs/openssl/openssl-0.9.8o-r2.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8o-r2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild,v 1.2 2010/09/28 11:02:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild,v 1.3 2010/10/08 18:44:37 vapier Exp $
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
-EAPI=1
+EAPI="1"
+
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
@@ -26,10 +27,11 @@ DEPEND="${RDEPEND}
 	test? ( sys-devel/bc )"
 
 pkg_setup() {
-	[[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.8 ]] && \
-		rm -f "${ROOT}"/usr/$(get_libdir)/libcrypto.so.0.9.8
-	[[ -e ${ROOT}/usr/$(get_libdir)/libssl.so.0.9.8 ]] && \
-		rm -f "${ROOT}"/usr/$(get_libdir)/libssl.so.0.9.8
+	# avoid collisions with openssl-1 (preserve lib)
+	if ! has_version dev-libs/openssl:${SLOT} ; then
+		ewarn "Removing lib{crypto,ssl}.so.0.9.8 to avoid collision with openssl-1"
+		rm -f "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+	fi
 }
 
 src_unpack() {