Patched vmware-config.pl to no longer install .desktop and mime-type files. Also updated to vmware-any-any-update92 for 2.6.12 support. Closing bug #89765 and bug #96623.

Package-Manager: portage-2.0.51.22-r1

7 files changed, 98 insertions, 19 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 39147d72c4af..d810a7b05530 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.86 2005/05/16 12:52:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.87 2005/06/20 21:38:34 wolf31o2 Exp $
+
+*vmware-workstation-5.0.0.13124-r1 (20 Jun 2005)
+
+  20 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/vmware-workstation-5.0.0.13124-config.patch, +files/vmware.xml,
+  -vmware-workstation-5.0.0.13124.ebuild,
+  +vmware-workstation-5.0.0.13124-r1.ebuild:
+  Patched vmware-config.pl to no longer install .desktop and mime-type files.
+  Also updated to vmware-any-any-update92 for 2.6.12 support. Closing bug
+  #89765 and bug #96623.
 
   16 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   vmware-workstation-3.2.1.2242-r3.ebuild:
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 38c7b975788d..a24d44298400 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,15 +1,17 @@
-MD5 e23605cd56ad0c5bcbd0bf9ddb0ecb54 vmware-workstation-3.2.1.2242-r3.ebuild 7008
-MD5 b1a9c17b60200fbacb90bcc5f52300c8 ChangeLog 19304
+MD5 bc29994bf16d544c416315ab90ac75a6 ChangeLog 19746
 MD5 a4e5ebe5e931d6196fd49550e067b078 metadata.xml 339
+MD5 e23605cd56ad0c5bcbd0bf9ddb0ecb54 vmware-workstation-3.2.1.2242-r3.ebuild 7008
 MD5 6322c596637acf3290fb26e43a86d3ba vmware-workstation-4.5.2.8848-r6.ebuild 7436
-MD5 462be55d8a3b2f42015777ff63d89980 vmware-workstation-5.0.0.13124.ebuild 7124
+MD5 73aa8f34a7952c94a7a486b9392506c5 vmware-workstation-5.0.0.13124-r1.ebuild 7389
+MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 MD5 48c1667773503fee21a1068da07440b9 files/90vmware 70
-MD5 503ebd95e8ad99236f41e645ff10a7e3 files/digest-vmware-workstation-4.5.2.8848-r6 210
 MD5 b80ea2244bdd40a6d854ea4147b6f9ee files/digest-vmware-workstation-3.2.1.2242-r3 210
+MD5 503ebd95e8ad99236f41e645ff10a7e3 files/digest-vmware-workstation-4.5.2.8848-r6 210
+MD5 b3f5016631bd476afd2204a056163bd2 files/digest-vmware-workstation-5.0.0.13124-r1 159
 MD5 c2dc0111fb5bf45ff99578b57d349cb3 files/vmware.rc 1417
 MD5 87e9f24e29aaec45c84f7e57a50f96f2 files/vmware-workstation-4.5.2.8848-librarypath.patch 807
-MD5 c19a5d07e5d5f70b70788e595e0c9b4e files/digest-vmware-workstation-5.0.0.13124 211
+MD5 55441829b237e3efd78d06a1b1a73035 files/vmware-workstation-5.0.0.13124-config.patch 443
 MD5 48c1667773503fee21a1068da07440b9 files/3.2.1.2242/90vmware 70
+MD5 cd2c7dfb0ea80293b3647713f5e35969 files/3.2.1.2242/vmware 1419
 MD5 3bfb39f5e96f60db67c7246f74c21501 files/3.2.1.2242/vmware-config.pl-gcc-generalized.patch 2948
 MD5 b95a250f31a6d2005176b27b8d48c182 files/3.2.1.2242/vmware-glibc-2.3.2-compat.c 1039
-MD5 cd2c7dfb0ea80293b3647713f5e35969 files/3.2.1.2242/vmware 1419
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124
deleted file mode 100644
index 952bac60433d..000000000000
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 91821fc2649749911f0e2d0ca37b3eb8 VMware-workstation-5.0.0-13124.tar.gz 68451550
-MD5 b8f6498f5275dc8ef3ea2d2e17061ede vmware-any-any-update90.tar.gz 265385
-MD5 7ca1ec14670b51d8cf824a58bc8d6621 vmware.png 470
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r1 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r1
new file mode 100644
index 000000000000..509f8d3f8065
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-5.0.0.13124-r1
@@ -0,0 +1,2 @@
+MD5 91821fc2649749911f0e2d0ca37b3eb8 VMware-workstation-5.0.0-13124.tar.gz 68451550
+MD5 e320e831fd0523c14c720bd6e815a0b8 vmware-any-any-update92.tar.gz 271271
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-5.0.0.13124-config.patch b/app-emulation/vmware-workstation/files/vmware-workstation-5.0.0.13124-config.patch
new file mode 100644
index 000000000000..7e8a629cf399
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-workstation-5.0.0.13124-config.patch
@@ -0,0 +1,13 @@
+--- vmware-distrib/bin/vmware-config.pl.org	2005-04-20 14:08:32.000000000 -0700
++++ vmware-distrib/bin/vmware-config.pl	2005-04-20 14:30:10.000000000 -0700
+@@ -7875,8 +7875,8 @@ sub main {
+   }
+   if (vmware_product() ne 'server') {
+     configure_gtk2();
+-    createMimePackageFile();
+-    configureDesktopFiles();
++    #createMimePackageFile();
++    #configureDesktopFiles();
+     configure_mon();
+     configure_pp();
+     configure_net();
diff --git a/app-emulation/vmware-workstation/files/vmware.xml b/app-emulation/vmware-workstation/files/vmware.xml
new file mode 100644
index 000000000000..8d5e2eff56b6
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+  <comment xml:lang="en">VMware virtual machine</comment>
+  <magic priority="50">
+   <match type="string" value='config.version = "' offset="0:4096"/>
+  </magic>
+  <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+  <comment xml:lang="en">VMware virtual disk</comment>
+  <magic priority="50">
+   <match type="string" value="# Disk DescriptorFile" offset="0"/>
+   <match type="string" value="KDMV" offset="0"/>
+  </magic>
+  <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+  <comment xml:lang="en">VMware team</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+  <comment xml:lang="en">VMware virtual machine snapshot</comment>
+  <magic priority="50">
+   <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+  </magic>
+  <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+  <comment xml:lang="en">VMware virtual machine foundry</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r1.ebuild
index 46067b12d21e..e6975c7a7807 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0.0.13124.ebuild,v 1.3 2005/05/02 19:02:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.0.0.13124-r1.ebuild,v 1.1 2005/06/20 21:38:34 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -9,7 +9,7 @@
 inherit eutils
 
 S=${WORKDIR}/vmware-distrib
-ANY_ANY="vmware-any-any-update90"
+ANY_ANY="vmware-any-any-update92"
 NP="VMware-workstation-5.0.0-13124"
 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"
@@ -25,8 +25,7 @@ SRC_URI="http://vmware-svca.www.conxion.com/software/wkst/${NP}.tar.gz
 	http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
 	http://ftp.cvut.cz/vmware/obselete/${ANY_ANY}.tar.gz
 	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-	http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${ANY_ANY}.tar.gz
-	mirror://gentoo/vmware.png"
+	http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${ANY_ANY}.tar.gz"
 
 LICENSE="vmware"
 IUSE=""
@@ -49,16 +48,19 @@ Ddir=${D}/${dir}
 src_unpack() {
 	unpack ${NP}.tar.gz
 	cd ${S}
+	# patch the config to not install desktop/icon files
+	epatch ${FILESDIR}/${P}-config.patch
 	unpack ${ANY_ANY}.tar.gz
 	mv -f ${ANY_ANY}/*.tar ${S}/lib/modules/source/
 	cd ${S}/${ANY_ANY}
 	chmod 755 ../lib/bin/vmware ../bin/vmnet-bridge ../lib/bin/vmware-vmx ../lib/bin-debug/vmware-vmx
-	# vmware any90 still doesn't patch the vmware binary
+	# vmware any92 still doesn't patch the vmware binary
 	#./update vmware ../lib/bin/vmware || die
 	#./update bridge ../bin/vmnet-bridge || die
 	#./update vmx ../lib/bin/vmware-vmx || die
 	#./update vmxdebug ../lib/bin-debug/vmware-vmx || die
 }
+
 src_install() {
 	dodir ${dir}/bin
 	cp -a bin/* ${Ddir}/bin
@@ -69,6 +71,8 @@ src_install() {
 	# Since with Gentoo we compile everthing it doesn't make sense to keep
 	# the precompiled modules arround. Saves about 4 megs of disk space too.
 	rm -rf ${Ddir}/lib/modules/binary
+	# We also don't need to keep the icons around
+	rm -rf ${Ddir}/lib/share/icons
 	# We set vmware-vmx and vmware-ping suid
 	chmod u+s ${Ddir}/bin/vmware-ping
 	chmod u+s ${Ddir}/lib/bin/vmware-vmx
@@ -105,12 +109,13 @@ src_install() {
 	# package which would rmdir the /etc/vmware/init.d/rc?.d directories.
 	keepdir /etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d
 
-	# A simple icon I made
 	insinto ${dir}/lib/icon
-	doins ${DISTDIR}/vmware.png || die
-	doicon ${DISTDIR}/vmware.png || die
+	doins ${S}/lib/share/icons/48x48/apps/${PN}.png || die
+	doicon ${S}/lib/share/icons/48x48/apps/${PN}.png || die
+	insinto /usr/share/mime/packages
+	doins ${FILESDIR}/vmware.xml
 
-	make_desktop_entry vmware "VMWare Workstation" vmware.png
+	make_desktop_entry vmware "VMWare Workstation" ${PN}.png
 
 	dodir /usr/bin
 	dosym ${dir}/bin/vmware /usr/bin/vmware
@@ -169,6 +174,8 @@ pkg_config() {
 }
 
 pkg_postinst() {
+	update-mime-database /usr/share/mime
+
 	# This is to fix the problem where the not_configured file doesn't get
 	# removed when the configuration is run. This doesn't remove the file
 	# It just tells the vmware-config.pl script it can delete it.