Version bump, the new version features a native 64-bit version, USB 2.0 and some speed improvements too.

(Portage version: 2.1.3_rc4)

15 files changed, 172 insertions, 112 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index e5f2ef1e6898..4dedbebda701 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.158 2007/05/15 01:47:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.159 2007/06/24 19:32:23 ikelos Exp $
+
+*vmware-workstation-6.0.0.45731 (24 Jun 2007)
+
+  24 Jun 2007; Mike Auty <ikelos@gentoo.org>
+  -files/5.5.1.19175/000_all_initd-location.patch,
+  -files/5.5.1.19175/001_all_fix-permissions.patch,
+  -files/5.5.1.19175/002_all_pagebreak-detection-fix.patch,
+  -files/5.5.1.19175/004_all_do-not-build-modules.patch,
+  -files/5.5.1.19175/007_all_use-modprobe-over-insmod.patch,
+  -files/5.5.1.19175/009_all_init.d-modules-warning.patch,
+  -files/5.5.2.29772/000_all_initd-location.patch,
+  -files/5.5.2.29772/001_all_fix-permissions.patch,
+  -files/5.5.2.29772/002_all_pagebreak-detection-fix.patch,
+  -files/5.5.2.29772/004_all_do-not-build-modules.patch,
+  -files/5.5.2.29772/007_all_use-modprobe-over-insmod.patch,
+  -files/5.5.2.29772/009_all_init.d-modules-warning.patch,
+  +files/6.0.0.45731/000_all_initd-location.patch,
+  +files/6.0.0.45731/001_all_fix-permissions.patch,
+  +files/6.0.0.45731/002_all_pagebreak-detection-fix.patch,
+  +files/6.0.0.45731/004_all_do-not-build-modules.patch,
+  +files/6.0.0.45731/007_all_use-modprobe-over-insmod.patch,
+  +files/6.0.0.45731/009_all_init.d-modules-warning.patch,
+  +vmware-workstation-6.0.0.45731.ebuild:
+  Version bump, the new version features a native 64-bit version, USB 2.0 and
+  some speed improvements too.
 
 *vmware-workstation-5.5.4.44386 (15 May 2007)
 
diff --git a/app-emulation/vmware-workstation/files/5.5.1.19175/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/5.5.1.19175/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index f700f5df9d32..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.1.19175/002_all_pagebreak-detection-fix.patch
+++ /dev/null
@@ -1,12 +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
-@@ -1969,7 +1969,7 @@
-     . ' -E - | ' . shell_string($gHelper{'grep'}) . ' '
-     . shell_string($pattern));
-   chomp($header_page_offset);
--  $header_page_offset =~ s/^$pattern \(?0x([0-9a-fA-F]{8,}).*$/$1/;
-+  $header_page_offset =~ s/^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/$2/;
-   if ($header_page_offset =~ /[0-9a-fA-F]{8,}/) {
-     # We found a valid page offset
-     if (defined($gSystem{'page_offset'}) and
diff --git a/app-emulation/vmware-workstation/files/5.5.1.19175/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/5.5.1.19175/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.1.19175/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.2.29772/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/5.5.2.29772/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.2.29772/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.2.29772/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/5.5.2.29772/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.2.29772/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.2.29772/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/5.5.2.29772/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.2.29772/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 -f "$1" || exit 1
-    exit 0
- }
- 
diff --git a/app-emulation/vmware-workstation/files/5.5.2.29772/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/5.5.2.29772/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/5.5.2.29772/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/files/5.5.1.19175/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/6.0.0.45731/000_all_initd-location.patch
index 1d864f7e0dd7..6eb6619d2b8e 100644
--- a/app-emulation/vmware-workstation/files/5.5.1.19175/000_all_initd-location.patch
+++ b/app-emulation/vmware-workstation/files/6.0.0.45731/000_all_initd-location.patch
@@ -23,7 +23,7 @@
 @@ -8532,7 +8532,7 @@
    db_save();
    # Then start VMware's services
-   if (!$gOption{'skipstopstart'}) {
+   if (!$gOption{'skip-stop-start'}) {
 -    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.1.19175/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/6.0.0.45731/001_all_fix-permissions.patch
index e646b7b2da5c..e646b7b2da5c 100644
--- a/app-emulation/vmware-workstation/files/5.5.1.19175/001_all_fix-permissions.patch
+++ b/app-emulation/vmware-workstation/files/6.0.0.45731/001_all_fix-permissions.patch
diff --git a/app-emulation/vmware-workstation/files/5.5.2.29772/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/6.0.0.45731/002_all_pagebreak-detection-fix.patch
index fd3fc76ca679..fd3fc76ca679 100644
--- a/app-emulation/vmware-workstation/files/5.5.2.29772/002_all_pagebreak-detection-fix.patch
+++ b/app-emulation/vmware-workstation/files/6.0.0.45731/002_all_pagebreak-detection-fix.patch
diff --git a/app-emulation/vmware-workstation/files/5.5.2.29772/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/6.0.0.45731/004_all_do-not-build-modules.patch
index cec3b3ee4c1d..e2649c0af27b 100644
--- a/app-emulation/vmware-workstation/files/5.5.2.29772/004_all_do-not-build-modules.patch
+++ b/app-emulation/vmware-workstation/files/6.0.0.45731/004_all_do-not-build-modules.patch
@@ -1,17 +1,21 @@
 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 @@
+@@ -10158,13 +10158,13 @@
      configure_gtk2();
  #   createMimePackageFile();
  #   configureDesktopFiles();
 -    configure_mon();
--    configure_pp();
 +#   configure_mon();
+     if (isDesktopProduct()) {
+-      build_vmblock();
++#     build_vmblock();
+     }
+-    configure_pp();
 +#   configure_pp();
      configure_net();
 -    build_vmnet();
-+#    build_vmnet();
++#   build_vmnet();
    }
  
-   # Create the directory for the UNIX domain sockets
+    configure_eclipse_plugin();
diff --git a/app-emulation/vmware-workstation/files/5.5.1.19175/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/6.0.0.45731/007_all_use-modprobe-over-insmod.patch
index c29a87e8f226..c29a87e8f226 100644
--- a/app-emulation/vmware-workstation/files/5.5.1.19175/007_all_use-modprobe-over-insmod.patch
+++ b/app-emulation/vmware-workstation/files/6.0.0.45731/007_all_use-modprobe-over-insmod.patch
diff --git a/app-emulation/vmware-workstation/files/5.5.1.19175/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/6.0.0.45731/009_all_init.d-modules-warning.patch
index 4eab043af8dc..4eab043af8dc 100644
--- a/app-emulation/vmware-workstation/files/5.5.1.19175/009_all_init.d-modules-warning.patch
+++ b/app-emulation/vmware-workstation/files/6.0.0.45731/009_all_init.d-modules-warning.patch
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-6.0.0.45731 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-6.0.0.45731
new file mode 100644
index 000000000000..b9bfc875eb58
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-6.0.0.45731
@@ -0,0 +1,9 @@
+MD5 7dddb6f009d25e34fbaeb6da23c90496 VMware-workstation-6.0.0-45731.i386.tar.gz 190053947
+RMD160 cb20bebe843ef7ae6b0fe3155b61bd8d29fbdaa2 VMware-workstation-6.0.0-45731.i386.tar.gz 190053947
+SHA256 6781820f88c2321ecd9fe12f1a228703717b92447565cef40648789dde06e698 VMware-workstation-6.0.0-45731.i386.tar.gz 190053947
+MD5 813e86ec23b458d9ab0a318bb955efdd VMware-workstation-6.0.0-45731.x86_64.tar.gz 166956169
+RMD160 355db06ad645032ce575deb8afea2c7e1d53dff3 VMware-workstation-6.0.0-45731.x86_64.tar.gz 166956169
+SHA256 b6a46596f17e67cd1473a82844fc2828a48af81d088a7ae3908d3092f754a842 VMware-workstation-6.0.0-45731.x86_64.tar.gz 166956169
+MD5 2b65f2c3867e45a7b0674591f2ca8015 vmware-any-any-update109.tar.gz 295773
+RMD160 823b961d7b8f8a97af02f0bb2ed775fa5840ec54 vmware-any-any-update109.tar.gz 295773
+SHA256 392dd7d4fd990efcbd664f982d71e8ad8ba1d08425ab37e640a1bee0909b67a8 vmware-any-any-update109.tar.gz 295773
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild
new file mode 100644
index 000000000000..55c24d1eaa02
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild,v 1.1 2007/06/24 19:32:23 ikelos Exp $
+
+inherit vmware eutils versionator
+
+MY_PN="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/products/desktop/ws_features.html"
+SRC_URI="
+	x86? (
+		mirror://vmware/software/wkst/${MY_PN}.i386.tar.gz
+		http://download.softpedia.ro/linux/${MY_PN}.i386.tar.gz
+	)
+	amd64? (
+		mirror://vmware/software/wkst/${MY_PN}.x86_64.tar.gz
+		http://download.softpedia.ro/linux/${MY_PN}.x86_64.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="strip fetch"
+
+# vmware-workstation should not use virtual/libc as this is a 
+# precompiled binary package thats linked to glibc.
+RDEPEND="sys-libs/glibc
+	amd64? (
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXi
+		x11-libs/libview
+		dev-cpp/libsexymm
+		dev-cpp/cairomm
+		dev-cpp/libgnomecanvasmm
+		virtual/xft )
+	x86? (
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXi
+		x11-libs/libview
+		dev-cpp/libsexymm
+		virtual/xft )
+	!app-emulation/vmware-player
+	!app-emulation/vmware-server
+	~app-emulation/vmware-modules-1.0.0.16
+	!<app-emulation/vmware-modules-1.0.0.16
+	!>=app-emulation/vmware-modules-1.0.0.17
+	>=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"
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	if ! built_with_use ">=dev-cpp/gtkmm-2.4" accessibility ; then
+		eerror "Rebuild dev-cpp/gtkmm with USE=\"accessibility\""
+		die "VMware workstation only works with gtkmm built with USE=\"accessibility\"."
+	fi
+
+	vmware_pkg_setup
+}
+
+pkg_nofetch() {
+	einfo "Please download the ${MY_PN}.tar.gz at ${HOMEPAGE}"
+}
+
+src_install() {
+	vmware_src_install
+
+	ICONDIR=/opt/vmware/workstation/lib/share/icons/hicolor/scalable/apps/
+	make_desktop_entry vmware "VMWare Workstation" ${ICONDIR}/${PN}.svg System
+	make_desktop_entry vmplayer "VMWare Player" ${ICONDIR}/vmware-player.svg System
+
+	# Nasty hack to ensure the EULA is included
+	insinto /opt/vmware/workstation/lib/share
+	newins doc/EULA EULA.txt
+}