summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2008-06-14 23:14:05 +0000
committerMike Auty <ikelos@gentoo.org>2008-06-14 23:14:05 +0000
commitf8219b958e89ae6a7f6e3b5942ca22df385cf367 (patch)
tree5ed30d499e3b8b8274d99674680246c4c079950d /app-emulation
parentAdd in vmware-modules-1.0.0.20 for workstation 6.0.4 and player 2.0.4. (diff)
downloadgentoo-2-f8219b958e89ae6a7f6e3b5942ca22df385cf367.tar.gz
gentoo-2-f8219b958e89ae6a7f6e3b5942ca22df385cf367.tar.bz2
gentoo-2-f8219b958e89ae6a7f6e3b5942ca22df385cf367.zip
Version bump for bug 224637. Also clear out old versions.
(Portage version: 2.2_pre8/cvs/Linux 2.6.25-gentoo-r4 i686)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-player/ChangeLog44
-rw-r--r--app-emulation/vmware-player/files/1.0.5.56455/000_all_initd-location.patch31
-rw-r--r--app-emulation/vmware-player/files/1.0.5.56455/001_all_fix-permissions.patch15
-rw-r--r--app-emulation/vmware-player/files/1.0.5.56455/002_all_pagebreak-detection-fix.patch15
-rw-r--r--app-emulation/vmware-player/files/1.0.5.56455/004_all_do-not-build-modules.patch17
-rw-r--r--app-emulation/vmware-player/files/1.0.5.56455/007_all_use-modprobe-over-insmod.patch12
-rw-r--r--app-emulation/vmware-player/files/1.0.5.56455/009_all_init.d-modules-warning.patch19
-rw-r--r--app-emulation/vmware-player/files/2.0.1.55017/000_all_initd-location.patch31
-rw-r--r--app-emulation/vmware-player/files/2.0.1.55017/001_all_fix-permissions.patch15
-rw-r--r--app-emulation/vmware-player/files/2.0.1.55017/002_all_pagebreak-detection-fix.patch15
-rw-r--r--app-emulation/vmware-player/files/2.0.1.55017/004_all_do-not-build-modules.patch21
-rw-r--r--app-emulation/vmware-player/files/2.0.1.55017/007_all_use-modprobe-over-insmod.patch12
-rw-r--r--app-emulation/vmware-player/files/2.0.1.55017/009_all_init.d-modules-warning.patch19
-rw-r--r--app-emulation/vmware-player/files/2.0.1.55017/011_all_legit-modules-only.patch12
-rw-r--r--app-emulation/vmware-player/files/2.0.2.59824/000_all_initd-location.patch31
-rw-r--r--app-emulation/vmware-player/files/2.0.2.59824/001_all_fix-permissions.patch15
-rw-r--r--app-emulation/vmware-player/files/2.0.2.59824/002_all_pagebreak-detection-fix.patch15
-rw-r--r--app-emulation/vmware-player/files/2.0.2.59824/004_all_do-not-build-modules.patch21
-rw-r--r--app-emulation/vmware-player/files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch12
-rw-r--r--app-emulation/vmware-player/files/2.0.2.59824/009_all_init.d-modules-warning.patch19
-rw-r--r--app-emulation/vmware-player/files/2.0.2.59824/011_all_legit-modules-only.patch12
-rw-r--r--app-emulation/vmware-player/vmware-player-1.0.7.91707.ebuild (renamed from app-emulation/vmware-player/vmware-player-1.0.5.56455.ebuild)16
-rw-r--r--app-emulation/vmware-player/vmware-player-2.0.2.59824.ebuild102
-rw-r--r--app-emulation/vmware-player/vmware-player-2.0.4.93057.ebuild (renamed from app-emulation/vmware-player/vmware-player-2.0.1.55017.ebuild)58
24 files changed, 77 insertions, 502 deletions
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 89c89a644f90..a476fa313764 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,48 @@
# ChangeLog for app-emulation/vmware-player
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.51 2008/05/12 15:46:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.52 2008/06/14 23:14:03 ikelos Exp $
+
+*vmware-player-2.0.4.93057 (14 Jun 2008)
+*vmware-player-1.0.7.91707 (14 Jun 2008)
+
+ 14 Jun 2008; <mike@gentoo.org>
+ -files/1.0.5.56455/000_all_initd-location.patch,
+ -files/1.0.5.56455/001_all_fix-permissions.patch,
+ -files/1.0.5.56455/002_all_pagebreak-detection-fix.patch,
+ -files/1.0.5.56455/004_all_do-not-build-modules.patch,
+ -files/1.0.5.56455/007_all_use-modprobe-over-insmod.patch,
+ -files/1.0.5.56455/009_all_init.d-modules-warning.patch,
+ +files/1.0.7.91707/000_all_initd-location.patch,
+ +files/1.0.7.91707/001_all_fix-permissions.patch,
+ +files/1.0.7.91707/002_all_pagebreak-detection-fix.patch,
+ +files/1.0.7.91707/004_all_do-not-build-modules.patch,
+ +files/1.0.7.91707/007_all_use-modprobe-over-insmod.patch,
+ +files/1.0.7.91707/009_all_init.d-modules-warning.patch,
+ -files/2.0.1.55017/000_all_initd-location.patch,
+ -files/2.0.1.55017/001_all_fix-permissions.patch,
+ -files/2.0.1.55017/002_all_pagebreak-detection-fix.patch,
+ -files/2.0.1.55017/004_all_do-not-build-modules.patch,
+ -files/2.0.1.55017/007_all_use-modprobe-over-insmod.patch,
+ -files/2.0.1.55017/009_all_init.d-modules-warning.patch,
+ -files/2.0.1.55017/011_all_legit-modules-only.patch,
+ -files/2.0.2.59824/000_all_initd-location.patch,
+ -files/2.0.2.59824/001_all_fix-permissions.patch,
+ -files/2.0.2.59824/002_all_pagebreak-detection-fix.patch,
+ -files/2.0.2.59824/004_all_do-not-build-modules.patch,
+ -files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch,
+ -files/2.0.2.59824/009_all_init.d-modules-warning.patch,
+ -files/2.0.2.59824/011_all_legit-modules-only.patch,
+ +files/2.0.4.93057/000_all_initd-location.patch,
+ +files/2.0.4.93057/001_all_fix-permissions.patch,
+ +files/2.0.4.93057/002_all_pagebreak-detection-fix.patch,
+ +files/2.0.4.93057/004_all_do-not-build-modules.patch,
+ +files/2.0.4.93057/007_all_use-modprobe-over-insmod.patch,
+ +files/2.0.4.93057/009_all_init.d-modules-warning.patch,
+ +files/2.0.4.93057/011_all_legit-modules-only.patch,
+ -vmware-player-1.0.5.56455.ebuild, +vmware-player-1.0.7.91707.ebuild,
+ -vmware-player-2.0.1.55017.ebuild, -vmware-player-2.0.2.59824.ebuild,
+ +vmware-player-2.0.4.93057.ebuild:
+ Version bump for bug 224637. Also clear out old versions.
12 May 2008; Markus Meier <maekke@gentoo.org>
vmware-player-1.0.6.80404.ebuild:
diff --git a/app-emulation/vmware-player/files/1.0.5.56455/000_all_initd-location.patch b/app-emulation/vmware-player/files/1.0.5.56455/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-player/files/1.0.5.56455/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-player/files/1.0.5.56455/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/1.0.5.56455/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-player/files/1.0.5.56455/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-player/files/1.0.5.56455/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/1.0.5.56455/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-player/files/1.0.5.56455/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-player/files/1.0.5.56455/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/1.0.5.56455/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-player/files/1.0.5.56455/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-player/files/1.0.5.56455/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/1.0.5.56455/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-player/files/1.0.5.56455/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-player/files/1.0.5.56455/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/1.0.5.56455/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-player/files/1.0.5.56455/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-player/files/2.0.1.55017/000_all_initd-location.patch b/app-emulation/vmware-player/files/2.0.1.55017/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-player/files/2.0.1.55017/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{'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.1.55017/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/2.0.1.55017/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-player/files/2.0.1.55017/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-player/files/2.0.1.55017/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/2.0.1.55017/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-player/files/2.0.1.55017/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-player/files/2.0.1.55017/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/2.0.1.55017/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-player/files/2.0.1.55017/004_all_do-not-build-modules.patch
+++ /dev/null
@@ -1,21 +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
-@@ -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.1.55017/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/2.0.1.55017/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-player/files/2.0.1.55017/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-player/files/2.0.1.55017/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/2.0.1.55017/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-player/files/2.0.1.55017/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-player/files/2.0.1.55017/011_all_legit-modules-only.patch b/app-emulation/vmware-player/files/2.0.1.55017/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-player/files/2.0.1.55017/011_all_legit-modules-only.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl 2007-08-22 02:58:41.000000000 +0100
-+++ vmware-distrib/bin/vmware-config.pl 2007-09-19 20:04:57.000000000 +0100
-@@ -10127,7 +10127,7 @@
- }
-
- my @modules = non_vmware_modules_installed();
-- if (scalar(@modules) > 0) {
-+ if (scalar(@modules) < 0) {
- error("The following VMware kernel modules have been found on your system that " .
- "were not installed by the VMware Installer. Please remove them then run " .
- "this installer again.\n\n" . join("\n", @modules) . "\n\n");
diff --git a/app-emulation/vmware-player/files/2.0.2.59824/000_all_initd-location.patch b/app-emulation/vmware-player/files/2.0.2.59824/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-player/files/2.0.2.59824/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{'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.2.59824/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/2.0.2.59824/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-player/files/2.0.2.59824/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-player/files/2.0.2.59824/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/2.0.2.59824/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-player/files/2.0.2.59824/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-player/files/2.0.2.59824/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/2.0.2.59824/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-player/files/2.0.2.59824/004_all_do-not-build-modules.patch
+++ /dev/null
@@ -1,21 +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
-@@ -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.2.59824/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-player/files/2.0.2.59824/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-player/files/2.0.2.59824/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/2.0.2.59824/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-player/files/2.0.2.59824/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-player/files/2.0.2.59824/011_all_legit-modules-only.patch b/app-emulation/vmware-player/files/2.0.2.59824/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-player/files/2.0.2.59824/011_all_legit-modules-only.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
---- vmware-distrib.orig/bin/vmware-config.pl 2007-08-22 02:58:41.000000000 +0100
-+++ vmware-distrib/bin/vmware-config.pl 2007-09-19 20:04:57.000000000 +0100
-@@ -10127,7 +10127,7 @@
- }
-
- my @modules = non_vmware_modules_installed();
-- if (scalar(@modules) > 0) {
-+ if (scalar(@modules) < 0) {
- error("The following VMware kernel modules have been found on your system that " .
- "were not installed by the VMware Installer. Please remove them then run " .
- "this installer again.\n\n" . join("\n", @modules) . "\n\n");
diff --git a/app-emulation/vmware-player/vmware-player-1.0.5.56455.ebuild b/app-emulation/vmware-player/vmware-player-1.0.7.91707.ebuild
index 57486535ef90..788c0a9e1b03 100644
--- a/app-emulation/vmware-player/vmware-player-1.0.5.56455.ebuild
+++ b/app-emulation/vmware-player/vmware-player-1.0.7.91707.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-1.0.5.56455.ebuild,v 1.3 2007/11/06 23:07:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-1.0.7.91707.ebuild,v 1.1 2008/06/14 23:14:03 ikelos Exp $
-inherit eutils vmware
+inherit eutils vmware versionator
S=${WORKDIR}/vmware-player-distrib
-MY_P="VMware-player-1.0.5-56455"
+MY_P="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="http://download3.vmware.com/software/vmplayer/${MY_P}.tar.gz
@@ -14,16 +14,12 @@ SRC_URI="http://download3.vmware.com/software/vmplayer/${MY_P}.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"
+ http://knihovny.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz"
LICENSE="vmware"
IUSE=""
SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
RESTRICT="strip"
DEPEND="${RDEPEND} virtual/os-headers
diff --git a/app-emulation/vmware-player/vmware-player-2.0.2.59824.ebuild b/app-emulation/vmware-player/vmware-player-2.0.2.59824.ebuild
deleted file mode 100644
index 36855aa1811a..000000000000
--- a/app-emulation/vmware-player/vmware-player-2.0.2.59824.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.2.59824.ebuild,v 1.1 2007/11/25 12:59: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://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
- 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.17
- !<app-emulation/vmware-modules-1.0.0.17
- !>=app-emulation/vmware-modules-1.0.0.18
- 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
-}
diff --git a/app-emulation/vmware-player/vmware-player-2.0.1.55017.ebuild b/app-emulation/vmware-player/vmware-player-2.0.4.93057.ebuild
index ca874d4a7b42..abcac4c2f046 100644
--- a/app-emulation/vmware-player/vmware-player-2.0.1.55017.ebuild
+++ b/app-emulation/vmware-player/vmware-player-2.0.4.93057.ebuild
@@ -1,55 +1,47 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.1.55017.ebuild,v 1.1 2007/10/14 09:14:30 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.0.4.93057.ebuild,v 1.1 2008/06/14 23:14:03 ikelos Exp $
-inherit versionator eutils vmware
+inherit vmware eutils versionator
-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://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
- 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"
+ amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.tar.gz )"
LICENSE="vmware"
-IUSE=""
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
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
+ 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
!app-emulation/vmware-workstation
!app-emulation/vmware-server
- ~app-emulation/vmware-modules-1.0.0.17
- !<app-emulation/vmware-modules-1.0.0.17
- !>=app-emulation/vmware-modules-1.0.0.18
+ ~app-emulation/vmware-modules-1.0.0.20
+ !<app-emulation/vmware-modules-1.0.0.20
+ !>=app-emulation/vmware-modules-1.0.0.21
+ >=dev-lang/perl-5
sys-apps/pciutils"
+S=${WORKDIR}/vmware-player-distrib
+
+ANY_ANY=""
RUN_UPDATE="no"
dir=/opt/vmware/player
@@ -87,6 +79,12 @@ pkg_setup() {
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
}