Fix for vmware-server rpath problem, and possibly some additional changes in other files.

svn path=/trunk/; revision=18

9 files changed, 38 insertions, 33 deletions

diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index 5824eb8..3947ce2 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -1,12 +1,12 @@
 MD5 e422834560595f9a56b6a2036c583b97 files/99vmware-console 76
 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 files/99vmware-console 76
 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 files/99vmware-console 76
-MD5 79200f57b12b9ac0fbeb46fc81c000dc files/digest-vmware-server-console-1.0.0.22088 313
-RMD160 4262098d2214feebeb7ad9ed5d48fb52d48afdb9 files/digest-vmware-server-console-1.0.0.22088 313
-SHA256 4d4976c627332753485da53cda9e3dcf5a816f1c22684c69575a54660312e85e files/digest-vmware-server-console-1.0.0.22088 313
+MD5 95d5cc899c728226c3f5aa8cee4e684b files/digest-vmware-server-console-1.0.0.22088 313
+RMD160 ff1743f0baf5b6eaacabe0d6d89ab0e5733b662b files/digest-vmware-server-console-1.0.0.22088 313
+SHA256 fa2d858dc5fb5349991ec500529a742cae6b2c9652938dad3352187c311e4842 files/digest-vmware-server-console-1.0.0.22088 313
 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 da36b752720a87c3c1217c6e6cf9ea5d vmware-server-console-1.0.0.22088.ebuild 5135
-RMD160 e9596b628a34698d7e55e91cbb13f20a0531e231 vmware-server-console-1.0.0.22088.ebuild 5135
-SHA256 e9c044fabbc8ef28f2d18fbf483680888442a209d8b70e19e64aedf0f941aa99 vmware-server-console-1.0.0.22088.ebuild 5135
+MD5 9e90ffe50a5d4413eac44927eb47c47f vmware-server-console-1.0.0.22088.ebuild 5067
+RMD160 202369ce417d010b60188a5088c87f56be8cf8bf vmware-server-console-1.0.0.22088.ebuild 5067
+SHA256 3e96499fd5aa8bfe9f9b456745de11d763cc7e576896890d66becf0fed39e945 vmware-server-console-1.0.0.22088.ebuild 5067
diff --git a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22088 b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22088
index 9017115..153ff71 100644
--- a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22088
+++ b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22088
@@ -1,3 +1,3 @@
+MD5 e8774283a9495cdb88c166d349740ace VMware-server-linux-client-e.x.p-22088.zip 33556121
 RMD160 ee708c1b0e78f62baa23e068069aff750388d1d1 VMware-server-linux-client-e.x.p-22088.zip 33556121
 SHA256 bd57dc91542f19590e4e4f0cbff1d65685f7e8eb5c826a9cb54f191143254762 VMware-server-linux-client-e.x.p-22088.zip 33556121
-MD5 e8774283a9495cdb88c166d349740ace VMware-server-linux-client-e.x.p-22088.zip 33556121
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
index c9948b0..0bf2184 100644
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22088.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
 
 # 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
diff --git a/app-emulation/vmware-server-modules/Manifest b/app-emulation/vmware-server-modules/Manifest
index 0073e57..5138ee8 100644
--- a/app-emulation/vmware-server-modules/Manifest
+++ b/app-emulation/vmware-server-modules/Manifest
@@ -1,12 +1,12 @@
-MD5 9706a902ea0aa3f50edee57d0731d9b5 files/digest-vmware-server-modules-1.0.0.22088 286
-RMD160 fd339c1951229da135a7151c7cf156814368c1ff files/digest-vmware-server-modules-1.0.0.22088 286
-SHA256 b1b0e2a8aa1ef2c0757d6b4b328d0fa5e9d2fa75a85d8059fba39a641692cec2 files/digest-vmware-server-modules-1.0.0.22088 286
+MD5 b0b9dc6dfebae0263cc93ff965a9bd02 files/digest-vmware-server-modules-1.0.0.22088 286
+RMD160 63f90e06ede40b62fb3cc927bcf329ca5613885d files/digest-vmware-server-modules-1.0.0.22088 286
+SHA256 2d51fda762c6249e64277e425b65d49f414d8650056359f62d2557205ec1f54c files/digest-vmware-server-modules-1.0.0.22088 286
 MD5 b90ff7e76d6c548c562b6bb276ad28ae files/vmware-server-modules-1.0.0.22088-makefile.patch 343
 RMD160 d2f63ede9d9dbc6ec94ccede9177a5a15a678e62 files/vmware-server-modules-1.0.0.22088-makefile.patch 343
 SHA256 fadf02891dd78611790f6b59c2ba7ec5aaaa9767bbe779d97e6c3b38aaaa7b94 files/vmware-server-modules-1.0.0.22088-makefile.patch 343
 MD5 adcad68386a2f83052102dc6798ec5b1 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
 RMD160 dbb5a1608a0387a0820f6e872497782c92a1fb96 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
 SHA256 41802b0831b12982b3166551ac3b6fdcce512aee7230ca1f71863511e4bbd697 files/vmware-server-modules-1.0.0.22088-makefile2.patch 535
-MD5 79aaaacc8a77b0254468a4e77e995d76 vmware-server-modules-1.0.0.22088.ebuild 1520
-RMD160 bdd7484ce919cc71246bda2ceef8b3ab4d941f2a vmware-server-modules-1.0.0.22088.ebuild 1520
-SHA256 45ac8215f826faaa46be6dd5de6576462c1bb0e5254ac475e1cabccb396a7d4a vmware-server-modules-1.0.0.22088.ebuild 1520
+MD5 dcafa09ca0547e198997a9b2c481940c vmware-server-modules-1.0.0.22088.ebuild 1452
+RMD160 8194339c13ba0e7372ebd208854f1dfb847e6936 vmware-server-modules-1.0.0.22088.ebuild 1452
+SHA256 cc2fbe84a03aa1ac1d51d05105933694591806bb82122d0e04d0073aac05ba48 vmware-server-modules-1.0.0.22088.ebuild 1452
diff --git a/app-emulation/vmware-server-modules/files/digest-vmware-server-modules-1.0.0.22088 b/app-emulation/vmware-server-modules/files/digest-vmware-server-modules-1.0.0.22088
index 98030eb..295c83d 100644
--- a/app-emulation/vmware-server-modules/files/digest-vmware-server-modules-1.0.0.22088
+++ b/app-emulation/vmware-server-modules/files/digest-vmware-server-modules-1.0.0.22088
@@ -1,3 +1,3 @@
+MD5 2251d0f34ca25d9aafdcecb30b45bd3f VMware-server-e.x.p-22088.tar.gz 106171986
 RMD160 c2d5023cde38f5def157e092b809d141287d92bc VMware-server-e.x.p-22088.tar.gz 106171986
 SHA256 1285b55763be2470e49aaceee555bfa33904b5e3d0ee728915ab7060c81159a2 VMware-server-e.x.p-22088.tar.gz 106171986
-MD5 2251d0f34ca25d9aafdcecb30b45bd3f VMware-server-e.x.p-22088.tar.gz 106171986
diff --git a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
index e5c5fcf..8f9a645 100644
--- a/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server-modules/vmware-server-modules-1.0.0.22088.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
 
 inherit linux-mod eutils versionator toolchain-funcs
 
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index a7dc85b..e804709 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -1,9 +1,9 @@
 MD5 d845f6ccdeb1a1ffda1fb84c09a473ee files/90vmware-server 91
 RMD160 2a9e2e9d428a06ceac7faec500e6b1423da34b25 files/90vmware-server 91
 SHA256 3175cd9665850cf0d25a96849135c93ab129127370d55572f0137ba3d210e423 files/90vmware-server 91
-MD5 9706a902ea0aa3f50edee57d0731d9b5 files/digest-vmware-server-1.0.0.22088 286
-RMD160 fd339c1951229da135a7151c7cf156814368c1ff files/digest-vmware-server-1.0.0.22088 286
-SHA256 b1b0e2a8aa1ef2c0757d6b4b328d0fa5e9d2fa75a85d8059fba39a641692cec2 files/digest-vmware-server-1.0.0.22088 286
+MD5 ca915d5c59d993e95d31dc4939c4dc2c files/digest-vmware-server-1.0.0.22088 632
+RMD160 54e9ff9359e439954a6df57a0678c983f748aeb0 files/digest-vmware-server-1.0.0.22088 632
+SHA256 e3d2b618210033c361e9e7f0b5fccb9b9ec129005d11b9a4b26c00d9eacd4495 files/digest-vmware-server-1.0.0.22088 632
 MD5 23d97e5e436a0d827b48db3ed9948aa7 files/vmware-server-1.0.0.22088-config.patch 1131
 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a files/vmware-server-1.0.0.22088-config.patch 1131
 SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62 files/vmware-server-1.0.0.22088-config.patch 1131
@@ -37,6 +37,6 @@ SHA256 6ec6c667133ea5445df8dd52d8accac6e0177bbdfb4d067b4c68a315acabdf13 files/vm
 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 5aa74c6b8a4cf6b4b05054fc78659058 vmware-server-1.0.0.22088.ebuild 9397
-RMD160 8dedc3a8ed41e311550d1769e1bb7490fae4fd47 vmware-server-1.0.0.22088.ebuild 9397
-SHA256 900b46a56208d01ea1ae0d0557a8cfc0dceeba712d8f8a41a0f97cc1f29af333 vmware-server-1.0.0.22088.ebuild 9397
+MD5 f6246469a99e80b09214d20d89aec709 vmware-server-1.0.0.22088.ebuild 9432
+RMD160 081e3b57ae3c729e7c7395f4753d2f4ac4caf0f6 vmware-server-1.0.0.22088.ebuild 9432
+SHA256 1b418df633520e1c3eb30dfcec2f2ab44a05900e8a742b11cafd45281163f610 vmware-server-1.0.0.22088.ebuild 9432
diff --git a/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.22088 b/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.22088
index 98030eb..5085559 100644
--- a/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.22088
+++ b/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.22088
@@ -1,3 +1,6 @@
+MD5 2251d0f34ca25d9aafdcecb30b45bd3f VMware-server-e.x.p-22088.tar.gz 106171986
 RMD160 c2d5023cde38f5def157e092b809d141287d92bc VMware-server-e.x.p-22088.tar.gz 106171986
 SHA256 1285b55763be2470e49aaceee555bfa33904b5e3d0ee728915ab7060c81159a2 VMware-server-e.x.p-22088.tar.gz 106171986
-MD5 2251d0f34ca25d9aafdcecb30b45bd3f VMware-server-e.x.p-22088.tar.gz 106171986
+MD5 8b80eee992cf38a8dac1049b43866e19 vmware-server-1.0.0.22088-rpath-corrected-libs.tar.bz2 1296057
+RMD160 db539866f4b288d8a5e108cab43ba4b26a502092 vmware-server-1.0.0.22088-rpath-corrected-libs.tar.bz2 1296057
+SHA256 f807d68407beba210e3642682c8a1d8df6d0a6b8f16ef12bbd29612949e3e317 vmware-server-1.0.0.22088-rpath-corrected-libs.tar.bz2 1296057
diff --git a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
index 98311c1..0789926 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.0.22088.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
 
 # 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
@@ -15,7 +15,8 @@ S="${WORKDIR}/vmware-server-distrib"
 
 DESCRIPTION="VMware Server for Linux"
 HOMEPAGE="http://www.vmware.com/"
-SRC_URI="http://download3.vmware.com/software/vmserver/${NP}.tar.gz"
+SRC_URI="http://download3.vmware.com/software/vmserver/${NP}.tar.gz
+		 http://dev.gentoo.org/~wolf31o2/sources/dump/${P}-rpath-corrected-libs.tar.bz2"
 
 LICENSE="vmware"
 IUSE=""
@@ -64,7 +65,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${NP}.tar.gz
+	unpack ${A}
 	cd ${S}
 	# patch the config to not install desktop/icon files
 	epatch ${FILESDIR}/${P}-config.patch
@@ -87,15 +88,16 @@ src_unpack() {
 	use amd64 && cp ${FILESDIR}/${P}-vmware-authd-amd64	${S}/etc/pam.d/vmware-authd
 
 	# Fix up all the broken rpaths
-	einfo "Removing empty RPATH variables from perl libraries..."
+	#einfo "Removing empty RPATH variables from perl libraries..."
 
-	for sobj in `find ${S}/lib/perl5/site_perl/5.005/ -name *.so -and ! -name PAM.so -and ! -name POSIX.so`;
-	do
+	#for sobj in `find ${S}/lib/perl5/site_perl/5.005/ -name *.so -and ! -name PAM.so -and ! -name POSIX.so`;
+	#do
 		# Change the permissions for FEATURES="userpriv"
-		chmod u+w $sobj
-		chrpath -d $sobj
-		chmod u-w $sobj
-	done
+	#	chmod u+w $sobj
+	#	echo $sobj
+	#	chrpath -d $sobj
+	#	chmod u-w $sobj
+	#done
 }
 
 src_install() {