Avoid preserve_old_lib when we have the old SLOT #328355.

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

3 files changed, 21 insertions, 16 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 5db70cc9577f..27fa9dc834bc 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
 # 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.339 2010/07/17 10:02:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.340 2010/07/18 19:39:21 vapier Exp $
+
+  18 Jul 2010; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0a.ebuild:
+  Avoid preserve_old_lib when we have the old SLOT #328355.
 
 *openssl-0.9.8o-r1 (17 Jul 2010)
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index ccc2231c30fa..d59b625a6c82 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,19 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX openssl-0.9.7e-gentoo.patch 460 RMD160 60969fd05a15fe00d0d1c27b9098acfde28ba65e SHA1 73ff3c336dfdbeed903ac7b82486674ab4ec66a2 SHA256 ddb8d47429f3aadf3f5142293a2c38cbb9eb3927edfd1b497771337c48a11641
-AUX openssl-0.9.8b-doc-updates.patch 9104 RMD160 c250a9117439449f7f7849f8f414725e1acaac47 SHA1 c328e7c06b5501205faef93c55f8b7ed8cc7dd53 SHA256 77ba2167f4f69a3be040d3214214c3529b55d9404e87bc7cb3135861f43bfb3f
 AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f2e993949b SHA1 d07542663f934d5dc2f8f8b8985bde9b033aafdb SHA256 8a79f022a17a7fadb4eb708538b41a7a034e21ad84162beb1f7fa7cff5eb487e
 AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805
-AUX openssl-0.9.8j-parallel-build.patch 715 RMD160 c20d37606fa0e32e1381a166d5a28b8a40d7db8c SHA1 9386fdfd52975c841b9d40cebb18d859b258f2ab SHA256 92a3e00a358cecc3cc79ce0dd99f6f7af4776e05d99a9b948d0c18a683fbc5b2
 AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
 AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
-DIST openssl-0.9.8n.tar.gz 3770041 RMD160 8eb5e877c2bab203e8eb108e42d60580a478f718 SHA1 595f5ebf592568515964f0adc62239e7012ef08b SHA256 b01abc28376b866515df58f1b004da8453166291783d4e7477cda89b000c1f01
 DIST openssl-0.9.8o.tar.gz 3772542 RMD160 c2e455a17bce59c8a54522ffaa26c3a5cb26b510 SHA1 80c73afc7dca790cd26936cb392a4dfd14d4e4d7 SHA256 befada1ac3819b1d317df8197b5e82ec768b39d250fcbef81e2b1cb7f165d448
-DIST openssl-1.0.0.tar.gz 4010166 RMD160 e9d8f52540a1ddae565e5d2bea966b819d7de818 SHA1 3f800ea9fa3da1c0f576d689be7dca3d55a4cb62 SHA256 1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca
 DIST openssl-1.0.0a.tar.gz 4015794 RMD160 f46ea1d0875ef523662e652f22faf0f0f261f354 SHA1 b837a9f75a51f456bd533690cf04d3d5714812dc SHA256 18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63
-EBUILD openssl-0.9.8n.ebuild 5408 RMD160 b88cb4eac096be1d6ada2c4d88cce90f249045f1 SHA1 09f79cbbd20e8b41d3136653f3f7a44bb900bb72 SHA256 99c1989f8468020ce62ae9d0a2f37dc5039cfbda7f47841eab3fa394597cb326
 EBUILD openssl-0.9.8o-r1.ebuild 4162 RMD160 e0c25ab6132cc2d25072bacadb84d7a74b4e9086 SHA1 5e4af142f024e0f5d72fd6ecb601000184ab9cea SHA256 18521e844b70619dfa84a22f42bfe087aa11006e21d4d7855af637e4ea4bccd7
 EBUILD openssl-0.9.8o.ebuild 5355 RMD160 944bcef12c47a34a29f9d41c071e084daec2e715 SHA1 8984a9f092d75365e9506999edab77a042dbd1d9 SHA256 aafeacde45a423a2ef7a43fff95dcc22776371ca9a5dd475ebf8fdf992d96786
-EBUILD openssl-1.0.0.ebuild 5337 RMD160 1a6ed954059ee75be6062bbd66a13ea1c5f42acd SHA1 77268de251c5e217df66747f35e26930d5448db4 SHA256 823bf15841acd6a0b78f4246b07fc4b125744c132342dab7bcf8effef19de72e
-EBUILD openssl-1.0.0a.ebuild 5439 RMD160 ac0db5fd27a1f08792283a74887d48ef1ca265eb SHA1 a67f94a1ac85140949b9850a1d98c0d8d4ae074b SHA256 afb81f6236fe1d90bd0e42fc778365c9dc535ae883416a2149b5496f1b1b1ce5
-MISC ChangeLog 50485 RMD160 d9bc86112ddd6cb20200386adc94ac65a21d1f0f SHA1 7771e6854a2d80e90520ea3f9941a676b0c6b8aa SHA256 961b48d7c2b1e2da7ee5482a1aabb36a449f7d8c2ffed70d85482d8442668a3f
+EBUILD openssl-1.0.0a.ebuild 5299 RMD160 5a5581b987ae86760ef331668efa83512e500ab6 SHA1 185ec953241b75bb680488dd70e675c147f49902 SHA256 f2ac41608bd916367eed3c5ce01a980a83e8f24a21827daae1dcc49d90f71462
+MISC ChangeLog 50616 RMD160 db8d9597f9a4e7529f4230f68d9a87bcd3d9b84a SHA1 2fbc45a9fc4acddf48494660806cf0d1b93e29bc SHA256 dd7acc7782125bee7e61fabd831c3b535a58148313c00cabe0fa9d84bf2cedb4
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxDV70ACgkQTwhj9JtAlp64igD8D/Of9xEsg57PVHSwEBZhIRm8
+eYl4sJ+1E+zdohlkJ+EA/RBJlGIn7RUW+PvHFVBT5Wa5h15NAVy45HPNFrgri5u8
+=qRyU
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-1.0.0a.ebuild b/dev-libs/openssl/openssl-1.0.0a.ebuild
index be9a3003165f..fff0063bfd61 100644
--- a/dev-libs/openssl/openssl-1.0.0a.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0a.ebuild
@@ -1,6 +1,6 @@
 # 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-1.0.0a.ebuild,v 1.2 2010/07/14 20:52:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a.ebuild,v 1.3 2010/07/18 19:39:21 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -27,10 +27,6 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.8j-parallel-build.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
 	epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
 
 	# disable fips in the build
@@ -165,9 +161,11 @@ src_install() {
 }
 
 pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7,8}
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7,8}
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
 }