bug 354383

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

9 files changed, 12 insertions, 220 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 9ed8f9175a7b..1cb82096abc0 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.218 2011/02/26 15:47:39 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.219 2011/03/16 13:15:16 vadimk Exp $
+
+  16 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+  -files/5.5.9.126128/000_all_initd-location.patch,
+  -files/5.5.9.126128/001_all_fix-permissions.patch,
+  -files/5.5.9.126128/002_all_pagebreak-detection-fix.patch,
+  -files/5.5.9.126128/004_all_do-not-build-modules.patch,
+  -files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch,
+  -files/5.5.9.126128/009_all_init.d-modules-warning.patch,
+  -vmware-workstation-5.5.9.126128.ebuild:
+  Bug 354383.
 
   26 Feb 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -vmware-workstation-6.5.3.185404.ebuild,
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 18fc8230fed9..14cc775b5007 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,9 +1,3 @@
-AUX 5.5.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
-AUX 5.5.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
-AUX 5.5.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
-AUX 5.5.9.126128/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
-AUX 5.5.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
-AUX 5.5.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX 6.5.5.328052/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
 AUX 6.5.5.328052/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
 AUX 6.5.5.328052/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
@@ -20,9 +14,6 @@ AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e S
 AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 DIST VMware-Workstation-6.5.5-328052.i386.bundle 450181321 RMD160 b695a70c77bc8271287069cc888eac8b4e03883c SHA1 18a05e6f4f772b7f0563dbd17596b66d1db8e9fa SHA256 d2a895ae2bc38988e6426f81746c557a5d3154ca0282f9b61908dba3d1bbc1d0
 DIST VMware-Workstation-6.5.5-328052.x86_64.bundle 417733505 RMD160 d41cf7f5f24dfdee97243c7612e620a3d450aee4 SHA1 58ecb2a494d4c7cc663e2028cf76c13d458fecac SHA256 9d213dca51852ce8ca38ed0a140ff205fdecd29fbef7319f26a5e052362e3d51
-DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a02821f8dd639a95b8c9ab38bc SHA1 eb8786111a74213ea4ec24636a4ba70b7f5dc741 SHA256 71a062e29480a48647c7323883e4e4b43a9365c1bb70000a23b768647db46444
-DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
-EBUILD vmware-workstation-5.5.9.126128.ebuild 3240 RMD160 125c6ea7b44b293a87c17142e471af58dac144ac SHA1 b8944cabdb8803b21b6c90240ca81e40710a2cf1 SHA256 f5de4f8ea21a0e872b65781d44de879a0d2110cd051d43eb9cfb06bf3e4ae355
 EBUILD vmware-workstation-6.5.5.328052.ebuild 5015 RMD160 7f622d2eec8c3b5a2fd22c92d7dc5707f2c5c479 SHA1 dfb0ea915b44b4489972c133c33ea0f7e5bbc7ee SHA256 2d46ec3905fb34aea7673296b6e3f038b9cdc458e63d21c81c689441d576af6d
-MISC ChangeLog 36505 RMD160 6adbc749a4894681569d9e7f3bfbaa7eb87ebea0 SHA1 01fd2d69ecc54830e073528cbc2485949c7d84cd SHA256 e6ef14f3984281c7343884931bf9507bd1b87010dc448ee0351a41c7bfc319ff
+MISC ChangeLog 36960 RMD160 3b4e3d62bad5c99514888abefdea29e420d04c7f SHA1 73f58fccb89be3fce5b43ee110b1b4020eda278f SHA256 d1369484c0ec954c72a80e37861139794219044a09f3d28eeeff12f0a663576a
 MISC metadata.xml 347 RMD160 09578738c25495a3f945f97e2a8a51d649476a5b SHA1 89b8a5cd78b0acc29dc50ac1c890b1f67b0303e5 SHA256 2dadcb5e8783b7dad15087e3812a292a158779b3269e65e39c285228cf0b1710
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/000_all_initd-location.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- vmware-distrib/bin/vmware-config.pl.ori	2005-11-09 01:45:08.000000000 +0000
-+++ vmware-distrib/bin/vmware-config.pl	2005-11-09 01:48:21.000000000 +0000
-@@ -8433,7 +8433,7 @@
-          error('Please shut down any running VMs and run this script again.' .
-                "\n\n");
-       } else {
--         if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
-+         if (system(shell_string('/etc/init.d' . '/vmware')
-                     . ' stop')) {
-             error('Unable to stop services for ' . vmware_product_name() .
-                   "\n\n");
-@@ -8463,8 +8463,8 @@
-   }
-   if (vmware_product() ne 'server') {
-     configure_gtk2();
--    createMimePackageFile();
--    configureDesktopFiles();
-+#   createMimePackageFile();
-+#   configureDesktopFiles();
-     configure_mon();
-     configure_pp();
-     configure_net();
-@@ -8532,7 +8532,7 @@
-   db_save();
-   # Then start VMware's services
-   if (!$gOption{'skipstopstart'}) {
--    system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
-+    system(shell_string('/etc/init.d' . '/vmware') . ' start');
-     print "\n";
-   }
- 
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/001_all_fix-permissions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl	2005-12-16 00:51:03.000000000 -0500
-+++ vmware-distrib/bin/vmware-config.pl	2005-12-21 14:34:03.000000000 -0500
-@@ -7327,7 +7327,10 @@
-     error('Unable to write configuration file "' . $name . '".' . "\n\n");
-   }
-   db_add_file($name, 0x1);
--  safe_chmod(0644, $name);
-+  safe_chmod(0664, $name);
-+  my $gid = (getgrnam('vmware'))[2];
-+  my $uid = (stat($name))[4];
-+  safe_chown($uid,$gid,$name);
- 
-   # Append the promotional configuration if it exists
-   $promoconfig = $libdir . '/configurator/PROMOCONFIG';
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/002_all_pagebreak-detection-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl	2006-03-24 23:13:05.000000000 +0100
-+++ vmware-distrib/bin/vmware-config.pl	2006-03-24 23:26:40.000000000 +0100
-@@ -2015,9 +2015,9 @@
-       . shell_string($pattern));
-     chomp($header_page_offset);
-     # Ignore PAGE_OFFSET if we cannot parse it.
--    if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
-+    if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
-       # We found a valid page offset
--      $header_page_offset = $1;
-+      $header_page_offset = $2;
-       if (defined($gSystem{'page_offset'}) and
-           not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
-         if ($source eq 'user') {
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/004_all_do-not-build-modules.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
---- vmware-server-distrib.orig/bin/vmware-config.pl	2006-02-18 18:12:26.000000000 +0000
-+++ vmware-server-distrib/bin/vmware-config.pl	2006-02-18 18:14:17.000000000 +0000
-@@ -8571,10 +8571,10 @@
-     configure_gtk2();
- #   createMimePackageFile();
- #   configureDesktopFiles();
--    configure_mon();
--    configure_pp();
-+#   configure_mon();
-+#   configure_pp();
-     configure_net();
--    build_vmnet();
-+#    build_vmnet();
-   }
- 
-   # Create the directory for the UNIX domain sockets
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index 5509d249f19a..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh
---- vmware-server-distrib/installer/services.sh	2006-02-05 00:21:25.000000000 +0000
-+++ vmware-server-distrib.new/installer/services.sh	2006-02-20 23:48:07.000000000 +0000
-@@ -538,7 +538,7 @@
- }
- 
- vmware_load_module() {
--   /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
-+   /sbin/modprobe -s "$1" || exit 1
-    exit 0
- }
- 
diff --git a/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.9.126128/009_all_init.d-modules-warning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
---- vmware-server-distrib.orig/installer/services.sh	2006-07-01 03:14:16.000000000 +0000
-+++ vmware-server-distrib/installer/services.sh	2006-07-14 11:59:28.000000000 +0000
-@@ -606,8 +606,13 @@
-    start)
-       if [ -e "$vmware_etc_dir"/not_configured ]; then
-          echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
--         echo 'for the running kernel. To (re-)configure it, invoke the'
--         echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
-+         echo 'for the running kernel.'
-+         echo 
-+         echo 'Please ensure that the modules have been compiled for this kernel:'
-+         echo '  emerge --oneshot vmware-modules'
-+         echo
-+         echo 'Also ensure '"`vmware_product_name`"' has been configured:'
-+         echo '  '"$vmdb_answer_BINDIR"'/vmware-config.pl'
-          echo
- 
-          exit 1
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild
deleted file mode 100644
index b847334425ed..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.9.126128.ebuild,v 1.4 2010/03/09 12:06:38 abcd Exp $
-
-inherit vmware eutils versionator
-
-MY_P="VMware-workstation-$(replace_version_separator 3 - $PV)"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/download/ws/ws5.html"
-SRC_URI="mirror://vmware/software/wkst/${MY_P}.tar.gz
-	http://download.softpedia.ro/linux/${MY_P}.tar.gz
-	mirror://gentoo/${ANY_ANY}.tar.gz
-	http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-	http://platan.vc.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz
-	http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
-	http://ftp.cvut.cz/vmware/obsolete/${ANY_ANY}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="fetch strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="sys-libs/glibc
-	amd64? (
-		app-emulation/emul-linux-x86-gtklibs )
-	x86? (
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXi
-		x11-libs/libXft )
-	!app-emulation/vmware-player
-	!app-emulation/vmware-server
-	~app-emulation/vmware-modules-1.0.0.15
-	!<app-emulation/vmware-modules-1.0.0.15
-	!>=app-emulation/vmware-modules-1.0.0.16
-	>=dev-lang/perl-5
-	sys-apps/pciutils"
-
-S=${WORKDIR}/vmware-distrib
-
-RUN_UPDATE="no"
-
-dir=/opt/vmware/workstation
-Ddir=${D}/${dir}
-
-QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
-QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge
-	${dir:1}/bin/vmnet-dhcpd
-	${dir:1}/bin/vmnet-natd
-	${dir:1}/bin/vmnet-netifup
-	${dir:1}/bin/vmnet-sniffer
-	${dir:1}/bin/vmware-loop
-	${dir:1}/bin/vmware-ping
-	${dir:1}/bin/vmware-vdiskmanager
-	${dir:1}/lib/bin/vmware
-	${dir:1}/lib/bin/vmware-vmx
-	${dir:1}/lib/bin/vmrun
-	${dir:1}/lib/bin/vmplayer
-	${dir:1}/lib/bin-debug/vmware-vmx
-	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
-
-QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
-QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge
-	${dir:1}/bin/vmnet-dhcpd
-	${dir:1}/bin/vmnet-natd
-	${dir:1}/bin/vmnet-netifup
-	${dir:1}/bin/vmnet-sniffer
-	${dir:1}/bin/vmware-loop
-	${dir:1}/bin/vmware-ping
-	${dir:1}/bin/vmware-vdiskmanager
-	${dir:1}/lib/bin/vmware
-	${dir:1}/lib/bin/vmware-vmx
-	${dir:1}/lib/bin/vmrun
-	${dir:1}/lib/bin/vmplayer
-	${dir:1}/lib/bin-debug/vmware-vmx
-	${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
-
-src_install() {
-	vmware_src_install
-
-	doicon lib/share/pixmaps/vmware-player.png
-	# Fix an ugly GCC error on start
-	rm -f "${Ddir}lib/lib/libgcc_s.so.1/libgcc_s.so.1"
-	make_desktop_entry vmware "VMWare Workstation" ${PN} System
-	make_desktop_entry vmplayer "VMWare Player" vmware-player System
-}
-
-pkg_postinst() {
-	vmware_pkg_postinst
-	ewarn "Vmware Workstation has issues on systems with hal installed but"
-	ewarn "not running. If you experience trouble with VMware loading, try"
-	ewarn "starting the hal daemon."
-}