diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-11-22 17:13:03 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-11-22 17:13:03 +0000 |
| commit | 0c7d9b5e3164846190f1e37d266f6f353cc449dc (patch) | |
| tree | 6947aa322683e61d389a9294d41b4af603b34f4b /eclass | |
| parent | Added ANY_ANY to all of the vmware-workstation-tools ebuilds, so we don't unp... (diff) | |
| download | vmware-0c7d9b5e3164846190f1e37d266f6f353cc449dc.tar.gz vmware-0c7d9b5e3164846190f1e37d266f6f353cc449dc.tar.bz2 vmware-0c7d9b5e3164846190f1e37d266f6f353cc449dc.zip | |
Make sure we only unpack the openssl stuff if it is listed in SRC_URI, not if it exists in DISTDIR. We also only remove the openssl stuff if we have newer versions in S.
svn path=/trunk/; revision=139
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/vmware.eclass | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass index 29894a5..4c6557e 100644 --- a/eclass/vmware.eclass +++ b/eclass/vmware.eclass @@ -155,11 +155,18 @@ vmware_src_unpack() { epatch "${FILESDIR}"/${patch} done fi - # Unpack our new libs. - [ -f "${DISTDIR}"/vmware-libssl.so.0.9.7l.tar.bz2 ] && \ - unpack vmware-libssl.so.0.9.7l.tar.bz2 - [ -f "${DISTDIR}"/vmware-libcrypto.so.0.9.7l.tar.bz2 ] && \ - unpack vmware-libcrypto.so.0.9.7l.tar.bz2 + # Unpack our new libs + for a in ${A} + do + case ${a} in + vmware-libssl.so.0.9.7l.tar.bz2) + unpack vmware-libssl.so.0.9.7l.tar.bz2 + ;; + /vmware-libcrypto.so.0.9.7l.tar.bz2) + unpack vmware-libcrypto.so.0.9.7l.tar.bz2 + ;; + esac + done fi } @@ -199,14 +206,14 @@ vmware_src_install() { cd "${S}" # We remove the shipped libssl for bug #148682 - if [ -d "${S}"/lib/lib/libssl.so.0.9.7 ] + if [ -d "${S}"/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 remove the shipped libcrypto for bug #148682 - if [ -d "${S}"/lib/lib/libcrypto.so.0.9.7 ] + if [ -d "${S}"/libcrypto.so.0.9.7 ] then rm -rf "${S}"/lib/lib/libcrypto.so.0.9.7 # Now, we move in our own |