Partially revert previous commit due to bug #115141.

Package-Manager: portage-2.0.53

3 files changed, 13 insertions, 7 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 677a40eb6cd1..5260e48358c7 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,10 @@
 # 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.108 2005/12/12 13:09:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.109 2005/12/12 17:04:45 wolf31o2 Exp $
+
+  12 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-workstation-5.5.0.18463.ebuild:
+  Partially revert previous commit due to bug #115141.
 
   12 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   vmware-workstation-5.5.0.18463.ebuild:
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 00a4a301d8eb..ccee0603acac 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,4 +1,4 @@
-MD5 584dc990d1c4b740051c4becc0696ce2 ChangeLog 25933
+MD5 eb7dee3a3450ae8fc944715b1775d477 ChangeLog 26084
 MD5 48c1667773503fee21a1068da07440b9 files/3.2.1.2242/90vmware-workstation 70
 MD5 cd2c7dfb0ea80293b3647713f5e35969 files/3.2.1.2242/vmware 1419
 MD5 3bfb39f5e96f60db67c7246f74c21501 files/3.2.1.2242/vmware-config.pl-gcc-generalized.patch 2948
@@ -18,4 +18,4 @@ MD5 a4e5ebe5e931d6196fd49550e067b078 metadata.xml 339
 MD5 ff542a49592f85ae22a5d8d4885bb67f vmware-workstation-3.2.1.2242-r6.ebuild 8014
 MD5 d89297f3be1f9476c4b89ddd7ed0d945 vmware-workstation-4.5.2.8848-r9.ebuild 8375
 MD5 36628a7f078ead2930b8cdd2a4dbea79 vmware-workstation-5.0.0.13124-r4.ebuild 8313
-MD5 6f673856bf7e00bda78a1d9f7330af7e vmware-workstation-5.5.0.18463.ebuild 8513
+MD5 19dfd63d8523dc3c603e50f399cc1088 vmware-workstation-5.5.0.18463.ebuild 8582
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18463.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18463.ebuild
index abfc36736728..4fd01c37b063 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18463.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18463.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.5.0.18463.ebuild,v 1.3 2005/12/12 13:09:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.0.18463.ebuild,v 1.4 2005/12/12 17:04:45 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
@@ -58,7 +58,8 @@ src_unpack() {
 	# patch the config to not install desktop/icon files
 	epatch ${FILESDIR}/${P}-config.patch
 	# patch the config to make /etc/vmware/config writable
-	epatch ${FILESDIR}/${P}-config2.patch
+# I am commenting this until I can get a proper patch.  Blame the whiners.
+#	epatch ${FILESDIR}/${P}-config2.patch
 #	unpack ${ANY_ANY}.tar.gz
 #	mv -f ${ANY_ANY}/*.tar ${S}/lib/modules/source/
 #	cd ${S}/${ANY_ANY}
@@ -136,11 +137,12 @@ src_install() {
 	# this removes the user/group warnings
 	chown -R root:0 ${D} || die
 
+	dodir /etc/vmware
 	# this makes the vmware-vmx executable only executable by vmware group
-	fowners root:vmware ${dir}/lib/bin{,-debug}/vmware-vmx /etc/vmware/config \
+	fowners root:vmware ${dir}/lib/bin{,-debug}/vmware-vmx /etc/vmware \
 		|| die "Changing permissions"
 	fperms 4750 ${dir}/lib/bin{,-debug}/vmware-vmx || die
-	fperms 770 /etc/vmware /etc/vmware/config || die
+	fperms 770 /etc/vmware || die
 
 	# this adds udev rules for vmmon*
 	dodir /etc/udev/rules.d