diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-10-08 18:44:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-08 18:44:37 +0000 |
| commit | 2c69c6912bf39a875c59cb3b4c8b7e0674bcd03b (patch) | |
| tree | 2abba55e5eda8d717d8694c5a44f55c2b70cf6f2 /dev-libs | |
| parent | Added version supporting minor version slotting (diff) | |
| download | gentoo-2-2c69c6912bf39a875c59cb3b4c8b7e0674bcd03b.tar.gz gentoo-2-2c69c6912bf39a875c59cb3b4c8b7e0674bcd03b.tar.bz2 gentoo-2-2c69c6912bf39a875c59cb3b4c8b7e0674bcd03b.zip | |
Only remove libs when installing this SLOT for the first time, and warn about it #340033 by Marcin Mirosław.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.8o-r2.ebuild | 14 |
2 files changed, 13 insertions, 7 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/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() { |