diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-02 16:06:26 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-02 16:06:26 +0000 |
commit | a199a5e8570d40778ca710e3669749d9330fb8b6 (patch) | |
tree | cc9bee933317a41633e65b5019b62d7f7973b389 /eclass | |
parent | Fix the manifest. (diff) | |
download | vmware-a199a5e8570d40778ca710e3669749d9330fb8b6.tar.gz vmware-a199a5e8570d40778ca710e3669749d9330fb8b6.tar.bz2 vmware-a199a5e8570d40778ca710e3669749d9330fb8b6.zip |
Updated eclass with the in-tree version for bug #148862.
svn path=/trunk/; revision=113
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/vmware.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass index 06cc70e..39dcb6a 100644 --- a/eclass/vmware.eclass +++ b/eclass/vmware.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.7 2006/09/27 12:59:56 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.10 2006/10/02 15:52:58 wolf31o2 Exp $ # This eclass is for all vmware-* ebuilds in the tree and should contain all # of the common components across the multiple packages. @@ -190,7 +190,12 @@ vmware_src_install() { cd "${S}" # We remove the shipped libssl for bug #148682 - rm -rf "${S}"/lib/lib/libssl-0.9.7* + if [ -d "${S}"/lib/lib/libssl.so.0.9.7 ] + then + rm -rf "${S}"/lib/lib/libssl.so.0.9.7 + # Now, we move in our own + cp -pPR "${S}"/libssl.so.0.9.7 "${S}"/lib/lib + fi # We loop through our directories and copy everything to our system. for x in bin lib sbin |