summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Kuznetsov <vadimk@gentoo.org>2011-10-23 16:06:30 +0000
committerVadim Kuznetsov <vadimk@gentoo.org>2011-10-23 16:06:30 +0000
commitc8f900a8c96ec65471cce27e65f7542241c85006 (patch)
tree57b04de202dd509629aaeb6b76b95fc7e8aadbce /app-emulation/vmware-player
parentopen-vm-tools: unity code was removed (diff)
downloadvmware-c8f900a8c96ec65471cce27e65f7542241c85006.tar.gz
vmware-c8f900a8c96ec65471cce27e65f7542241c85006.tar.bz2
vmware-c8f900a8c96ec65471cce27e65f7542241c85006.zip
clean_bundled_libs does not work in multilib
svn path=/trunk/; revision=508
Diffstat (limited to 'app-emulation/vmware-player')
-rw-r--r--app-emulation/vmware-player/Manifest2
-rw-r--r--app-emulation/vmware-player/vmware-player-4.0.0.471780-r1.ebuild (renamed from app-emulation/vmware-player/vmware-player-4.0.0.471780.ebuild)37
2 files changed, 14 insertions, 25 deletions
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 9981e9b..ee125e5 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -7,5 +7,5 @@ DIST VMware-Player-3.1.5-491717.x86_64.bundle 103019114 RMD160 b1a2544e5718474a1
DIST VMware-Player-4.0.0-471780.i386.bundle 131366064 RMD160 e4513ea96b557a5067b3a822b399cb5fcb4de426 SHA1 c8cb81e1d35dab000e7dbe3e1aee519fd6aa89fd SHA256 5a88940b92bebc1b5c09caecbfcbe46b05e857b8383e52d392ee62fab822e00b
DIST VMware-Player-4.0.0-471780.x86_64.bundle 129048195 RMD160 0c4a2174212e80dc62781ef5f3b53cee682f1bcf SHA1 e1452a72895c902cc6b4f85be9f4fb79c85ac809 SHA256 5218c6d2c27b7b0d2019aaaa2573a1411bc202ad7bfa06a1a6c3df913d8dd5c4
EBUILD vmware-player-3.1.5.491717.ebuild 6334 RMD160 ee39299fbfb01c28c1890c862d3f39a4e3d7c163 SHA1 8b90cfe522e17a5c15b742afbc139d60decf9ca6 SHA256 ea378d1d5d1308689bacf2104f618dec655f732eff2c3e52ee11acb26656c57e
-EBUILD vmware-player-4.0.0.471780.ebuild 6610 RMD160 01058b2a1f928186568cc7a3846a135127ea1a41 SHA1 281d04ddd781c1ac1692ceee19dd89479395ce66 SHA256 49cda31c67e372817a86ac689eb765ac3a702a0791be2f3e33844b5dda5eecd1
+EBUILD vmware-player-4.0.0.471780-r1.ebuild 6119 RMD160 95de6fc511bb09642221952dcd3bfc4027c482c1 SHA1 ec7687005ff737ce51da4b5a1cc414d8a47ccb52 SHA256 e07af6b3fbddfb6491fb0e04d9927b03164d5b248f7b0fe4b6b68d5fc10e40a5
MISC metadata.xml 238 RMD160 beef158e0603e5808d104743feba4be3e7a7e8c4 SHA1 276217c6f03ae24c0196519197240031a6961254 SHA256 8374f3a2a8f05bf0690ab35f79a20980026aefa9fabae93fe81442f54291018b
diff --git a/app-emulation/vmware-player/vmware-player-4.0.0.471780.ebuild b/app-emulation/vmware-player/vmware-player-4.0.0.471780-r1.ebuild
index 836ba20..eea39ec 100644
--- a/app-emulation/vmware-player/vmware-player-4.0.0.471780.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.0.471780-r1.ebuild
@@ -57,7 +57,6 @@ RDEPEND="dev-cpp/cairomm
x11-libs/libICE
x11-libs/libsexy
x11-libs/libSM
- >=x11-libs/libview-0.6.6
x11-libs/libX11
x11-libs/libXau
x11-libs/libxcb
@@ -115,6 +114,19 @@ src_prepare() {
rm -rf lib/modules/binary
}
+clean_bundled_libs() {
+ ebegin 'Removing superfluous libraries'
+ # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
+ # see http://forums.gentoo.org/viewtopic-t-835867.html
+ # must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
+ ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
+libssl.so.0.9.8
+libgcr.so.0' | while read -r libname libpath ; do
+ dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
+ done
+ eend
+}
+
src_install() {
local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
local build=$(get_version_component_range 4 "${PV}")
@@ -127,16 +139,6 @@ src_install() {
insinto "${VM_INSTALL_DIR}"/lib/vmware
doins -r lib/* || die "failed to install lib"
- # commented out until Portage gets OpenSSL 0.9.8 with AES-NI support
- # see http://forums.gentoo.org/viewtopic-t-835867.html
- ## these two libraries do not like to load from /usr/lib*
- #local each ; for each in libcrypto.so.0.9.8 libssl.so.0.9.8 ; do
- # if [[ ! -f "${VM_INSTALL_DIR}/lib/vmware/lib/${each}" ]] ; then
- # dosym "/usr/$(get_libdir)/${each}" \
- # "${VM_INSTALL_DIR}/lib/vmware/lib/${each}/${each}"
- # fi
- #done
-
# install the ancillaries
insinto /usr
doins -r share || die "failed to install share"
@@ -210,19 +212,6 @@ pkg_preinst() {
}
pkg_postinst() {
- # remove superfluous libraries
- ebegin 'Removing superfluous libraries'
- cd "${VM_INSTALL_DIR}"/lib/vmware/lib || die
- # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
- # see http://forums.gentoo.org/viewtopic-t-835867.html
- # must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
- ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
- ln -sfn "${libpath}" "${libname}/${libname}" 2> /dev/null
- done
- eend
-
fdo-mime_desktop_database_update
gnome2_icon_cache_update