use use flag kde or gnome to choose gksu or kdesu

svn path=/trunk/; revision=504

2 files changed, 21 insertions, 10 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 540183e..dd7c03b 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -8,5 +8,5 @@ DIST VMware-Workstation-7.1.5-491717.x86_64.bundle 137361206 RMD160 b5f302400a0c
 DIST VMware-Workstation-Full-8.0.0-471780.i386.bundle 337749469 RMD160 6505d7511ce86f55cff392faa220021c0e5b5e7f SHA1 00a7a255e060fb2883b32c4267b16ad7af204e5c SHA256 6fbdd01c7ee378bc3352b8c230bec0deae352e3aa0e3d0101fe2af3aab6fcff7
 DIST VMware-Workstation-Full-8.0.0-471780.x86_64.bundle 337435853 RMD160 ed5881078e7eb60699f6d0180c305f6a240e4360 SHA1 1e75bda32c0dd7aa81d1953464d35236335ddf6e SHA256 6a9099659484a1de2bee50c96ddd3dc1b91c6ab02b067288e1c17c2b6d5a9f9a
 EBUILD vmware-workstation-7.1.5.491717.ebuild 8264 RMD160 a90d1e633561f0d47aa252b63812e6c5e331ee94 SHA1 2a73547f67b10dda1d97d8d1c78f0231ebfdfc9f SHA256 b30027da9c1e27f88eb6edf69a53d38cc1f21e8e6d4b92164f5efea8e7111d2f
-EBUILD vmware-workstation-8.0.0.471780-r5.ebuild 13264 RMD160 2fbd1127c11009c69d4e7fdfb45397734511a8f5 SHA1 fd78058d0d5782791dfd61265fa3f51aadd6b889 SHA256 d8ee704a1c1d80fa19b6c710446c416ea7d9b3cd5a522a67faadfdc7adebba82
+EBUILD vmware-workstation-8.0.0.471780-r5.ebuild 13503 RMD160 41e7fc844cf5063e561d5777a4f45c5e1925be8d SHA1 0c454f9d06b01352f478c6bd0fac7120ce9ab18e SHA256 3880000b567a23dd3b7728dcc06536210a5c9978ddd83c5f583539bbf04bd10e
 MISC metadata.xml 821 RMD160 3fe06e26c1f6550712d29d27dbbe1bde8eeb3d29 SHA1 4cacecf9b113a8c46e921e1738d5c191bf693872 SHA256 b5634de5978f816c03495e72d4ee1cb72b372209ee7b8a8e88cec8963aa38647
diff --git a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r5.ebuild b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r5.ebuild
index 3ef8950..3535283 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r5.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.0.471780-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="vmware"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc ovftool server vix vmware-tools"
+IUSE="cups doc gnome kde ovftool server vix vmware-tools"
 RESTRICT="binchecks fetch mirror strip"
 
 # vmware-workstation should not use virtual/libc as this is a
@@ -56,7 +56,8 @@ RDEPEND="dev-cpp/cairomm
 	sys-libs/glibc
 	sys-libs/zlib
 	x11-libs/cairo
-	x11-libs/gksu
+	gnome? ( x11-libs/gksu )
+	kde? ( kde-base/kdesu )
 	x11-libs/gtk+:2
 	x11-libs/libgksu
 	x11-libs/libICE
@@ -139,13 +140,17 @@ src_prepare() {
 		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
 	fi
 
-	# remove superfluous libraries
-	ebegin 'Removing superfluous libraries'
-	cd lib/lib || die
+	#ebegin 'Removing superfluous libraries'
+	#cd lib/lib || die
 	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
 	# see http://forums.gentoo.org/viewtopic-t-835867.html
-	#ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.8 libssl.so.0.9.8' | xargs -d'\n' -r rm -rf
-	eend
+	#ldconfig -p | \
+	#	sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
+	#	fgrep -vx 'libcrypto.so.0.9.8'| \
+	#	fgrep -vx 'libssl.so.0.9.8i' | \
+	#	fgrep -vx 'libglib-2.0.so.0' | \
+	#	xargs -d'\n' -r rm -rf
+	#eend
 }
 
 src_install() {
@@ -279,8 +284,14 @@ src_install() {
 	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
 
 	# fixing gksu problem
-	rm "${D}${VM_INSTALL_DIR}"/bin/vmware-gksu
-	dosym /usr/bin/gksu "${VM_INSTALL_DIR}"/bin/vmware-gksu
+	if use gnome; then
+		rm "${D}${VM_INSTALL_DIR}"/bin/vmware-gksu
+		dosym /usr/bin/gksu "${VM_INSTALL_DIR}"/bin/vmware-gksu
+	fi
+	if use kde; then
+		rm "${D}${VM_INSTALL_DIR}"/bin/vmware-gksu
+		dosym /usr/bin/kdesu "${VM_INSTALL_DIR}"/bin/vmware-gksu
+	fi
 
 	# fix up permissions
 	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,lib/libgksu2.so.0/gksu-run-helper,setup/*}