diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-07-18 19:39:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-07-18 19:39:21 +0000 |
| commit | 7d52fd8d2d08e6768160f29dfe5e1bde914e7ff2 (patch) | |
| tree | bde290b806c5c0f8a9968d954222f3a9e63d3996 /dev-libs/openssl | |
| parent | old (diff) | |
| download | gentoo-2-7d52fd8d2d08e6768160f29dfe5e1bde914e7ff2.tar.gz gentoo-2-7d52fd8d2d08e6768160f29dfe5e1bde914e7ff2.tar.bz2 gentoo-2-7d52fd8d2d08e6768160f29dfe5e1bde914e7ff2.zip | |
Avoid preserve_old_lib when we have the old SLOT #328355.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.0.0a.ebuild | 12 |
2 files changed, 9 insertions, 8 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/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 } |