Version bump 1.0.8 and 2.0.5.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

16 files changed, 41 insertions, 241 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 52e4b343f3a3..93056bc07ad9 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,40 @@
 # 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.56 2008/07/03 13:51:35 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.57 2008/09/30 16:00:24 ikelos Exp $
+
+*vmware-player-2.0.5.109488 (30 Sep 2008)
+*vmware-player-1.0.8.108000 (30 Sep 2008)
+
+  30 Sep 2008; Mike Auty <ikelos@gentoo.org>
+  -files/1.0.6.80404/000_all_initd-location.patch,
+  -files/1.0.6.80404/001_all_fix-permissions.patch,
+  -files/1.0.6.80404/002_all_pagebreak-detection-fix.patch,
+  -files/1.0.6.80404/004_all_do-not-build-modules.patch,
+  -files/1.0.6.80404/007_all_use-modprobe-over-insmod.patch,
+  -files/1.0.6.80404/009_all_init.d-modules-warning.patch,
+  +files/1.0.8.108000/000_all_initd-location.patch,
+  +files/1.0.8.108000/001_all_fix-permissions.patch,
+  +files/1.0.8.108000/002_all_pagebreak-detection-fix.patch,
+  +files/1.0.8.108000/004_all_do-not-build-modules.patch,
+  +files/1.0.8.108000/007_all_use-modprobe-over-insmod.patch,
+  +files/1.0.8.108000/009_all_init.d-modules-warning.patch,
+  -files/2.0.3.80004/000_all_initd-location.patch,
+  -files/2.0.3.80004/001_all_fix-permissions.patch,
+  -files/2.0.3.80004/002_all_pagebreak-detection-fix.patch,
+  -files/2.0.3.80004/004_all_do-not-build-modules.patch,
+  -files/2.0.3.80004/007_all_use-modprobe-over-insmod.patch,
+  -files/2.0.3.80004/009_all_init.d-modules-warning.patch,
+  -files/2.0.3.80004/011_all_legit-modules-only.patch,
+  +files/2.0.5.109488/000_all_initd-location.patch,
+  +files/2.0.5.109488/001_all_fix-permissions.patch,
+  +files/2.0.5.109488/002_all_pagebreak-detection-fix.patch,
+  +files/2.0.5.109488/004_all_do-not-build-modules.patch,
+  +files/2.0.5.109488/007_all_use-modprobe-over-insmod.patch,
+  +files/2.0.5.109488/009_all_init.d-modules-warning.patch,
+  +files/2.0.5.109488/011_all_legit-modules-only.patch,
+  -vmware-player-1.0.6.80404.ebuild, +vmware-player-1.0.8.108000.ebuild,
+  -vmware-player-2.0.3.80004.ebuild, +vmware-player-2.0.5.109488.ebuild:
+  Version bump 1.0.8 and 2.0.5.
 
   03 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
   vmware-player-1.0.7.91707.ebuild:
diff --git a/app-emulation/vmware-player/files/1.0.6.80404/000_all_initd-location.patch b/app-emulation/vmware-player/files/1.0.6.80404/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-player/files/1.0.6.80404/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.6.80404/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/1.0.6.80404/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-player/files/1.0.6.80404/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.6.80404/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/1.0.6.80404/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-player/files/1.0.6.80404/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.6.80404/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/1.0.6.80404/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-player/files/1.0.6.80404/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.6.80404/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/1.0.6.80404/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-player/files/1.0.6.80404/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.6.80404/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/1.0.6.80404/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-player/files/1.0.6.80404/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.3.80004/000_all_initd-location.patch b/app-emulation/vmware-player/files/2.0.3.80004/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-player/files/2.0.3.80004/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.3.80004/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/2.0.3.80004/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-player/files/2.0.3.80004/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.3.80004/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/2.0.3.80004/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-player/files/2.0.3.80004/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.3.80004/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/2.0.3.80004/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-player/files/2.0.3.80004/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.3.80004/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/2.0.3.80004/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-player/files/2.0.3.80004/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.3.80004/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/2.0.3.80004/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-player/files/2.0.3.80004/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.3.80004/011_all_legit-modules-only.patch b/app-emulation/vmware-player/files/2.0.3.80004/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-player/files/2.0.3.80004/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.6.80404.ebuild b/app-emulation/vmware-player/vmware-player-1.0.8.108000.ebuild
index 75ea5f9a7483..d79cd62ebaca 100644
--- a/app-emulation/vmware-player/vmware-player-1.0.6.80404.ebuild
+++ b/app-emulation/vmware-player/vmware-player-1.0.8.108000.ebuild
@@ -1,6 +1,6 @@
 # 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.6.80404.ebuild,v 1.3 2008/05/12 15:46:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-1.0.8.108000.ebuild,v 1.1 2008/09/30 16:00:24 ikelos Exp $
 
 inherit eutils vmware versionator
 
@@ -19,7 +19,7 @@ SRC_URI="http://download3.vmware.com/software/vmplayer/${MY_P}.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.3.80004.ebuild b/app-emulation/vmware-player/vmware-player-2.0.5.109488.ebuild
index 8d3cd754a699..059505339fea 100644
--- a/app-emulation/vmware-player/vmware-player-2.0.3.80004.ebuild
+++ b/app-emulation/vmware-player/vmware-player-2.0.5.109488.ebuild
@@ -1,6 +1,6 @@
 # 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.3.80004.ebuild,v 1.2 2008/04/26 15:19:44 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.0.5.109488.ebuild,v 1.1 2008/09/30 16:00:24 ikelos Exp $
 
 inherit vmware eutils versionator
 
@@ -33,9 +33,9 @@ RDEPEND="sys-libs/glibc
 	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.22
+	!<app-emulation/vmware-modules-1.0.0.22
+	!>=app-emulation/vmware-modules-1.0.0.23
 	>=dev-lang/perl-5
 	sys-apps/pciutils"