arm/s390/sh stabilize and use the preserve_old_lib funcs

Package-Manager: portage-2.1.2-r9

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 43cd918d21e35d315b9954396a04c45cfffffd41..88e2d0a933928dc2271cd4b41b5bd9ff9b0500d2 100644 (file)
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gentoo.config-0.9.7g 3356 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 SHA1 9dc82ecc34677b9b9f2758d3c86ae5a8b4d86720 SHA256 1935ea31cf0d4c4a7f5ed0fa4434e9960c7ccef5cb43abcee26cff09472991eb
 MD5 5479124566140e079c2493abe59a1c90 files/gentoo.config-0.9.7g 3356
 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 files/gentoo.config-0.9.7g 3356
@@ -86,14 +89,14 @@ EBUILD openssl-0.9.7k.ebuild 5402 RMD160 89fd43fb8bc64f345483c21b14690b5f7cbdcae
 MD5 1fdb5bbcd56f2780f574e907be69fb91 openssl-0.9.7k.ebuild 5402
 RMD160 89fd43fb8bc64f345483c21b14690b5f7cbdcae6 openssl-0.9.7k.ebuild 5402
 SHA256 9d19a2b0f8b3c1e7637639b77780abc7939c2fdae6c9ec0864e5ee8df8cd49bb openssl-0.9.7k.ebuild 5402
-EBUILD openssl-0.9.7l.ebuild 5353 RMD160 29ff10aaeb2a4c6bdb20de9b5a9650ce7029e13d SHA1 f801196934c0c30d3f06fa3d4a1e44a564d0a244 SHA256 482dc93b48f2c95b51bc0e2b25032a164a7f194295c4a5a96bc71a26cccc2829
-MD5 a13b09a56229a1ca50f82082d71495d6 openssl-0.9.7l.ebuild 5353
-RMD160 29ff10aaeb2a4c6bdb20de9b5a9650ce7029e13d openssl-0.9.7l.ebuild 5353
-SHA256 482dc93b48f2c95b51bc0e2b25032a164a7f194295c4a5a96bc71a26cccc2829 openssl-0.9.7l.ebuild 5353
-EBUILD openssl-0.9.8d.ebuild 5737 RMD160 fac6ebd45a68f66f3e98a85ddc5a727ca61f1724 SHA1 32228921cee0c65fa3193a52a9dcd315ea79b9f1 SHA256 232973502e8f1d237ce936f94759f3d9d1f6eb53ee62a06f889045cad3c3d6ce
-MD5 2d94aa69d66b86386df0092cc83c5509 openssl-0.9.8d.ebuild 5737
-RMD160 fac6ebd45a68f66f3e98a85ddc5a727ca61f1724 openssl-0.9.8d.ebuild 5737
-SHA256 232973502e8f1d237ce936f94759f3d9d1f6eb53ee62a06f889045cad3c3d6ce openssl-0.9.8d.ebuild 5737
+EBUILD openssl-0.9.7l.ebuild 5042 RMD160 7fa128270e290884b611ed6ac3989dd7a8c0575c SHA1 6033e2ba6313002ee685ca6ad8a1ebb08e9fcf5b SHA256 51e7afdeb2b7c29a7aac4bab8678a9733ffd80c16546eedf2432ae2a3941cbce
+MD5 b7dbafcb6aa4de61595cf4af3bcf1300 openssl-0.9.7l.ebuild 5042
+RMD160 7fa128270e290884b611ed6ac3989dd7a8c0575c openssl-0.9.7l.ebuild 5042
+SHA256 51e7afdeb2b7c29a7aac4bab8678a9733ffd80c16546eedf2432ae2a3941cbce openssl-0.9.7l.ebuild 5042
+EBUILD openssl-0.9.8d.ebuild 5266 RMD160 5b4a38ee7e0a6ef153312bb809967297beaa8227 SHA1 fd5c81fcd59773ec0224bb75bf9f89da24ad9971 SHA256 41538331ecaab2ce3dbd30d8adc178e5b75f5a7e7eefe1c9c46182411baf0d77
+MD5 6f4b8da964e9aaa020b6aaf84cf66c5c openssl-0.9.8d.ebuild 5266
+RMD160 5b4a38ee7e0a6ef153312bb809967297beaa8227 openssl-0.9.8d.ebuild 5266
+SHA256 41538331ecaab2ce3dbd30d8adc178e5b75f5a7e7eefe1c9c46182411baf0d77 openssl-0.9.8d.ebuild 5266
 MISC ChangeLog 32111 RMD160 4fc6944e1916929f6337bf1819c63a108bab1a74 SHA1 8003405bd8656b6c35bef97b799c0670c47ffefc SHA256 fc3c29ee1135e3e630d34d23490b0b2dabf6cb4ff27a2307d9221dab56c83e71
 MD5 5aafa009446d6fdf268f2a841ee70f9e ChangeLog 32111
 RMD160 4fc6944e1916929f6337bf1819c63a108bab1a74 ChangeLog 32111
@@ -114,3 +117,10 @@ SHA256 c34564b3f065d23743e98898b9c9cf83be82d930d5df8642cc14d47ca0fe1fd5 files/di
 MD5 c860eede8676360f4cd66b1fcb17345c files/digest-openssl-0.9.8d 247
 RMD160 fc03af9cd4ca71ec400924bfd866e09b0a8d59a7 files/digest-openssl-0.9.8d 247
 SHA256 f71ab1e8bddbc1f5dfcfafba984d0c2c95088b751768ff691f5fcc911be601a8 files/digest-openssl-0.9.8d 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF18Pn8bi6rjpTunYRAia3AKCzo3VT756sE3B1w43mDc1Uxi72gACg4FMr
+u+Lv8Jtgq/0ScpkEVXV1XuU=
+=t0JD
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/openssl/openssl-0.9.7l.ebuild b/dev-libs/openssl/openssl-0.9.7l.ebuild
index 55c392373ac06054612aa7bfe333c5ddd2760b6d..9bce71bfae97942d9db19c49d7341ba5e5cf7142 100644 (file)
--- a/dev-libs/openssl/openssl-0.9.7l.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7l.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7l.ebuild,v 1.14 2006/11/03 23:04:16 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7l.ebuild,v 1.15 2007/02/18 03:10:46 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="-* alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="emacs test bindist zlib"
 
 RDEPEND=""
@@ -163,13 +163,10 @@ src_install() {
        fperms a+x /usr/$(get_libdir)/pkgconfig #34088
 }
 
+pkg_preinst() {
+       preserve_old_lib /usr/$(get_libdir)/libcrypto.so.0.9.6
+}
+
 pkg_postinst() {
-       if [[ -e ${ROOT}/usr/lib/libcrypto.so.0.9.6 ]] ; then
-               ewarn "You must re-compile all packages that are linked against"
-               ewarn "OpenSSL 0.9.6 by using revdep-rebuild from gentoolkit:"
-               ewarn "# revdep-rebuild --library libssl.so.0.9.6"
-               ewarn "# revdep-rebuild --library libcrypto.so.0.9.6"
-               ewarn "After this, you can delete /usr/lib/libssl.so.0.9.6 and /usr/lib/libcrypto.so.0.9.6"
-               touch -c "${ROOT}"/usr/lib/lib{crypto,ssl}.so.0.9.6
-       fi
+       preserve_old_lib_notify /usr/$(get_libdir)/libcrypto.so.0.9.6
 }

diff --git a/dev-libs/openssl/openssl-0.9.8d.ebuild b/dev-libs/openssl/openssl-0.9.8d.ebuild
index b5e2209d199c013f27c1a7ad9f9e1287fd2766bf..a3d5a3e287df6858a8a7786171d6c601c04ecd3d 100644 (file)
--- a/dev-libs/openssl/openssl-0.9.8d.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8d.ebuild,v 1.18 2006/11/04 00:37:17 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8d.ebuild,v 1.19 2007/02/18 03:10:46 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="-* alpha amd64 ~arm hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="-* alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="bindist emacs sse2 test zlib"
 
 RDEPEND=""
@@ -158,20 +158,11 @@ src_install() {
 }
 
 pkg_preinst() {
-       if [[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.7 ]] ; then
-               cp -pPR "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.7 "${IMAGE}"/usr/$(get_libdir)/
-       fi
+       preserve_old_lib /usr/$(get_libdir)/libcrypto.so.0.9.{6,7}
 }
 
 pkg_postinst() {
-       if [[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.7 ]] ; then
-               ewarn "You must re-compile all packages that are linked against"
-               ewarn "OpenSSL 0.9.7 by using revdep-rebuild from gentoolkit:"
-               ewarn "# revdep-rebuild --library libssl.so.0.9.7"
-               ewarn "# revdep-rebuild --library libcrypto.so.0.9.7"
-               ewarn "After this, you can delete /usr/$(get_libdir)/libssl.so.0.9.7"
-               ewarn "and /usr/$(get_libdir)/libcrypto.so.0.9.7"
-       fi
+       preserve_old_lib_notify /usr/$(get_libdir)/libcrypto.so.0.9.{6,7}
 
        if [[ ${CHOST} == i686* ]] ; then
                ewarn "Due to the way openssl is architected, you cannot"