Fix up bugs 219076 and 123665, remove old ebuild and fix minor QA issues.

(Portage version: 2.1.5_rc6)

15 files changed, 85 insertions, 300 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index b8a11246dd0b..7a18ccb4b473 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.174 2008/04/04 01:44:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.175 2008/04/26 16:29:15 ikelos Exp $
+
+  26 Apr 2008; Mike Auty <ikelos@gentoo.org>
+  -files/6.0.1.55017/000_all_initd-location.patch,
+  -files/6.0.1.55017/002_all_pagebreak-detection-fix.patch,
+  -files/6.0.1.55017/001_all_fix-permissions.patch,
+  -files/6.0.1.55017/004_all_do-not-build-modules.patch,
+  -files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch,
+  -files/6.0.1.55017/009_all_init.d-modules-warning.patch,
+  -files/6.0.1.55017/011_all_legit-modules-only.patch,
+  +files/vmware-player.desktop, +files/vmware-workstation.desktop,
+  vmware-workstation-5.5.6.80404.ebuild,
+  -vmware-workstation-6.0.1.55017.ebuild,
+  vmware-workstation-6.0.2.59824.ebuild,
+  vmware-workstation-6.0.3.80004.ebuild:
+  Fix up bugs 219076 and 123665, remove old ebuild and fix minor QA issues.
 
 *vmware-workstation-5.5.6.80404 (04 Apr 2008)
 
diff --git a/app-emulation/vmware-workstation/files/6.0.1.55017/000_all_initd-location.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/000_all_initd-location.patch
deleted file mode 100644
index 6eb6619d2b8e..000000000000
--- a/app-emulation/vmware-workstation/files/6.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-workstation/files/6.0.1.55017/001_all_fix-permissions.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/001_all_fix-permissions.patch
deleted file mode 100644
index e646b7b2da5c..000000000000
--- a/app-emulation/vmware-workstation/files/6.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-workstation/files/6.0.1.55017/002_all_pagebreak-detection-fix.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/002_all_pagebreak-detection-fix.patch
deleted file mode 100644
index fd3fc76ca679..000000000000
--- a/app-emulation/vmware-workstation/files/6.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-workstation/files/6.0.1.55017/004_all_do-not-build-modules.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/004_all_do-not-build-modules.patch
deleted file mode 100644
index e2649c0af27b..000000000000
--- a/app-emulation/vmware-workstation/files/6.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-workstation/files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch
deleted file mode 100644
index c29a87e8f226..000000000000
--- a/app-emulation/vmware-workstation/files/6.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-workstation/files/6.0.1.55017/009_all_init.d-modules-warning.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/009_all_init.d-modules-warning.patch
deleted file mode 100644
index 4eab043af8dc..000000000000
--- a/app-emulation/vmware-workstation/files/6.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-workstation/files/6.0.1.55017/011_all_legit-modules-only.patch b/app-emulation/vmware-workstation/files/6.0.1.55017/011_all_legit-modules-only.patch
deleted file mode 100644
index 9e453ed1e2ee..000000000000
--- a/app-emulation/vmware-workstation/files/6.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-workstation/files/vmware-player.desktop b/app-emulation/vmware-workstation/files/vmware-player.desktop
new file mode 100644
index 000000000000..755ac187e8f6
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-player.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=VMWare Player
+Type=Application
+Comment=Emulate a complete PC on your PC without the usual performance overhead of most emulators
+MimeType=application/x-vmware-vm-legacy;application/x-vmware-team;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vmdisk;application/x-vmware-team;application/x-vmware-vmfoundry;application/x-vmware-vm;application/x-vmware-snapshot;
+Exec=vmplayer
+TryExec=vmplayer
+Icon=vmware-player
+Categories=System;
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation.desktop b/app-emulation/vmware-workstation/files/vmware-workstation.desktop
new file mode 100644
index 000000000000..dc6d1164c870
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=VMWare Workstation
+Type=Application
+Comment=Emulate a complete PC on your PC without the usual performance overhead of most emulators
+MimeType=application/x-vmware-vm-legacy;application/x-vmware-team;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vm-clone;application/x-vmware-vm;application/x-vmware-vmdisk;application/x-vmware-team;application/x-vmware-vmfoundry;application/x-vmware-vm;application/x-vmware-snapshot;
+Exec=vmware
+TryExec=vmware
+Icon=vmware-workstation
+Categories=System;
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
index 438dd8bf4edf..f3c16ce96134 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild
@@ -1,6 +1,6 @@
-# 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-workstation/vmware-workstation-4.5.3.19414-r7.ebuild,v 1.7 2007/07/13 00:36:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414-r7.ebuild,v 1.8 2008/04/26 16:29:15 ikelos Exp $
 
 # Alter ebuild so that the metadata cache is invalidated.
 
@@ -89,7 +89,7 @@ src_install() {
 	vmware_src_install
 	# We remove the rpath libgdk_pixbuf stuff, to resolve bug #81344.
 	perl -pi -e 's#/tmp/rrdharan/out#/opt/vmware/null/#sg' \
-		${Ddir}/lib/lib/libgdk_pixbuf.so.2/lib{gdk_pixbuf.so.2,pixbufloader-{xpm,png}.so.1.0.0} \
+		"${Ddir}"/lib/lib/libgdk_pixbuf.so.2/lib{gdk_pixbuf.so.2,pixbufloader-{xpm,png}.so.1.0.0} \
 		|| die "Removing rpath"
 
 	make_desktop_entry vmware "VMware Workstation" ${PN}.png
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
index 79621457fbf9..128cbb352dce 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.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-workstation/vmware-workstation-5.5.6.80404.ebuild,v 1.1 2008/04/04 01:44:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.6.80404.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
 inherit vmware eutils versionator
 
@@ -10,6 +10,7 @@ DESCRIPTION="Emulate a complete PC on your PC without the usual performance over
 HOMEPAGE="http://www.vmware.com/download/ws/ws5.html"
 SRC_URI="mirror://vmware/software/wkst/${MY_P}.tar.gz
 	http://download.softpedia.ro/linux/${MY_P}.tar.gz
+	mirror://gentoo/${ANY_ANY}.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
@@ -86,7 +87,7 @@ src_install() {
 
 	doicon lib/share/pixmaps/vmware-player.png
 	# Fix an ugly GCC error on start
-	rm -f ${Ddir}lib/lib/libgcc_s.so.1/libgcc_s.so.1
+	rm -f "${Ddir}lib/lib/libgcc_s.so.1/libgcc_s.so.1"
 	make_desktop_entry vmware "VMWare Workstation" ${PN}.png System
 	make_desktop_entry vmplayer "VMWare Player" vmware-player.png System
 }
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.1.55017.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.1.55017.ebuild
deleted file mode 100644
index 4f23760b7182..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.1.55017.ebuild
+++ /dev/null
@@ -1,137 +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-workstation/vmware-workstation-6.0.1.55017.ebuild,v 1.1 2007/10/14 09:03:41 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 )
-	mirror://gentoo/${ANY_ANY}.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"
-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.17
-	!<app-emulation/vmware-modules-1.0.0.17
-	!>=app-emulation/vmware-modules-1.0.0.18
-	>=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() {
-	if use x86; then
-		MY_P="${MY_PN}.i386"
-	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
-	fi
-
-	einfo "Please download the ${MY_P}.tar.gz at ${HOMEPAGE}"
-	einfo "${ANY_ANY}.tar.gz is also necessary for compilation"
-	einfo "but should already have been fetched."
-}
-
-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
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild
index 1b8fd90d9a45..22e079d02318 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild
@@ -1,6 +1,6 @@
-# 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-workstation/vmware-workstation-6.0.2.59824.ebuild,v 1.1 2007/11/25 12:50:31 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.2.59824.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
 inherit vmware eutils versionator
 
@@ -15,13 +15,7 @@ SRC_URI="
 	amd64? (
 		mirror://vmware/software/wkst/${MY_PN}.x86_64.tar.gz
 		http://download.softpedia.ro/linux/${MY_PN}.x86_64.tar.gz )
-	mirror://gentoo/${ANY_ANY}.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"
 SLOT="0"
@@ -60,6 +54,7 @@ RDEPEND="sys-libs/glibc
 
 S=${WORKDIR}/vmware-distrib
 
+ANY_ANY=""
 RUN_UPDATE="no"
 
 dir=/opt/vmware/workstation
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild
index 373598a30dc8..78f0dd1d2a5a 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 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.3.80004.ebuild,v 1.1 2008/03/22 09:39:38 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.0.3.80004.ebuild,v 1.2 2008/04/26 16:29:15 ikelos Exp $
 
-inherit vmware eutils versionator
+inherit vmware eutils versionator fdo-mime gnome2-utils
 
 MY_PN="VMware-workstation-$(replace_version_separator 3 - $PV)"
 
@@ -26,24 +26,15 @@ 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 )
+	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-player
 	!app-emulation/vmware-server
 	~app-emulation/vmware-modules-1.0.0.17
@@ -124,11 +115,36 @@ pkg_nofetch() {
 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
+	# move the icons into a location where DEs will find it:
+	ICONDIR=/opt/vmware/workstation/lib/share/icons/hicolor
+	rm "${D}${ICONDIR}/index.theme"
+	mkdir -p "${D}/usr/share/icons"
+	mv "${D}${ICONDIR}" "${D}/usr/share/icons"
+	ln -s /usr/share/icons/hicolor "${D}${ICONSDIR}"
+
+	# install .desktop files:
+	insinto /usr/share/applications
+	doins "${FILESDIR}/vmware-workstation.desktop"
+	doins "${FILESDIR}/vmware-player.desktop"
 
 	# Nasty hack to ensure the EULA is included
 	insinto /opt/vmware/workstation/lib/share
 	newins doc/EULA EULA.txt
 }
+
+pkg_preinst() {
+	vmware_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	vmware_pkg_postinst
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	vmware_pkg_postrm
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}