Version bump, new version supports 64-bit natively and USB 2.0.

(Portage version: 2.1.3_rc4)

9 files changed, 241 insertions, 1 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index a9e888461aba..9801f56e9620 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emulation/vmware-player
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.34 2007/06/16 12:57:54 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.35 2007/06/24 18:53:44 ikelos Exp $
+
+*vmware-player-2.0.0.45731 (24 Jun 2007)
+
+  24 Jun 2007; Mike Auty <ikelos@gentoo.org>
+  +files/2.0.0.45731/000_all_initd-location.patch,
+  +files/2.0.0.45731/001_all_fix-permissions.patch,
+  +files/2.0.0.45731/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.0.45731/004_all_do-not-build-modules.patch,
+  +files/2.0.0.45731/007_all_use-modprobe-over-insmod.patch,
+  +files/2.0.0.45731/009_all_init.d-modules-warning.patch,
+  +vmware-player-2.0.0.45731.ebuild:
+  Version bump, new version supports 64-bit natively and USB 2.0.
 
 *vmware-player-1.0.3.34682-r1 (16 Jun 2007)
 
diff --git a/app-emulation/vmware-player/files/2.0.0.45731/000_all_initd-location.patch b/app-emulation/vmware-player/files/2.0.0.45731/000_all_initd-location.patch
new file mode 100644
index 000000000000..6eb6619d2b8e
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.0.0.45731/000_all_initd-location.patch
@@ -0,0 +1,31 @@
+--- 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{'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-player/files/2.0.0.45731/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/2.0.0.45731/001_all_fix-permissions.patch
new file mode 100644
index 000000000000..e646b7b2da5c
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.0.0.45731/001_all_fix-permissions.patch
@@ -0,0 +1,15 @@
+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-player/files/2.0.0.45731/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/2.0.0.45731/002_all_pagebreak-detection-fix.patch
new file mode 100644
index 000000000000..fd3fc76ca679
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.0.0.45731/002_all_pagebreak-detection-fix.patch
@@ -0,0 +1,15 @@
+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-player/files/2.0.0.45731/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/2.0.0.45731/004_all_do-not-build-modules.patch
new file mode 100644
index 000000000000..e2649c0af27b
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.0.0.45731/004_all_do-not-build-modules.patch
@@ -0,0 +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
+@@ -10158,13 +10158,13 @@
+     configure_gtk2();
+ #   createMimePackageFile();
+ #   configureDesktopFiles();
+-    configure_mon();
++#   configure_mon();
+     if (isDesktopProduct()) {
+-      build_vmblock();
++#     build_vmblock();
+     }
+-    configure_pp();
++#   configure_pp();
+     configure_net();
+-    build_vmnet();
++#   build_vmnet();
+   }
+ 
+    configure_eclipse_plugin();
diff --git a/app-emulation/vmware-player/files/2.0.0.45731/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/2.0.0.45731/007_all_use-modprobe-over-insmod.patch
new file mode 100644
index 000000000000..c29a87e8f226
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.0.0.45731/007_all_use-modprobe-over-insmod.patch
@@ -0,0 +1,12 @@
+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-player/files/2.0.0.45731/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/2.0.0.45731/009_all_init.d-modules-warning.patch
new file mode 100644
index 000000000000..4eab043af8dc
--- /dev/null
+++ b/app-emulation/vmware-player/files/2.0.0.45731/009_all_init.d-modules-warning.patch
@@ -0,0 +1,19 @@
+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-player/files/digest-vmware-player-2.0.0.45731 b/app-emulation/vmware-player/files/digest-vmware-player-2.0.0.45731
new file mode 100644
index 000000000000..41f8191ffd00
--- /dev/null
+++ b/app-emulation/vmware-player/files/digest-vmware-player-2.0.0.45731
@@ -0,0 +1,15 @@
+MD5 090b02f6a49dd3a4e8617f68e1d2dc7b VMware-player-2.0.0-45731.i386.tar.gz 66424421
+RMD160 185c262e179af9cb911bfd364f063ca39a0575f5 VMware-player-2.0.0-45731.i386.tar.gz 66424421
+SHA256 25a1d33f1ce50a88f046274f0499f83ab27a42c838cc552b884127d5b3701e40 VMware-player-2.0.0-45731.i386.tar.gz 66424421
+MD5 2bfbc79f548f082818b44b980d9e1c71 VMware-player-2.0.0-45731.x86_64.tar.gz 32364670
+RMD160 75a3f45b68e62d1501b5ac8359805e2499d37b33 VMware-player-2.0.0-45731.x86_64.tar.gz 32364670
+SHA256 52ce69de70c0f55e9f95b03a9d397276236dd133e5ea5c616304220444d6e8b1 VMware-player-2.0.0-45731.x86_64.tar.gz 32364670
+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
+MD5 062f83a22822b6e4d4a176e3648c38d8 vmware-libcrypto.so.0.9.7l.tar.bz2 412159
+RMD160 89282ae9fc6e8921a47704bc9cd23cf70a6870e8 vmware-libcrypto.so.0.9.7l.tar.bz2 412159
+SHA256 fae52acf61415959cca763a715a2b61ec49f161a416d418d6a1faffce531db12 vmware-libcrypto.so.0.9.7l.tar.bz2 412159
+MD5 913acecb0f79113de958e6a70618be7f vmware-libssl.so.0.9.7l.tar.bz2 78244
+RMD160 195dd4808e60f81621e6ed12b843ded49c0fa747 vmware-libssl.so.0.9.7l.tar.bz2 78244
+SHA256 3e1e13196066dc5b77d3ef6b5df55a29156eba1f39661e40cd617b538220d089 vmware-libssl.so.0.9.7l.tar.bz2 78244
diff --git a/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild b/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild
new file mode 100644
index 000000000000..2e8888a9ac32
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild,v 1.1 2007/06/24 18:53:44 ikelos Exp $
+
+inherit versionator eutils vmware
+
+S=${WORKDIR}/vmware-player-distrib
+MY_PN="VMware-player-$(get_version_component_range 1-3)-$(get_version_component_range 4)"
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+SRC_URI="x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.tar.gz )
+	amd64? ( mirror://vmware/software/vmplayer/${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
+	http://dev.gentoo.org/~wolf31o2/sources/dump/vmware-libssl.so.0.9.7l.tar.bz2
+	mirror://gentoo/vmware-libssl.so.0.9.7l.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/sources/dump/vmware-libcrypto.so.0.9.7l.tar.bz2
+	mirror://gentoo/vmware-libcrypto.so.0.9.7l.tar.bz2"
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+S=${WORKDIR}/vmware-player-distrib
+
+DEPEND="${RDEPEND} virtual/os-headers
+	!app-emulation/vmware-workstation"
+# vmware-player 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
+		virtual/xft )
+	>=dev-lang/perl-5
+	!app-emulation/vmware-workstation
+	!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
+	sys-apps/pciutils"
+
+RUN_UPDATE="no"
+
+dir=/opt/vmware/player
+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-ping
+	${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-ping
+	${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
+	vmware_pkg_setup
+}
+
+src_install() {
+	vmware_src_install
+
+	doicon lib/share/pixmaps/vmware-player.png
+	make_desktop_entry vmplayer "VMWare Player" vmware-player.png System
+
+	# Nasty hack to ensure the EULA is included
+	insinto /opt/vmware/player/lib/share
+	newins doc/EULA EULA.txt
+}