Fixed up the vmware-player ebuild to work with the new style modules and compile ok.

Also fixed a little typo in the vmware.eclass

svn path=/trunk/; revision=54

5 files changed, 24 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index cd71df7..e820961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $ Id: $
 
+  16 Jun 2006; Mike Auty <ikelos@gentoo.org>:
+  Just a couple quick changes.
+  I modified the vmware-player-1.0.x-r5 ebuild, just a bit of clearing up.
+  I also fixed a tiny typo in the vmware.eclass.
+
+  vmware-player now seems to be a go with the new modules on ~x86 (although I've
+  left it masked).
+
   14 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>:
   Well, I've done quite a few changes.
   
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index e5d4995..52f0660 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -53,10 +53,10 @@ EBUILD vmware-player-1.0.1.19317-r4.ebuild 4421 RMD160 d01404c235d75ca4abb21fcef
 MD5 eb6fbd384f0f93ae9e0efc09874e0261 vmware-player-1.0.1.19317-r4.ebuild 4421
 RMD160 d01404c235d75ca4abb21fcefcfceb1e3d842b13 vmware-player-1.0.1.19317-r4.ebuild 4421
 SHA256 6912dd454b344f7668ca2a8bac6a3ed93999b6580633bb704a91fb071530c8a8 vmware-player-1.0.1.19317-r4.ebuild 4421
-EBUILD vmware-player-1.0.1.19317-r5.ebuild 4361 RMD160 14a4e9b407dacd1e9f15d9a94f6b7363d44b6445 SHA1 9cfcbd72866d44599964d58974d0df3b400b580e SHA256 4d1e5eb9382fd872f55b37abbc9586d52080b89e0669308a93836bf9c7ca3ff3
-MD5 41483c8b0b308102df4eb820c0b7046c vmware-player-1.0.1.19317-r5.ebuild 4361
-RMD160 14a4e9b407dacd1e9f15d9a94f6b7363d44b6445 vmware-player-1.0.1.19317-r5.ebuild 4361
-SHA256 4d1e5eb9382fd872f55b37abbc9586d52080b89e0669308a93836bf9c7ca3ff3 vmware-player-1.0.1.19317-r5.ebuild 4361
+EBUILD vmware-player-1.0.1.19317-r5.ebuild 3421 RMD160 70782b2a9c8c6a794b2b486194cc558c75d2c048 SHA1 5f0e4c243354d2d68061012aaaa14c0777205111 SHA256 67412fa3f8bf68db7691a6b054c64bb7c2f5b05e599230378364a8153db5ee05
+MD5 1d17b88b6528d5b6b83b6dd0f3290716 vmware-player-1.0.1.19317-r5.ebuild 3421
+RMD160 70782b2a9c8c6a794b2b486194cc558c75d2c048 vmware-player-1.0.1.19317-r5.ebuild 3421
+SHA256 67412fa3f8bf68db7691a6b054c64bb7c2f5b05e599230378364a8153db5ee05 vmware-player-1.0.1.19317-r5.ebuild 3421
 MISC ChangeLog 3271 RMD160 b181d1ac8ce4df3a9c6a2807482a273803045b85 SHA1 58ef63b730c1bae0cdf764c82f5e19934f85216f SHA256 a35a4da046b4c1df837ff5c2aa453616b8739d5c27fa290357ceb5ae82a64a3a
 MD5 9d571bbc8a5e1e803082db2a2fca0e72 ChangeLog 3271
 RMD160 b181d1ac8ce4df3a9c6a2807482a273803045b85 ChangeLog 3271
@@ -71,6 +71,6 @@ SHA256 bd714c9a2ce3b52e842099ea20d9e5aa917b0d0d0e758df334c426563c159084 files/di
 MD5 1a39355473a3e8ccbb43066bb59d3b11 files/digest-vmware-player-1.0.1.19317-r4 485
 RMD160 60090a1fdf14981d45257972888a772a6b7a7e4c files/digest-vmware-player-1.0.1.19317-r4 485
 SHA256 62bea80b5102a82d70ddf403735bab06ca86d4a3b5db4f501c75d3a2c7995734 files/digest-vmware-player-1.0.1.19317-r4 485
-MD5 1a39355473a3e8ccbb43066bb59d3b11 files/digest-vmware-player-1.0.1.19317-r5 485
-RMD160 60090a1fdf14981d45257972888a772a6b7a7e4c files/digest-vmware-player-1.0.1.19317-r5 485
-SHA256 62bea80b5102a82d70ddf403735bab06ca86d4a3b5db4f501c75d3a2c7995734 files/digest-vmware-player-1.0.1.19317-r5 485
+MD5 0d2ab32e5622d011b7e46c772e9ed475 files/digest-vmware-player-1.0.1.19317-r5 759
+RMD160 41e7a0dac4dcbf40d91cb01621898aaadbe64fb7 files/digest-vmware-player-1.0.1.19317-r5 759
+SHA256 bd714c9a2ce3b52e842099ea20d9e5aa917b0d0d0e758df334c426563c159084 files/digest-vmware-player-1.0.1.19317-r5 759
diff --git a/app-emulation/vmware-player/files/digest-vmware-player-1.0.1.19317-r5 b/app-emulation/vmware-player/files/digest-vmware-player-1.0.1.19317-r5
index e77ec42..f531e1f 100644
--- a/app-emulation/vmware-player/files/digest-vmware-player-1.0.1.19317-r5
+++ b/app-emulation/vmware-player/files/digest-vmware-player-1.0.1.19317-r5
@@ -1,6 +1,9 @@
 MD5 58d0aab1f3303dfb5354a929bcf1b0e9 VMware-player-1.0.1-19317.tar.gz 35786922
 RMD160 7ba3c6cefaf6fb98cc932d0974206b6b0f408a29 VMware-player-1.0.1-19317.tar.gz 35786922
 SHA256 c4b0e43ef7e56803e8bc822f2ab240bd2911019dca2d6a615e76dc41642cb4bf VMware-player-1.0.1-19317.tar.gz 35786922
+MD5 b3ce457f5b9ae8b606fd70f56084877d vmware-any-any-update101.tar.gz 296409
+RMD160 d8994b91492257d8b8e08480ab27fc307fc34095 vmware-any-any-update101.tar.gz 296409
+SHA256 b12e3a70117ef26a85c8e01a23ea7d21b62bbc86998368114f9f7932390d2037 vmware-any-any-update101.tar.gz 296409
 MD5 7ca1ec14670b51d8cf824a58bc8d6621 vmware.png 470
 RMD160 759a5530b3bb605e6bc2c1e203490163d320485d vmware.png 470
 SHA256 9bec91ecc32fa913141ca303abf1abec988ebc7fb4f27389f173bf3493bffb9b vmware.png 470
diff --git a/app-emulation/vmware-player/vmware-player-1.0.1.19317-r5.ebuild b/app-emulation/vmware-player/vmware-player-1.0.1.19317-r5.ebuild
index d195b9c..3eea0cf 100644
--- a/app-emulation/vmware-player/vmware-player-1.0.1.19317-r5.ebuild
+++ b/app-emulation/vmware-player/vmware-player-1.0.1.19317-r5.ebuild
@@ -6,13 +6,17 @@
 # to download VMWare. The agreeing to a licence is part of the configure step
 # which the user must run manually.
 
-inherit vmware eutils
+inherit eutils vmware
 
 S=${WORKDIR}/vmware-player-distrib
 MY_P="VMware-player-1.0.1-19317"
 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
+	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"
 
 LICENSE="vmware"
@@ -21,8 +25,6 @@ SLOT="0"
 KEYWORDS="-*"
 RESTRICT="strip" # fetch"
 
-VMWARE_VME="VME_V55"
-
 DEPEND="${RDEPEND} virtual/os-headers
 	!app-emulation/vmware-workstation"
 # vmware-player should not use virtual/libc as this is a 
@@ -115,38 +117,3 @@ pkg_config() {
 	einfo "Running ${dir}/bin/vmware-config.pl"
 	${dir}/bin/vmware-config.pl
 }
-
-pkg_postinst() {
-	vmware_pkg_postinst
-
-	einfo
-	einfo "You need to run ${dir}/bin/vmware-config.pl to complete the install."
-	einfo
-	einfo "For VMware Add-Ons just visit"
-	einfo "http://www.vmware.com/download/downloadaddons.html"
-	einfo
-	einfo "After configuring, type 'vmplayer' to launch"
-	einfo
-	einfo "Also note that when you reboot you should run:"
-	einfo "/etc/init.d/vmware start"
-	einfo "before trying to run vmplayer.  Or you could just add"
-	einfo "it to the default run level:"
-	einfo "rc-update add vmware default"
-	echo
-	ewarn "Remember, in order to run vmplayer, you have to"
-	ewarn "be in the '${VMWARE_GROUP}' group."
-	echo
-	ewarn "VMWare allows for the potential of overwriting files as root.  Only"
-	ewarn "give VMWare access to trusted individuals."
-
-	#ewarn "For users of glibc-2.3.x, vmware-nat support is *still* broken on 2.6.x"
-}
-
-pkg_postrm() {
-	einfo
-	einfo "To remove all traces of vmware you will need to remove the files"
-	einfo "in /etc/vmware/, /etc/init.d/vmware, /lib/modules/*/misc/vm*.o,"
-	einfo "and .vmware/ in each users home directory. Don't forget to rmmod the"
-	einfo "vm* modules, either."
-	einfo
-}
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass
index d675620..58e4970 100644
--- a/eclass/vmware.eclass
+++ b/eclass/vmware.eclass
@@ -330,7 +330,7 @@ vmware_pkg_postinst() {
 	done
 
 	# This currently points to the perl scripts, which will eventually go away.
-	case product in
+	case $product in
 		vmware)
 			config_program="vmware-config.pl"
 			;;