bug 354383

(Portage version: 2.1.9.43/cvs/Linux x86_64)

8 files changed, 11 insertions, 191 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 4efcbbd47f8c..f8a30e0e39cf 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/vmware-player
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.89 2011/02/26 15:42:17 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.90 2011/03/16 13:28:23 vadimk Exp $
+
+  16 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+  -files/1.0.9.126128/000_all_initd-location.patch,
+  -files/1.0.9.126128/001_all_fix-permissions.patch,
+  -files/1.0.9.126128/002_all_pagebreak-detection-fix.patch,
+  -files/1.0.9.126128/004_all_do-not-build-modules.patch,
+  -files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch,
+  -files/1.0.9.126128/009_all_init.d-modules-warning.patch,
+  -vmware-player-1.0.9.126128.ebuild:
+  Bug 354383
 
   26 Feb 2011; Vadim Kuznetsov <vadimk@gentoo.org>
   -files/vmware-player-2.5.4.246459-installer.patch,
diff --git a/app-emulation/vmware-player/files/1.0.9.126128/000_all_initd-location.patch b/app-emulation/vmware-player/files/1.0.9.126128/000_all_initd-location.patch
deleted file mode 100644
index 1d864f7e0dd7..000000000000
--- a/app-emulation/vmware-player/files/1.0.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-player/files/1.0.9.126128/001_all_fix-permissions.patch b/app-emulation/vmware-player/files/1.0.9.126128/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-player/files/1.0.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-player/files/1.0.9.126128/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-player/files/1.0.9.126128/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-player/files/1.0.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-player/files/1.0.9.126128/004_all_do-not-build-modules.patch b/app-emulation/vmware-player/files/1.0.9.126128/004_all_do-not-build-modules.patch
deleted file mode 100644
index cec3b3ee4c1d..000000000000
--- a/app-emulation/vmware-player/files/1.0.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-player/files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-player/files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index 5509d249f19a..000000000000
--- a/app-emulation/vmware-player/files/1.0.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-player/files/1.0.9.126128/009_all_init.d-modules-warning.patch b/app-emulation/vmware-player/files/1.0.9.126128/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-player/files/1.0.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-player/vmware-player-1.0.9.126128.ebuild b/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild
deleted file mode 100644
index a2e5f358f3f9..000000000000
--- a/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild
+++ /dev/null
@@ -1,81 +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-player/vmware-player-1.0.9.126128.ebuild,v 1.4 2010/03/09 11:59:10 abcd Exp $
-
-inherit eutils vmware versionator
-
-S=${WORKDIR}/vmware-player-distrib
-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="mirror://vmware/software/vmplayer/${MY_P}.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"
-IUSE=""
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="strip"
-
-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
-		x11-libs/libXft )
-	>=dev-lang/perl-5
-	!app-emulation/vmware-workstation
-	!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
-	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"
-
-src_install() {
-	vmware_src_install
-
-	make_desktop_entry vmplayer "VMware Player" ${PN} System
-}