From c2263de5fd975a88769f1669d32c9e1ec22ac4fd Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 26 Dec 2010 16:00:12 +0000 Subject: [PATCH] app-emulation/vmware-server-console: don't remove the provided libs and add missing deep on openssl:0.7.9 (Portage version: 2.2.0_alpha10-r1/svn/Linux x86_64) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@2790 6952d904-891a-0410-993b-d76249ca496b --- app-emulation/vmware-server-console/ChangeLog | 4 ++++ app-emulation/vmware-server-console/Manifest | 4 ++-- ...are-server-console-1.0.10.203137-r50.ebuild | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app-emulation/vmware-server-console/ChangeLog b/app-emulation/vmware-server-console/ChangeLog index 421e00f..9f5e977 100644 --- a/app-emulation/vmware-server-console/ChangeLog +++ b/app-emulation/vmware-server-console/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/ChangeLog,v 1.41 2009/05/09 21:59:41 ikelos Exp $ + 26 Dec 2010; Mario Fetka + vmware-server-console-1.0.10.203137-r50.ebuild: + don't remove the provided libs and add missing deep on openssl:0.7.9 + 26 Dec 2010; Mario Fetka vmware-server-console-1.0.10.203137-r50.ebuild: correct some repoman warnings diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest index 6f7f4f8..3259a51 100644 --- a/app-emulation/vmware-server-console/Manifest +++ b/app-emulation/vmware-server-console/Manifest @@ -3,9 +3,9 @@ AUX vmware-server-console.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e DIST VMware-server-linux-client-1.0.10-203137.zip 23775696 RMD160 8f5cd2646b68aa0acc93ba6288993e31af8a06b2 SHA1 3f92c98153f5d9dcbbcd0cd524683a6832aaa10e SHA256 143a2ab8604706e2fe0cd9a6f824e8f9338c1db9fc6e51a5ea8316efe934448c DIST VMware-server-linux-client-1.0.8-126538.zip 23697857 RMD160 470b1b612ff55128a856da6025bb0b9130f42602 SHA1 20dc3e08eedabdd66fd6094fa5d17f1c37bb4d8e SHA256 cb81942ebea0551d32ae54fd9aa1f7d77a4c018729ea811cc65adba41e7ee683 DIST VMware-server-linux-client-1.0.9-156507.zip 23772932 RMD160 e96e94e4173f4e5fa05ff74ab5637472e1398d4a SHA1 4aa99c8f72f13f1cbbfa21bf35014c386b1156c4 SHA256 c0735562ab900f02ff954b7f907fd0e57f25c3073ec932f0a684460c8ea4b3e7 -EBUILD vmware-server-console-1.0.10.203137-r50.ebuild 7935 RMD160 d6cc853560a6876457ea21e972a2a58c69790fa1 SHA1 c40e7241a25437a7a4555529be61d2e812de6aff SHA256 761bd771801f1cc68439852461533528a34991292dee579b20fb18d9f7db3067 +EBUILD vmware-server-console-1.0.10.203137-r50.ebuild 8347 RMD160 22dd221f46c68f9c1ffa56b2a6c660cfbc8e4615 SHA1 155374f5076987789970b1313e195dc5a7279450 SHA256 20b61d8299f14647c84732849553310dededbfedd88e3ac44ec15ec6ce462da6 EBUILD vmware-server-console-1.0.10.203137.ebuild 2135 RMD160 a1b0b0740b66e66c70fcd141be6e007f61a66f5d SHA1 9df1b2d776eab3b092d4ba53e21c0f489b789908 SHA256 0eba40f6764f2a7a4da12ff7bb159be6424715fa64b91da8e54deb8419077305 EBUILD vmware-server-console-1.0.8.126538.ebuild 2139 RMD160 ffe61628eeec39617a9d57c1cf5ad7fca2621333 SHA1 9809397c8a5ceae1120d8fae19ea7738eba4e64c SHA256 eaec6890576838088fa254f8edb267a80d10623172466f9822c327ea333ca795 EBUILD vmware-server-console-1.0.9.156507.ebuild 2141 RMD160 4999a4bc91df3f124cd3ab59a4b73c777278ada4 SHA1 53b8f439b5c48e8392bd9dac29501654eb8abae7 SHA256 c22f8bffa1da17eec984d2645912e349e8befe6ee3156207190f0738581c85c5 -MISC ChangeLog 7789 RMD160 0b5aa918ccc724406a0a9ff5a81de00217b3df58 SHA1 d47043ef4f5d6f6a60dbaabbe46911574b743959 SHA256 ffb1d5b1f53176f85c17fdb578c7584cca6c40d2691f8c7e86f8debbcd40b05c +MISC ChangeLog 7962 RMD160 ba068ab8f00465ef95508724f089495b4f677988 SHA1 1acf7a22eb78a67f35b2009af82c5b114321b3cf SHA256 d6eabd90af553a90cc5cb637633470b93692d463df6c1d5b428be50e024da2cb MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.10.203137-r50.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.10.203137-r50.ebuild index 2d638d6..fc042b8 100644 --- a/app-emulation/vmware-server-console/vmware-server-console-1.0.10.203137-r50.ebuild +++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.10.203137-r50.ebuild @@ -47,6 +47,7 @@ RDEPEND=">=sys-libs/glibc-2.3.5[multilib_abi_x86] dev-libs/glib:2[multilib_abi_x86] dev-libs/libsigc++:2[multilib_abi_x86] dev-libs/libxml2:2[multilib_abi_x86] + dev-libs/openssl:0.9.7[multilib_abi_x86] gnome-base/libglade:2.0[multilib_abi_x86] gnome-base/libgnomecanvas[multilib_abi_x86] gnome-base/librsvg:2[multilib_abi_x86] @@ -81,15 +82,22 @@ src_unpack() { } src_prepare() { + # renove unistall script rm -f bin/vmware-uninstall-server-console.pl + # we dont need the prepacked modules +# rm -Rf lib/libconf/lib + rm -Rf lib/libgcc_s.so.1 + # correct the config files for the multilib portage version (lib32) +# ABI=x86 gdk-pixbuf-query-loaders > lib/libconf/etc/gtk-2.0/gdk-pixbuf.loaders +# ABI=x86 gtk-query-immodules-2.0 > lib/libconf/etc/gtk-2.0/gtk.immodules +# ABI=x86 pango-querymodules > lib/libconf/etc/pango/pango.modules # remove superfluous libraries - ebegin 'Removing superfluous libraries' - cd lib/lib || die +# ebegin 'Removing superfluous libraries' +# cd lib/lib || die # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree - ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.7 -libssl.so.0.9.7' 'libstdc++.so.5' | xargs -d'\n' -r rm -rf - eend +# ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libview.so.2' | xargs -d'\n' -r rm -rf +# eend } src_install() {