cleanup

13 files changed, 29 insertions, 745 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
new file mode 100644
index 000000000000..c33541e99779
--- /dev/null
+++ b/app-emulation/vmware-workstation/Manifest
@@ -0,0 +1,22 @@
+MD5 16b8b2f20feb213a584610d48d9a665e ChangeLog 5101
+MD5 a98b0078fdf31fb95940d540e5fb33d2 vmware-workstation-3.2.0.2230-r1.ebuild 5576
+MD5 789a97540badc637f45a62e28c0391a3 vmware-workstation-4.0.4460.ebuild 6108
+MD5 d02c9da92158be029e4b586fe5e2a30d files/digest-vmware-workstation-3.2.0.2230-r1 83
+MD5 ad15bdcd944986bdfb2f349b63431127 files/digest-vmware-workstation-4.0.4460 83
+MD5 48c1667773503fee21a1068da07440b9 files/3.2.0.2230-r1/90vmware 70
+MD5 677d3f162d6bcd8a95494c925c0050fe files/3.2.0.2230-r1/VMwareWorkstation.desktop 241
+MD5 9e5a50beb584c9ba35ba1f7043ed436b files/3.2.0.2230-r1/vmware 1439
+MD5 3bfb39f5e96f60db67c7246f74c21501 files/3.2.0.2230-r1/vmware-config.pl-gcc-generalized.patch 2948
+MD5 7ca1ec14670b51d8cf824a58bc8d6621 files/3.2.0.2230-r1/vmware.png 470
+MD5 48c1667773503fee21a1068da07440b9 files/4.0.4320/90vmware 70
+MD5 677d3f162d6bcd8a95494c925c0050fe files/4.0.4320/VMwareWorkstation.desktop 241
+MD5 0a8225372a21eea1c73b9cdad18d8755 files/4.0.4320/vmware 1437
+MD5 7ca1ec14670b51d8cf824a58bc8d6621 files/4.0.4320/vmware.png 470
+MD5 48c1667773503fee21a1068da07440b9 files/4.0.4388/90vmware 70
+MD5 677d3f162d6bcd8a95494c925c0050fe files/4.0.4388/VMwareWorkstation.desktop 241
+MD5 e65d2f01aec2c00afdb0112325de6792 files/4.0.4388/vmware 1436
+MD5 7ca1ec14670b51d8cf824a58bc8d6621 files/4.0.4388/vmware.png 470
+MD5 48c1667773503fee21a1068da07440b9 files/4.0.4460/90vmware 70
+MD5 677d3f162d6bcd8a95494c925c0050fe files/4.0.4460/VMwareWorkstation.desktop 241
+MD5 c571818b2b5ee66d89fc9fbee5c3e608 files/4.0.4460/vmware 1432
+MD5 7ca1ec14670b51d8cf824a58bc8d6621 files/4.0.4460/vmware.png 470
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4121 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4121
deleted file mode 100644
index 133d0e562d35..000000000000
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4121
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb5ee4f28c3315435dad050f8984cf06 VMware-workstation-e.x.p-4121.tar.gz 19371326
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4320 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4320
deleted file mode 100644
index d426c8daf8f5..000000000000
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4320
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e58ce1097fae6efe2287bd72790bd883 VMware-workstation-e.x.p-4320.tar.gz 23487450
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4388 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4388
deleted file mode 100644
index a56eeeec9036..000000000000
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.0.4388
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7783de769394f8020de270af1694c664 VMware-workstation-e.x.p-4388.tar.gz 23150976
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.0.4121.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.0.4121.ebuild
deleted file mode 100644
index d03a6fa10ecc..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-4.0.4121.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.4121.ebuild,v 1.3 2003/03/18 09:37:49 vapier Exp $
-
-# Unlike many other binary packages the user doesn't need to agree to a licence
-# to download VM Ware. The agreeing to a licence is part of the configure step
-# which the user must run manually.
-
-S=${WORKDIR}/vmware-distrib
-NP="VMware-workstation-e.x.p-4121"
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-SRC_URI="http://vmware-svca.www.conxion.com/software/${NP}.tar.gz
-	http://www.vmware.com/download1/software/${NP}.tar.gz
-	ftp://download1.vmware.com/pub/software/${NP}.tar.gz
-	http://vmware-chil.www.conxion.com/software/${NP}.tar.gz
-	http://vmware-heva.www.conxion.com/software/${NP}.tar.gz
-	http://vmware.wespe.de/software/${NP}.tar.gz
-	ftp://vmware.wespe.de/pub/software/${NP}.tar.gz"
-HOMEPAGE="http://www.vmware.com/download/workstation_beta.html"
-
-SLOT="0"
-LICENSE="vmware"
-KEYWORDS="~x86 -ppc -sparc"
-IUSE="kde"
-
-DEPEND="virtual/glibc
-	virtual/x11
-	sys-kernel/linux-headers
-	>=dev-lang/perl-5
-	>=dev-lang/tcl-8.3.3"
-
-RESTRICT="nostrip fetch"
-
-pkg_nofetch() {
-	einfo "You must goto ${HOMEPAGE}."
-	einfo "Once there, you must sign up and then download the package."
-}
-
-src_install() {
-	# lets make gcc happy regardless of what version we're using
-#	patch -p0 < ${FILESDIR}/${PVR}/vmware-config.pl-gcc-generalized.patch
-
-	dodir /opt/vmware/bin
-	cp -a bin/* ${D}/opt/vmware/bin/
-	# vmware and vmware-ping needs to be suid root.
-	chmod u+s ${D}/opt/vmware/bin/vmware
-	chmod u+s ${D}/opt/vmware/bin/vmware-ping
-
-	dodir /opt/vmware/lib
-	cp -a lib/* ${D}/opt/vmware/lib/
-	# 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 ${D}/opt/vmware/lib/modules/binary
-
-	dodir /opt/vmware/doc
-	cp -a doc/* ${D}/opt/vmware/doc/
-
-	dodir /opt/vmware/man/
-	cp -a man/* ${D}/opt/vmware/man/
-
-	# vmware service loader
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/vmware vmware
-
-	# vmware enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/90vmware
-
-	dodir /etc/vmware/
-	cp -a etc/* ${D}/etc/vmware/
-
-	dodir /etc/vmware/init.d
-	dodir /etc/vmware/init.d/rc0.d
-	dodir /etc/vmware/init.d/rc1.d
-	dodir /etc/vmware/init.d/rc2.d
-	dodir /etc/vmware/init.d/rc3.d
-	dodir /etc/vmware/init.d/rc4.d
-	dodir /etc/vmware/init.d/rc5.d
-	dodir /etc/vmware/init.d/rc6.d
-	cp -a installer/services.sh ${D}/etc/vmware/init.d/vmware
-
-	# This is to fix a problem where if someone merges vmware and then
-	# before configuring vmware they upgrade or re-merge the vmware
-	# 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
-	dodir /opt/vmware/lib/icon
-	insinto /opt/vmware/lib/icon
-	doins ${FILESDIR}/${PVR}/vmware.png
-
-	if [ "`use kde`" ] ; then
-		dodir /usr/share/applnk/Applications
-		insinto /usr/share/applnk/Applications
-		doins "${FILESDIR}/${PVR}/VMwareWorkstation.desktop"
-	fi
-
-	# Questions: 
-	einfo "Adding answers to /etc/vmware/locations"
-	locations="${D}/etc/vmware/locations"
-	echo "answer BINDIR /opt/vmware/bin" >> ${locations}
-	echo "answer LIBDIR /opt/vmware/lib" >> ${locations}
-	echo "answer MANDIR /opt/vmware/man" >> ${locations}
-	echo "answer DOCDIR /opt/vmware/doc" >> ${locations}
-	echo "answer RUN_CONFIGURATOR no" >> ${locations}
-	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
-	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
-}
-
-pkg_preinst() {
-	# This must be done after the install to get the mtimes on each file
-	# right. This perl snippet gets the /etc/vmware/locations file code:
-	# perl -e "@a = stat('bin/vmware'); print \$a[9]"
-	# The above perl line and the find line below output the same thing.
-	# I would think the find line is faster to execute.
-	# find /opt/vmware/bin/vmware -printf %T@
-
-	#Note: it's a bit weird to use ${D} in a preinst script but it should work
-	#(drobbins, 1 Feb 2002)
-
-	einfo "Generating /etc/vmware/locations file."
-	d=`echo ${D} | wc -c`
-	for x in `find ${D}/opt/vmware ${D}/etc/vmware` ; do
-		x="`echo ${x} | cut -c ${d}-`"
-		if [ -d ${D}/${x} ] ; then
-			echo "directory ${x}" >> ${D}/etc/vmware/locations
-		else
-			echo -n "file ${x}" >> ${D}/etc/vmware/locations
-			if [ "${x}" == "/etc/vmware/locations" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
-			elif [ "${x}" == "/etc/vmware/not_configured" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
-			else
-				echo -n " " >> ${D}/etc/vmware/locations
-				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations
-				find ${D}${x} -printf %T@ >> ${D}/etc/vmware/locations
-				echo "" >> ${D}/etc/vmware/locations
-			fi
-		fi
-	done
-}
-
-pkg_postinst () {
-	# 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.
-	einfo "Updating /etc/vmware/locations"
-	for x in /etc/vmware/._cfg????_locations ; do
-		if [ -f $x ] ; then
-			cat $x >> /etc/vmware/locations
-			rm $x
-		fi
-	done
-
-	einfo
-	einfo "You need to run /opt/vmware/bin/vmware-config.pl to complete the install."
-	einfo
-	einfo "For VMware Add-Ons just visit"
-	einfo "http://www.vmware.com/download/downloadaddons.html"
-}
-
-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."
-	einfo 
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.0.4320.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.0.4320.ebuild
deleted file mode 100644
index 1ea1084c216f..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-4.0.4320.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.4320.ebuild,v 1.1 2003/03/22 23:57:15 malverian Exp $
-
-# Unlike many other binary packages the user doesn't need to agree to a licence
-# to download VM Ware. The agreeing to a licence is part of the configure step
-# which the user must run manually.
-
-S=${WORKDIR}/vmware-distrib
-NP="VMware-workstation-e.x.p-4320"
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-SRC_URI="http://vmware-svca.www.conxion.com/software/${NP}.tar.gz
-	http://download.vmware.com/htdocs/software/${NP}.tar.gz
-	http://www.vmware.com/download1/software/${NP}.tar.gz
-	ftp://download1.vmware.com/pub/software/${NP}.tar.gz
-	http://vmware-chil.www.conxion.com/software/${NP}.tar.gz
-	http://vmware-heva.www.conxion.com/software/${NP}.tar.gz
-	http://vmware.wespe.de/software/${NP}.tar.gz
-	ftp://vmware.wespe.de/pub/software/${NP}.tar.gz"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
-
-SLOT="0"
-LICENSE="vmware"
-KEYWORDS="~x86 -ppc -sparc"
-IUSE="kde"
-
-DEPEND="virtual/glibc
-	virtual/x11
-	sys-kernel/linux-headers
-	>=dev-lang/perl-5
-	>=dev-lang/tcl-8.3.3
-	sys-apps/pciutils"
-
-RDEPEND=${DEPEND}
-
-RESTRICT="nostrip"
-
-src_install() {
-	# lets make gcc happy regardless of what version we're using
-#	patch -p0 < ${FILESDIR}/${PVR}/vmware-config.pl-gcc-generalized.patch
-
-	dodir /opt/vmware/bin
-	cp -a bin/* ${D}/opt/vmware/bin/
-	# vmware and vmware-ping needs to be suid root.
-	chmod u+s ${D}/opt/vmware/bin/vmware
-	chmod u+s ${D}/opt/vmware/bin/vmware-ping
-
-	dodir /opt/vmware/lib
-	cp -a lib/* ${D}/opt/vmware/lib/
-
-	chmod u+s ${D}/opt/vmware/lib/bin/vmware-vmx
-
-	# 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 ${D}/opt/vmware/lib/modules/binary
-
-	dodir /opt/vmware/doc
-	cp -a doc/* ${D}/opt/vmware/doc/
-
-	dodir /opt/vmware/man/
-	cp -a man/* ${D}/opt/vmware/man/
-
-	# vmware service loader
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/vmware vmware
-
-	# vmware enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/90vmware
-
-	dodir /etc/vmware/
-	cp -a etc/* ${D}/etc/vmware/
-
-	dodir /etc/vmware/init.d
-	dodir /etc/vmware/init.d/rc0.d
-	dodir /etc/vmware/init.d/rc1.d
-	dodir /etc/vmware/init.d/rc2.d
-	dodir /etc/vmware/init.d/rc3.d
-	dodir /etc/vmware/init.d/rc4.d
-	dodir /etc/vmware/init.d/rc5.d
-	dodir /etc/vmware/init.d/rc6.d
-	cp -a installer/services.sh ${D}/etc/vmware/init.d/vmware
-
-	# This is to fix a problem where if someone merges vmware and then
-	# before configuring vmware they upgrade or re-merge the vmware
-	# 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
-	dodir /opt/vmware/lib/icon
-	insinto /opt/vmware/lib/icon
-	doins ${FILESDIR}/${PVR}/vmware.png
-
-	if [ "`use kde`" ] ; then
-		dodir /usr/share/applnk/Applications
-		insinto /usr/share/applnk/Applications
-		doins "${FILESDIR}/${PVR}/VMwareWorkstation.desktop"
-	fi
-
-
-	dodir /usr/bin
-	dosym /opt/vmware/bin/vmware /usr/bin/vmware
-
-
-	# Questions:
-	einfo "Adding answers to /etc/vmware/locations"
-	locations="${D}/etc/vmware/locations"
-	echo "answer BINDIR /opt/vmware/bin" >> ${locations}
-	echo "answer LIBDIR /opt/vmware/lib" >> ${locations}
-	echo "answer MANDIR /opt/vmware/man" >> ${locations}
-	echo "answer DOCDIR /opt/vmware/doc" >> ${locations}
-	echo "answer RUN_CONFIGURATOR no" >> ${locations}
-	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
-	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
-}
-
-pkg_preinst() {
-	# This must be done after the install to get the mtimes on each file
-	# right. This perl snippet gets the /etc/vmware/locations file code:
-	# perl -e "@a = stat('bin/vmware'); print \$a[9]"
-	# The above perl line and the find line below output the same thing.
-	# I would think the find line is faster to execute.
-	# find /opt/vmware/bin/vmware -printf %T@
-
-	#Note: it's a bit weird to use ${D} in a preinst script but it should work
-	#(drobbins, 1 Feb 2002)
-
-	einfo "Generating /etc/vmware/locations file."
-	d=`echo ${D} | wc -c`
-	for x in `find ${D}/opt/vmware ${D}/etc/vmware` ; do
-		x="`echo ${x} | cut -c ${d}-`"
-		if [ -d ${D}/${x} ] ; then
-			echo "directory ${x}" >> ${D}/etc/vmware/locations
-		else
-			echo -n "file ${x}" >> ${D}/etc/vmware/locations
-			if [ "${x}" == "/etc/vmware/locations" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
-			elif [ "${x}" == "/etc/vmware/not_configured" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
-			else
-				echo -n " " >> ${D}/etc/vmware/locations
-				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations
-				find ${D}${x} -printf %T@ >> ${D}/etc/vmware/locations
-				echo "" >> ${D}/etc/vmware/locations
-			fi
-		fi
-	done
-}
-
-pkg_config() {
-	# In case pkg_config() ends up being the defacto standard for
-	# configuring packages (malverian <malverian@gentoo.org>)
-
-	einfo "Running /opt/vmware/bin/vmware-config.pl"
-	/opt/vmware/bin/vmware-config.pl
-}
-
-pkg_postinst() {
-	# 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.
-	einfo "Updating /etc/vmware/locations"
-	for x in /etc/vmware/._cfg????_locations ; do
-		if [ -f $x ] ; then
-			cat $x >> /etc/vmware/locations
-			rm $x
-		fi
-	done
-
-	einfo
-	einfo "You need to run /opt/vmware/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 'vmware' to launch"
-}
-
-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."
-	einfo 
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.0.4388.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.0.4388.ebuild
deleted file mode 100644
index 284c4a1caefc..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-4.0.4388.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.4388.ebuild,v 1.1 2003/03/27 04:26:13 drobbins Exp $
-
-# Unlike many other binary packages the user doesn't need to agree to a licence
-# to download VM Ware. The agreeing to a licence is part of the configure step
-# which the user must run manually.
-
-S=${WORKDIR}/vmware-distrib
-NP="VMware-workstation-e.x.p-4388"
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-SRC_URI="http://vmware-svca.www.conxion.com/software/${NP}.tar.gz
-	http://download.vmware.com/htdocs/software/${NP}.tar.gz
-	http://www.vmware.com/download1/software/${NP}.tar.gz
-	ftp://download1.vmware.com/pub/software/${NP}.tar.gz
-	http://vmware-chil.www.conxion.com/software/${NP}.tar.gz
-	http://vmware-heva.www.conxion.com/software/${NP}.tar.gz
-	http://vmware.wespe.de/software/${NP}.tar.gz
-	ftp://vmware.wespe.de/pub/software/${NP}.tar.gz"
-HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
-
-SLOT="0"
-LICENSE="vmware"
-KEYWORDS="-* ~x86"
-IUSE="kde"
-
-DEPEND="virtual/glibc
-	virtual/x11
-	sys-kernel/linux-headers
-	>=dev-lang/perl-5
-	>=dev-lang/tcl-8.3.3
-	sys-apps/pciutils"
-
-RDEPEND=${DEPEND}
-
-RESTRICT="nostrip"
-
-src_install() {
-	# lets make gcc happy regardless of what version we're using
-#	patch -p0 < ${FILESDIR}/${PVR}/vmware-config.pl-gcc-generalized.patch
-
-	dodir /opt/vmware/bin
-	cp -a bin/* ${D}/opt/vmware/bin/
-	# vmware and vmware-ping needs to be suid root.
-	chmod u+s ${D}/opt/vmware/bin/vmware || die
-	chmod u+s ${D}/opt/vmware/bin/vmware-ping || die
-
-	dodir /opt/vmware/lib
-	cp -a lib/* ${D}/opt/vmware/lib/
-
-	chmod u+s ${D}/opt/vmware/lib/bin/vmware-vmx || die
-
-	# 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 ${D}/opt/vmware/lib/modules/binary
-
-	dodir /opt/vmware/doc
-	cp -a doc/* ${D}/opt/vmware/doc/
-
-	dodir /opt/vmware/man/
-	cp -a man/* ${D}/opt/vmware/man/
-
-	# vmware service loader
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PVR}/vmware vmware || die
-
-	# vmware enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/90vmware || die
-
-	dodir /etc/vmware/
-	cp -a etc/* ${D}/etc/vmware/
-
-	dodir /etc/vmware/init.d
-	dodir /etc/vmware/init.d/rc0.d
-	dodir /etc/vmware/init.d/rc1.d
-	dodir /etc/vmware/init.d/rc2.d
-	dodir /etc/vmware/init.d/rc3.d
-	dodir /etc/vmware/init.d/rc4.d
-	dodir /etc/vmware/init.d/rc5.d
-	dodir /etc/vmware/init.d/rc6.d
-	cp -a installer/services.sh ${D}/etc/vmware/init.d/vmware || die
-
-	# This is to fix a problem where if someone merges vmware and then
-	# before configuring vmware they upgrade or re-merge the vmware
-	# 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
-	dodir /opt/vmware/lib/icon
-	insinto /opt/vmware/lib/icon
-	doins ${FILESDIR}/${PVR}/vmware.png || die
-
-	if [ "`use kde`" ] ; then
-		dodir /usr/share/applnk/Applications
-		insinto /usr/share/applnk/Applications
-		doins "${FILESDIR}/${PVR}/VMwareWorkstation.desktop"
-	fi
-
-
-	dodir /usr/bin
-	dosym /opt/vmware/bin/vmware /usr/bin/vmware
-
-	# Questions:
-	einfo "Adding answers to /etc/vmware/locations"
-	locations="${D}/etc/vmware/locations"
-	echo "answer BINDIR /opt/vmware/bin" >> ${locations}
-	echo "answer LIBDIR /opt/vmware/lib" >> ${locations}
-	echo "answer MANDIR /opt/vmware/man" >> ${locations}
-	echo "answer DOCDIR /opt/vmware/doc" >> ${locations}
-	echo "answer RUN_CONFIGURATOR no" >> ${locations}
-	echo "answer INITDIR /etc/vmware/init.d" >> ${locations}
-	echo "answer INITSCRIPTSDIR /etc/vmware/init.d" >> ${locations}
-}
-
-pkg_preinst() {
-	# This must be done after the install to get the mtimes on each file
-	# right. This perl snippet gets the /etc/vmware/locations file code:
-	# perl -e "@a = stat('bin/vmware'); print \$a[9]"
-	# The above perl line and the find line below output the same thing.
-	# I would think the find line is faster to execute.
-	# find /opt/vmware/bin/vmware -printf %T@
-
-	#Note: it's a bit weird to use ${D} in a preinst script but it should work
-	#(drobbins, 1 Feb 2002)
-
-	einfo "Generating /etc/vmware/locations file."
-	d=`echo ${D} | wc -c`
-	for x in `find ${D}/opt/vmware ${D}/etc/vmware` ; do
-		x="`echo ${x} | cut -c ${d}-`"
-		if [ -d ${D}/${x} ] ; then
-			echo "directory ${x}" >> ${D}/etc/vmware/locations
-		else
-			echo -n "file ${x}" >> ${D}/etc/vmware/locations
-			if [ "${x}" == "/etc/vmware/locations" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
-			elif [ "${x}" == "/etc/vmware/not_configured" ] ; then
-				echo "" >> ${D}/etc/vmware/locations
-			else
-				echo -n " " >> ${D}/etc/vmware/locations
-				#perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware/locations
-				find ${D}${x} -printf %T@ >> ${D}/etc/vmware/locations
-				echo "" >> ${D}/etc/vmware/locations
-			fi
-		fi
-	done
-}
-
-pkg_config() {
-	# In case pkg_config() ends up being the defacto standard for
-	# configuring packages (malverian <malverian@gentoo.org>)
-
-	einfo "Running /opt/vmware/bin/vmware-config.pl"
-	/opt/vmware/bin/vmware-config.pl
-}
-
-pkg_postinst() {
-	# 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.
-	einfo "Updating /etc/vmware/locations"
-	for x in /etc/vmware/._cfg????_locations ; do
-		if [ -f $x ] ; then
-			cat $x >> /etc/vmware/locations
-			rm $x
-		fi
-	done
-
-	einfo
-	einfo "You need to run /opt/vmware/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 'vmware' to launch"
-}
-
-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."
-	einfo 
-}
diff --git a/app-emulation/winex-cvs/Manifest b/app-emulation/winex-cvs/Manifest
index 37395328dda6..099e9d489d80 100644
--- a/app-emulation/winex-cvs/Manifest
+++ b/app-emulation/winex-cvs/Manifest
@@ -1,11 +1,9 @@
 MD5 8eff9093b9c5e58173babcf17611374b ChangeLog 4560
 MD5 a72aff1af2fed78b4d9bfd663f2bb1b4 winex-cvs-2.2.1.ebuild 4012
-MD5 a9610b5741e8adc2becdc2ed8dc0af0f winex-cvs-3.0_pre1.ebuild 4207
 MD5 ed3ffef97e1050e387ec111a2146c2f4 winex-cvs-3.0.ebuild 4186
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-winex-cvs-2.2.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-winex-cvs-3.0 0
+MD5 190b622ae744fb68561764ce1b2d9f1d files/winex-cvs-3.0_pre1.patch 287
 MD5 dcdbcea3b1e30203a037de864aee829d files/winex-cvs-fake_windows.tar.bz2 546
 MD5 6b63a4e1f7384c6dbb53e53f09198665 files/winex-cvs-regedit 516
 MD5 a0f00bd1db2d0bc928d3845f4aac078a files/winex-cvs-winex 1244
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-winex-cvs-3.0_pre1 0
-MD5 190b622ae744fb68561764ce1b2d9f1d files/winex-cvs-3.0_pre1.patch 287
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-winex-cvs-3.0 0
diff --git a/app-emulation/winex-cvs/files/digest-winex-cvs-3.0_pre1 b/app-emulation/winex-cvs/files/digest-winex-cvs-3.0_pre1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-emulation/winex-cvs/files/digest-winex-cvs-3.0_pre1
+++ /dev/null
diff --git a/app-emulation/winex-cvs/winex-cvs-3.0_pre1.ebuild b/app-emulation/winex-cvs/winex-cvs-3.0_pre1.ebuild
deleted file mode 100644
index 5971463a858f..000000000000
--- a/app-emulation/winex-cvs/winex-cvs-3.0_pre1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex-cvs/winex-cvs-3.0_pre1.ebuild,v 1.2 2003/03/23 18:58:01 phoenix Exp $
-
-IUSE="cups opengl"
-
-inherit eutils
-
-# Dont modify the ECVS_BRANCH setting yourself.
-# Instead, make a backup of this ebuild and rename it to
-# winex-[your branch].ebuild. 
-#
-# Example:
-#   winex-kohan-2.1.ebuild
-#
-# You can find more branches on 
-# http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/winex/wine/
-
-
-ECVS_SERVER="cvs.winex.sourceforge.net:/cvsroot/winex"
-ECVS_MODULE="wine"
-ECVS_BRANCH=${PN/cvs/}${PV//./-}
-ECVS_BRANCH=${ECVS_BRANCH/pre/pre-}
-ECVS_BRANCH=${ECVS_BRANCH/_/-}
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_BRANCH}"
-
-inherit cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-#echo ${ECVS_BRANCH}
-	
-
-DESCRIPTION="WineX is a distribution of Wine with enhanced DirectX for gaming.
-	     This ebuild will fetch the newest cvs sources from the cvs-server."
-HOMEPAGE="http://www.transgaming.com/"
-
-SLOT="0"
-KEYWORDS="x86 -ppc"
-LICENSE="Aladdin"
-
-newdepend "sys-devel/gcc
-	sys-devel/flex
-	dev-util/yacc
-	>=media-libs/freetype-2.0.0
-	X? ( 	virtual/x11 
-		dev-lang/tcl 
-		dev-lang/tk ) 
-	opengl? ( virtual/opengl )
-	cups? ( net-print/cups )"
-
-src_compile() {
-	cd ${S}
-	local myconf
-
-	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
-	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
-
-	# patching winex to not compile wcmd
-	epatch ${FILESDIR}/winex-cvs-3.0_pre1.patch
-
-	# the folks at #winehq were really angry about custom optimization
-	unset CFLAGS
-	unset CXXFLAGS
-	
-	./configure --prefix=/usr/lib/winex-cvs \
-		--sysconfdir=/etc/winex-cvs \
-		--host=${CHOST} \
-		--enable-curses \
-		--with-x \
-		${myconf} || die "configure failed"
-
-	# Fixes a winetest issue
-	cd ${S}/programs/winetest
-	cp Makefile 1
-	sed -e 's:wine.pm:include/wine.pm:' 1 > Makefile
-
-	# This persuades wineshelllink that "winex-cvs" is a better loader :)
-	cd ${S}/tools
-	cp wineshelllink 1
-	sed -e 's/\(WINE_LOADER=\)\(\${WINE_LOADER:-wine}\)/\1winex-cvs/' 1 > wineshelllink
-
-	cd ${S}	
-	make depend all || die "make depend all failed"
-	cd programs && gmake || die "emake died"
-}
-
-src_install () {
-	local WINEXMAKEOPTS="prefix=${D}/usr/lib/winex-cvs"
-	
-	# Installs winex to /usr/lib/winex-cvs
-	cd ${S}
-	make ${WINEXMAKEOPTS} install || die "make install failed"
-	cd ${S}/programs
-	make ${WINEXMAKEOPTS} install || die "make install failed"
-	
-
-	# Creates /usr/lib/winex-cvs/.data with fake_windows in it
-	# This is needed for our new winex-cvs wrapper script
-	dodir /usr/lib/winex-cvs/.data
-	pushd ${D}/usr/lib/winex-cvs/.data
-	tar jxvf ${FILESDIR}/${PN}-fake_windows.tar.bz2 
-	popd
-	cp ${S}/documentation/samples/config ${S}/documentation/samples/config.orig
-	sed -e 's/"Path" = "\/c"/"Path" = "\$\{HOME\}\/.winex-cvs\/fake_windows"/' \
-	    ${S}/documentation/samples/config.orig > ${S}/documentation/samples/config
-	cp ${S}/documentation/samples/config ${D}/usr/lib/winex-cvs/.data/config
-	cp ${WORKDIR}/wine/winedefault.reg ${D}/usr/lib/winex-cvs/.data/winedefault.reg
-	# Install the wrapper script
-	dodir /usr/bin
-	cp ${FILESDIR}/${PN}-winex ${D}/usr/bin/winex-cvs
-	cp ${FILESDIR}/${PN}-regedit ${D}/usr/bin/regedit-winex-cvs
-
-	# Take care of the other stuff
-	cd ${S}
-	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README
-
-	insinto /usr/lib/winex-cvs/.data/fake_windows/Windows
-	doins documentation/samples/system.ini
-	doins documentation/samples/generic.ppd
-	
-	# Manpage setup
-	cp ${D}/usr/lib/${PN}/man/man1/wine.1 ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	doman ${D}/usr/lib/${PN}/man/man1/${PN}.1
-	rm ${D}/usr/lib/${PN}/man/man1/${PN}.1
-
-	# Remove the executable flag from those libraries.
-	cd ${D}/usr/lib/winex-cvs/bin
-	chmod a-x *.so
-		
-}
-
-pkg_postinst() {
-	einfo "Use /usr/bin/winex-cvs to start winex."
-	einfo "This is a wrapper-script which will take care of everything"
-	einfo "else. If you have further questions, enhancements or patches"
-	einfo "send an email to phoenix@gentoo.org"
-	einfo ""
-	einfo "Manpage has been installed to the system."
-	einfo "\"man winex-cvs\" should show it."
-}
-
diff --git a/app-emulation/winex-transgaming/Manifest b/app-emulation/winex-transgaming/Manifest
new file mode 100644
index 000000000000..08eba3c47c17
--- /dev/null
+++ b/app-emulation/winex-transgaming/Manifest
@@ -0,0 +1,5 @@
+MD5 238a0b31a971154af9d0e0dcb20318b5 ChangeLog 1622
+MD5 9fd8229b701d850e3084ac1a096b070f winex-transgaming-2.2.1.ebuild 2032
+MD5 c7df55b9b7d29fdac20f6353274a5914 winex-transgaming-3.0.ebuild 2045
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-winex-transgaming-2.2.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-winex-transgaming-3.0 0
diff --git a/app-emulation/winex-transgaming/files/digest-winex-transgaming-3.0_pre1 b/app-emulation/winex-transgaming/files/digest-winex-transgaming-3.0_pre1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-emulation/winex-transgaming/files/digest-winex-transgaming-3.0_pre1
+++ /dev/null
diff --git a/app-emulation/winex-transgaming/winex-transgaming-3.0_pre1.ebuild b/app-emulation/winex-transgaming/winex-transgaming-3.0_pre1.ebuild
deleted file mode 100644
index 404797e17c52..000000000000
--- a/app-emulation/winex-transgaming/winex-transgaming-3.0_pre1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex-transgaming/winex-transgaming-3.0_pre1.ebuild,v 1.2 2003/04/06 08:59:29 phoenix Exp $
-
-IUSE="cups opengl"
-
-MY_P="winex3-${PV/pre/pre-}"
-DESCRIPTION="WineX is a distribution of Wine with enhanced DirectX for gaming"
-HOMEPAGE="http://www.transgaming.com/"
-
-SLOT="3"
-KEYWORDS="~x86"
-LICENSE="Aladdin"
-
-RDEPEND="virtual/x11
-	opengl? ( virtual/opengl )
-	>=sys-libs/ncurses-5.2
-	cups? ( net-print/cups )
-	>=media-libs/freetype-2.0.0
-	!app-emulation/winex"
-
-src_unpack () {
-	if [ ! -e "${DISTDIR}/${MY_P}.tgz" ] ; then
-		eerror ""
-		eerror "Please download the appropriate WineX archive (${MY_P}.tgz)"
-		eerror "from: ${HOMEPAGE} (requires a Transgaming subscription)."
-		eerror ""
-		eerror "The archive should be placed into ${DISTDIR}."
-		eerror ""
-
-		die "package archive (${MY_P}.tgz) not found"
-	fi
-	unpack "${MY_P}.tgz"
-}
-
-src_install () {
-	mv "${WORKDIR}/usr" "${D}"
-}
-
-pkg_postinst() {
-	einfo "Run /usr/bin/winex3 to start winex as any non-root user."
-	einfo "This is a wrapper-script which will take care of creating"
-	einfo "an initial environment and do everything else."
-	einfo ""
-	einfo "Optionally, if you have binfmt_misc compiled into your kernel,"
-	einfo "you can add the following to /etc/sysctl.conf to allow direct"
-	einfo "excecution of Windows binaries through the winex wrapper:"
-	einfo ""
-	einfo "  fs.binfmt_misc.register = :WINEXE:M::MZ::/usr/bin/winex:"
-	einfo ""
-	einfo "You will also need to mount the /proc/sys/fs/binfmt_misc"
-	einfo "file system in order for this to work.  You can add the following"
-	einfo "line into your /etc/fstab file:"
-	einfo ""
-	einfo "  none  /proc/sys/fs/binfmt_misc  binfmt_misc  defaults 0 0"
-	einfo ""
-	einfo "Note: Binaries will still need excecutable permissions to run."
-	einfo "Note: If binfmt_misc is compiled as a module, make sure you"
-	einfo "have it loaded on startup by adding it to /etc/modules.autoload."
-}