renaming vmware-modules, mostly

svn path=/trunk/; revision=416

12 files changed, 96 insertions, 74 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 41b0a48..27d5bc2 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -12,6 +12,7 @@ AUX patches/vmnet/025_all_kernel-2.6.25.patch 939 RMD160 c7f9f0b9e7bf98b4b37db70
 AUX patches/vmnet/030_all_kernel-2.6.27.patch 2236 RMD160 1b415cd3aeab9a7ce1cb23e9efc99534983e6645 SHA1 26e62550971e5f4f1328a0c546e219d0e493f781 SHA256 43f3f49c21c797a6ee184af258eef61dd2fd9b9e2be2f104a86607e28ffcd36a
 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d
-EBUILD vmware-modules-1.0.0.27.ebuild 1750 RMD160 887d8a6b89fc1f7ad05839330f2036f7c0350105 SHA1 e1586a8ecbdfe919007f29a3a33f6d642eee8dbf SHA256 f8b04e9144a51700ac9396a04d147f2ee81192ec0a2167e7ddc73f50671a5b09
+EBUILD vmware-modules-235.ebuild 1751 RMD160 7d4e22ef6f9b51fb2dd049a4c314076d87d9aaaf SHA1 60f8ca5fa83fa91efc955d1b378273229c7b170a SHA256 a6743d81f7625e53633fc860ee604acc1a63388a801e6a8fc9e9671125ef2371
+EBUILD vmware-modules-238.ebuild 1751 RMD160 b6dc7365a95d5084bfe5fcd38c06df2704f5a970 SHA1 db766bc6df84a6083f9838cce7510f0555a3a3f1 SHA256 3de9f3998603978cd2a1ec0a96d790f071a1b5eaacf97ca17081d539acfc4df2
 MISC ChangeLog 1155 RMD160 0e419cfe24a45e5433fd9e2a65c779de4736abb4 SHA1 748c47e9b622b2d17468d67eec1a0164a3737c0e SHA256 82fa5cd4d5e8f1a176607f91aaf8ddf84cc074e1e2389020d1df3f0d7e37ea1d
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-modules/vmware-modules-235.ebuild b/app-emulation/vmware-modules/vmware-modules-235.ebuild
new file mode 100644
index 0000000..e9df654
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-235.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.2 2010/05/03 16:53:39 vadimk Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic linux-mod
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( ~app-emulation/vmware-player-3.0.1.227600
+		 ~app-emulation/vmware-workstation-7.0.1.227600 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.0.0.26-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/1.0.0.26-makefile-include.patch"
+	epatch "${FILESDIR}/apic.patch"
+}
+
+src_install() {
+	# this adds udev rules for vmmon*
+	if echo ${VMWARE_MODULE_LIST} | grep -q vmmon ; then
+		dodir /etc/udev/rules.d
+		echo 'KERNEL=="vmmon*", GROUP="'${VMWARE_GROUP}'", MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
+		echo 'KERNEL=="vmnet*", GROUP="'${VMWARE_GROUP}'", MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
+	fi
+
+	linux-mod_src_install
+}
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.27.ebuild b/app-emulation/vmware-modules/vmware-modules-238.ebuild
index 0bf2b3b..407db91 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.27.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-238.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
 	|| ( ~app-emulation/vmware-player-3.1.0.261024
-		~app-emulation/vmware-workstation-7.1.0.261024 )"
+		 ~app-emulation/vmware-workstation-7.1.0.261024 )"
 
 S=${WORKDIR}
 
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 3a85eb1..863bd77 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -6,7 +6,7 @@ DIST VMware-Player-3.0.1-227600.i386.bundle 84974107 RMD160 4337339976d25d8dbd1f
 DIST VMware-Player-3.0.1-227600.x86_64.bundle 79959324 RMD160 c6652acadc760bab8ecfed2682706e31f51423ef SHA1 84f25370d24c03a18968a4f4c8e06cef3d21c2df SHA256 8347b3fa0c1cd1c88c3c8049462f3d0d752d6f7daa747a7d2a67667a3f55f190
 DIST VMware-Player-3.1.0-261024.i386.bundle 106519865 RMD160 008cb206b9c17167b655bc89957998da25ccb03f SHA1 147a6a2f19559804ed90e0ff5c545b8b31c400a1 SHA256 39156e974d75b0547e657c4aeea4a9fb401a0c3756205f7c8aec4f44754bb6e7
 DIST VMware-Player-3.1.0-261024.x86_64.bundle 102467637 RMD160 d0911964f94a5d07511ae3fca7928563056830c9 SHA1 6d6a54b3a63f1682ad543c0fcf55b574cdf9eebe SHA256 1dd92f0ca33f3e77be257b8e46ef42ca63562dba98bfa4ae4b211126eca2e59d
-EBUILD vmware-player-3.0.1.227600-r6.ebuild 9337 RMD160 21e041803cff26bc788d34690c800bdb06ca49fb SHA1 2f378a122893144c153e5cc8516f0919866d308a SHA256 92bc4595a2518786380fd5b2191a2ec84e8d7b52e1d2d8cbabc73d407663c2fc
-EBUILD vmware-player-3.1.0.261024.ebuild 5849 RMD160 56ccf6a0c251bd76a0ab095525f8f4ed3093ff10 SHA1 57d72a48159454bab8d8a4868d784d1b58e1a1c2 SHA256 14d62afca3ac6d068cba0d67563b2c15b569f9bc7bd7ced89f05d54de1c7e66b
+EBUILD vmware-player-3.0.1.227600-r6.ebuild 9326 RMD160 e3605e507268e6b593c2588d7f7720d046624e64 SHA1 df4021a84ce9bb8cd509989b996dcabe1c5cce61 SHA256 19120f77035a2377b7fbb78ce96e87a6cf30dd56ac0296e0e935350035fcf11d
+EBUILD vmware-player-3.1.0.261024.ebuild 5838 RMD160 6daf61d65be17b5a5f6b8d25de84422af072f737 SHA1 2f31379084506e726058b5b99c920d3e7ad21cfd SHA256 f0c1e4912a28c7db45945549c8f08b3eba7b656476318c0516e081d627147abc
 MISC ChangeLog 3158 RMD160 4bbf039f7c5259cc3c11859a7195950b38411fc0 SHA1 f956c4ee53c9338c9cb65b8b6ea812eab2a7ccd2 SHA256 5b1a39c9350e3737503e6360d1dbf9f2dfaa8bfb19a611b1656c39e9c1532ba5
 MISC metadata.xml 238 RMD160 beef158e0603e5808d104743feba4be3e7a7e8c4 SHA1 276217c6f03ae24c0196519197240031a6961254 SHA256 8374f3a2a8f05bf0690ab35f79a20980026aefa9fabae93fe81442f54291018b
diff --git a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r6.ebuild b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r6.ebuild
index 5f91762..d9e7b82 100644
--- a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r6.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r6.ebuild
@@ -26,7 +26,7 @@ RESTRICT="binchecks fetch strip"
 # vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="
-	~app-emulation/vmware-modules-1.0.0.26
+	~app-emulation/vmware-modules-235
 	vmware-tools? ( app-emulation/vmware-tools )
 	app-arch/libarchive
 	dev-cpp/cairomm
@@ -50,7 +50,7 @@ RDEPEND="
 	media-libs/libart_lgpl
 	=media-libs/libpng-1.2*
 	media-libs/tiff
-	net-misc/curl[ares]
+	net-misc/curl
 	sys-apps/hal
 	sys-apps/pciutils
 	sys-devel/gcc
diff --git a/app-emulation/vmware-player/vmware-player-3.1.0.261024.ebuild b/app-emulation/vmware-player/vmware-player-3.1.0.261024.ebuild
index f199df7..15c644c 100644
--- a/app-emulation/vmware-player/vmware-player-3.1.0.261024.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.1.0.261024.ebuild
@@ -45,7 +45,7 @@ RDEPEND="dev-cpp/cairomm
 	media-libs/freetype
 	media-libs/libart_lgpl
 	=media-libs/libpng-1.2*
-	net-misc/curl[ares]
+	net-misc/curl
 	sys-devel/gcc
 	sys-fs/fuse
 	sys-libs/glibc
@@ -76,7 +76,7 @@ RDEPEND="dev-cpp/cairomm
 	x11-libs/startup-notification
 	!app-emulation/vmware-server
 	!app-emulation/vmware-workstation"
-PDEPEND=">=app-emulation/vmware-modules-1.0.0.27
+PDEPEND=">=app-emulation/vmware-modules-238
 	vmware-tools? ( app-emulation/vmware-tools )"
 
 S=${WORKDIR}/vmware-player-app
diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest
index ada029c..3d45596 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -10,6 +10,6 @@ DIST vmware-tools-winPre2k-8.4.2-261024.i386.component.tar 11059200 RMD160 4f29a
 DIST vmware-tools-winPre2k-8.4.2-261024.x86_64.component.tar 11059200 RMD160 59bfc825c145a45bdb5f160407d66e97c3880587 SHA1 c23ed823d89463c70fbadb9d8dd1dd406b9d780f SHA256 de5fc9a44d4c13cce1ab42ee05f1cf2e872090b7680cc801f0290817be9d20fa
 DIST vmware-tools-windows-8.4.2-261024.i386.component.tar 38318080 RMD160 87db7e810cd6416ce8583c696757dcfce596bf91 SHA1 609138afc6159db21fe362e8bfbbe31c4ffad165 SHA256 b605a1809b70b588866d8045753429178b6a00a94c6688d1d3648894cbaefa97
 DIST vmware-tools-windows-8.4.2-261024.x86_64.component.tar 38318080 RMD160 e86af703f29693fed42d58f0013627f29fdf5184 SHA1 78c57924d6b097a76d8e95dcda5c1b1972a39180 SHA256 fc513c8f97f331cd516f15d863a338590c49073641c68256f6d8f80d64167a74
-EBUILD vmware-tools-8.4.2.261024.ebuild 1461 RMD160 ed9197cb29f6b29a745e46f5e487b02a101e5b84 SHA1 34a05a7dfeeecadd355c5e833d4ee74ca6c5ddc2 SHA256 c44f493e3886d92232d582d753b8b4c326112d9e85fe98837c6bcc482f2ed737
+EBUILD vmware-tools-8.4.2.261024.ebuild 1459 RMD160 6c96a0df88822b4db50fcb37d9aae5ca598b562f SHA1 ce6e75f4497b0c64c26b8f45031b9a1701e4997c SHA256 8d3658a4cf83e310df64167f6068cbd5423d5f53c475a9dc12cddab203e053c2
 MISC ChangeLog 496 RMD160 445f1a808d39840cfc6dd271efa72d95d7ef78bf SHA1 094dc7c237afacdbfb0da89880138817f686f732 SHA256 1c7da4a118b27876dd9ad96465c43699a2a9bfd50646c193e2e1bf071c5b501d
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-tools/vmware-tools-8.4.2.261024.ebuild b/app-emulation/vmware-tools/vmware-tools-8.4.2.261024.ebuild
index 7fc6851..09a0f1c 100644
--- a/app-emulation/vmware-tools/vmware-tools-8.4.2.261024.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-8.4.2.261024.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="mirror"
 
-DEPEND="!<app-emulation/vmware-workstation-7.1"
+DEPEND="!<app-emulation/vmware-workstation-7"
 
 IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
 
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 070ca2e..08a9549 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -21,9 +21,7 @@ DIST VMware-Workstation-7.0.1-227600.i386.bundle 107914468 RMD160 c34c4c5f69cb58
 DIST VMware-Workstation-7.0.1-227600.x86_64.bundle 113783072 RMD160 803b27f1742cec99e9ba2dc04808783b195d10d8 SHA1 dbcd045a889b95ac14828b8106631b678354e30a SHA256 3115f46b9d877bdf53e5db470a904384405a5c0054849f3e6d874ec36d668761
 DIST VMware-Workstation-7.1.0-261024.i386.bundle 129783945 RMD160 96dcf3d37330cf43060f2798f3ab7e06d469c87e SHA1 a8904abf8b57d845d0d04fcb0c6eceb1d403fa9e SHA256 0c3e63ed180632e628f216cf410af6a861e63c38fe50315051d2deb238e937df
 DIST VMware-Workstation-7.1.0-261024.x86_64.bundle 136788093 RMD160 7f2ab3d5a4f355e1ca5721ddb70593e6c2833584 SHA1 ddab8fe323ea235e882e48f0acbc9288a03c60cd SHA256 429abc2900e21deab81d544df6263c34936b2a758bea5f28a77d5a8b75314100
-DIST VMware-Workstation-Full-7.0.1-227600.i386.bundle 286244988 RMD160 9db7f06a3662b4b474cddb61675e36071eb16711 SHA1 f6d0789afa7927ca154973a071603a0bd098e697 SHA256 cc003ff5a811ace83172712e435047d41f0e883320d7d0798e69940389e31d57
-DIST VMware-Workstation-Full-7.0.1-227600.x86_64.bundle 292113593 RMD160 ac519500f4b3cfc2849c8a3f5ba4ddd02db0f9a3 SHA1 a901c45a2a02678b0d1722e8f27152c3af12a7ac SHA256 e188381d0569e8cc1f652df8d12f4572e207e40dd9c726af02d09c42503551d3
-EBUILD vmware-workstation-7.0.1.227600-r5.ebuild 13788 RMD160 ec575efc1757694c8ae6f0aab0470d3dffacae3e SHA1 134d5fa06815342a8418dd4108d70ee8ae72689d SHA256 e7e60a9a6e711f9675f58252b53892b160d66143602f9de77a264766f00d00c7
-EBUILD vmware-workstation-7.1.0.261024.ebuild 7766 RMD160 5874f52e290de3876a5e6644330edad0bcf3248d SHA1 686e170cee701443c6eea598db7456db71dd9a7b SHA256 f006a7d7bd913693f070930433a578ba843e61199abb06ac8df21cc6e4c6f531
+EBUILD vmware-workstation-7.0.1.227600-r6.ebuild 11424 RMD160 eafd17f5bae5637d6f7275493bcfb9e39a62b416 SHA1 afed743ac22a46fe2f9d2e8222d9f3acd386ed14 SHA256 3ff2e30005fbc8f1d449495ae3f51050ee26cf769adb15a76c8be4c4ea2572e9
+EBUILD vmware-workstation-7.1.0.261024.ebuild 7754 RMD160 40c3dd7bbf043e954f7417e2b33b9aad4e19c576 SHA1 9db26b631fcfe053b54b6e0699464d4fbdb8f3ac SHA256 77f4b2787356000727e8ea9b542cfb701f0c13f80eb727bfd84d61fc6a4c7f26
 MISC ChangeLog 3084 RMD160 29244d6cbf9a6fff9fa48cb7dee544eaf8e3912e SHA1 3e031ed5c2a4025c04ebaeae0b13387be9aa588e SHA256 97640e3c9364be7e15e3046bf43e4bda74aa8b7277d8019bd561fb5a5fc1f2d4
-MISC metadata.xml 784 RMD160 e6ad782a2b2ee30215361ae73cdc720e27242fae SHA1 3c5c6c1c1e676e3aafc12d0097aee11e1fb0d6a5 SHA256 460a8ee9cbf4ce43e39ec925165cd2de5fcb3da090f9218b0af398ea04893782
+MISC metadata.xml 699 RMD160 13003f11d344342b6adffbe4f6be7cd72e64f9a3 SHA1 b85c9bb8a2312f7feab5200a9e3a2d6a45d3533f SHA256 0afdf7eebf72c9c781523ff4e2fff3b7f41b8948065c583ae4aa86e71ce067af
diff --git a/app-emulation/vmware-workstation/metadata.xml b/app-emulation/vmware-workstation/metadata.xml
index c8c515e..3927fce 100644
--- a/app-emulation/vmware-workstation/metadata.xml
+++ b/app-emulation/vmware-workstation/metadata.xml
@@ -15,7 +15,5 @@
 		files within guest operating systems.
 		</flag>
 		<flag name="vmware-tools">Install VMware Tools images</flag>
-		<flag name='with-tools'> Install VMware Tools for guest operating system
-		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r5.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r6.ebuild
index 262e4cf..43114c8 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r5.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.0.1.227600-r6.ebuild
@@ -4,32 +4,29 @@
 
 EAPI="2"
 
-inherit eutils versionator fdo-mime gnome2-utils
+inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
 
 MY_PN="VMware-Workstation"
-MY_PV=$(replace_version_separator 3 - $PV)
+MY_PV="$(replace_version_separator 3 - $PV)"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/workstation/"
 SRC_URI="
-	x86? ( with-tools? ( ${MY_PN}-Full-${MY_PV}.i386.bundle ) )
-	x86? ( !with-tools? ( ${MY_PN}-${MY_PV}.i386.bundle ) )
-	amd64? ( with-tools? ( ${MY_PN}-Full-${MY_PV}.x86_64.bundle ) )
-	amd64? ( !with-tools? ( ${MY_PN}-${MY_PV}.x86_64.bundle ) )
+	x86? ( ${MY_P}.i386.bundle )
+	amd64? ( ${MY_P}.x86_64.bundle )
 	"
 
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc vix +with-tools"
+IUSE="doc vix vmware-tools"
 RESTRICT="binchecks fetch mirror strip"
 
 # vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 DEPEND="dev-libs/libxslt"
 RDEPEND="
-	~app-emulation/vmware-modules-1.0.0.26
 	app-arch/libarchive
 	dev-cpp/cairomm
 	dev-cpp/glibmm
@@ -52,7 +49,7 @@ RDEPEND="
 	media-libs/libart_lgpl
 	=media-libs/libpng-1.2*
 	media-libs/tiff
-	net-misc/curl[ares]
+	net-misc/curl
 	sys-apps/hal
 	sys-apps/pciutils
 	sys-fs/fuse
@@ -86,15 +83,15 @@ RDEPEND="
 	!app-emulation/vmware-player
 	"
 
+PDEPEND="~app-emulation/vmware-modules-235
+		vmware-tools? ( app-emulation/vmware-tools )"
+
 S=${WORKDIR}
 VM_INSTALL_DIR="/opt/vmware"
 
 pkg_nofetch() {
 	local bundle
 
-	if use with-tools; then
-		MY_P=${MY_PN}-Full-${MY_PV}
-	fi
 	if use x86; then
 		bundle="${MY_P}.i386.bundle"
 	elif use amd64; then
@@ -106,19 +103,11 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	bundle_extract_component "${DISTDIR}/${A}" vmware-player-app
-	bundle_extract_component "${DISTDIR}/${A}" vmware-player-setup
-	bundle_extract_component "${DISTDIR}/${A}" vmware-workstation
+	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-app
+	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-setup
+	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation
 	if use vix; then
-		bundle_extract_component "${DISTDIR}/${A}" vmware-vix
-	fi
-	if use with-tools; then
-		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-freebsd
-		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-linux
-		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-netware
-		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-solaris
-		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-windows
-		bundle_extract_component "${DISTDIR}/${A}" vmware-tools-winPre2k
+		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix
 	fi
 }
 
@@ -376,34 +365,3 @@ pkg_postrm() {
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 }
-
-bundle_extract_component() {
-	local -i bundle_size=$(stat -L -c'%s' "${1}")
-	local -i bundle_manifestOffset=$(od -An -j$((bundle_size-36)) -N4 -tu4 "${1}")
-	local -i bundle_manifestSize=$(od -An -j$((bundle_size-40)) -N4 -tu4 "${1}")
-	local -i bundle_dataOffset=$(od -An -j$((bundle_size-44)) -N4 -tu4 "${1}")
-	local -i bundle_dataSize=$(od -An -j$((bundle_size-52)) -N8 -tu8 "${1}")
-	tail -c+$((bundle_manifestOffset+1)) "${1}" 2> /dev/null | head -c$((bundle_manifestSize)) |
-		xsltproc "${FILESDIR}"/list-bundle-components.xsl - |
-		while read -r component_offset component_size component_name ; do
-			if [[ ${component_name} == ${2} ]] ; then
-				ebegin "Extracting '${component_name}' component from '$(basename "${1}")'"
-				declare -i component_manifestOffset=$(od -An -j$((bundle_dataOffset+component_offset+9)) -N4 -tu4 "${1}")
-				declare -i component_manifestSize=$(od -An -j$((bundle_dataOffset+component_offset+13)) -N4 -tu4 "${1}")
-				declare -i component_dataOffset=$(od -An -j$((bundle_dataOffset+component_offset+17)) -N4 -tu4 "${1}")
-				declare -i component_dataSize=$(od -An -j$((bundle_dataOffset+component_offset+21)) -N8 -tu8 "${1}")
-				tail -c+$((bundle_dataOffset+component_offset+component_manifestOffset+1)) "${1}" 2> /dev/null |
-					head -c$((component_manifestSize)) | xsltproc "${FILESDIR}"/list-component-files.xsl - |
-					while read -r file_offset file_compressedSize file_uncompressedSize file_path ; do
-						if [[ ${file_path} ]] ; then
-							echo -n '.'
-							file_path="${component_name}/${file_path}"
-							mkdir -p "$(dirname "${file_path}")"
-							tail -c+$((bundle_dataOffset+component_offset+component_dataOffset+file_offset+1)) "${1}" 2> /dev/null |
-								head -c$((file_compressedSize)) | gzip -cd > "${file_path}"
-						fi
-					done
-				echo ; eend
-			fi
-		done
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.1.0.261024.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.1.0.261024.ebuild
index ab46f2d..3ce4daf 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.0.261024.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.1.0.261024.ebuild
@@ -46,7 +46,7 @@ RDEPEND="dev-cpp/cairomm
 	media-libs/freetype
 	media-libs/libart_lgpl
 	=media-libs/libpng-1.2*
-	net-misc/curl[ares]
+	net-misc/curl
 	sys-devel/gcc
 	sys-fs/fuse
 	sys-libs/glibc
@@ -77,7 +77,7 @@ RDEPEND="dev-cpp/cairomm
 	x11-libs/startup-notification
 	!app-emulation/vmware-server
 	!app-emulation/vmware-player"
-PDEPEND=">=app-emulation/vmware-modules-1.0.0.27
+PDEPEND="~app-emulation/vmware-modules-238
 	vmware-tools? ( app-emulation/vmware-tools )"
 
 S=${WORKDIR}