[gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-0.9.8o-r2.ebuild

[Mike Frysinger (vapier)]

vapier      10/10/08 18:44:37

  Modified:             ChangeLog openssl-0.9.8o-r2.ebuild
  Log:
  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)

Revision  Changes    Path
1.360                dev-libs/openssl/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.360&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.360&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.359&r2=1.360

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- ChangeLog	7 Oct 2010 15:47:55 -0000	1.359
+++ ChangeLog	8 Oct 2010 18:44:37 -0000	1.360
@@ -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@g.o> 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@g.o> openssl-1.0.0a-r3.ebuild:
   Stable for HPPA PPC (bug #332027).



1.3                  dev-libs/openssl/openssl-0.9.8o-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?r1=1.2&r2=1.3

Index: openssl-0.9.8o-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openssl-0.9.8o-r2.ebuild	28 Sep 2010 11:02:13 -0000	1.2
+++ openssl-0.9.8o-r2.ebuild	8 Oct 2010 18:44:37 -0000	1.3
@@ -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 @@
 	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() {