Improved fix for bug #81344, which requires no external libraries.

Package-Manager: portage-2.0.51.16

4 files changed, 21 insertions, 14 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 078c3d1cfe65..1ad8159f4507 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2005/02/10 19:15:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.74 2005/02/11 16:45:54 wolf31o2 Exp $
+
+*vmware-workstation-4.5.2.8848-r5 (11 Feb 2005)
+
+  11 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -vmware-workstation-4.5.2.8848-r4.ebuild,
+  +vmware-workstation-4.5.2.8848-r5.ebuild:
+  Improved fix for bug #81344, which requires no external libraries.
 
 *vmware-workstation-4.5.2.8848-r4 (10 Feb 2005)
 
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 87415aca5107..1365a10201ec 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,14 +1,14 @@
 MD5 d76cf4953cfbd123e308087144a0a3ad vmware-workstation-5.0_rc1.ebuild 5954
 MD5 668f9feebaccd4f013d1a1030370cf21 vmware-workstation-5.0_beta1.ebuild 5954
+MD5 dfb02e484f9db75018f37f857c573ce7 vmware-workstation-4.5.2.8848-r5.ebuild 7286
 MD5 ea4ede5466ee22cb95eae1788de244bf vmware-workstation-3.2.1.2242-r3.ebuild 6909
-MD5 72824fcc3671b1cd81aca5259a0799ec vmware-workstation-4.5.2.8848-r4.ebuild 7313
-MD5 1f3f4641040baccfb16717e38e6330b8 ChangeLog 16253
+MD5 d8784115ab96fc7465c3b65d958e43d1 ChangeLog 16514
 MD5 a4e5ebe5e931d6196fd49550e067b078 metadata.xml 339
 MD5 6b8a8da4e24fdfdf5f7ed53a5e92d8c6 vmware-workstation-5.0_beta2.ebuild 5954
 MD5 48c1667773503fee21a1068da07440b9 files/90vmware 70
 MD5 1a72b09b718dd43f60908f488eaa2918 files/digest-vmware-workstation-5.0_beta1 84
 MD5 3f93465c48a0da943c2c2d1683504536 files/digest-vmware-workstation-5.0_beta2 84
-MD5 505e948af9e36a1c87619a257bda7d02 files/digest-vmware-workstation-4.5.2.8848-r4 301
+MD5 6b80b2fbc93e98a8656064831376fffe files/digest-vmware-workstation-4.5.2.8848-r5 210
 MD5 eea6f7ed65d7d8ca7a98e717021ed745 files/digest-vmware-workstation-3.2.1.2242-r3 210
 MD5 c2dc0111fb5bf45ff99578b57d349cb3 files/vmware.rc 1417
 MD5 86c5caa65c25f8b6e86c1bfd7e0068e3 files/digest-vmware-workstation-5.0_rc1 84
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r4 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r5
index ecc766efbada..a5e0f6bb657f 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r4
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r5
@@ -1,4 +1,3 @@
 MD5 cd52130a4ad753ac9d017cc031038a3c VMware-workstation-4.5.2-8848.tar.gz 43948624
 MD5 97bff1ea0d8e96edea8f55115cf9aee0 vmware-any-any-update89.tar.gz 263782
 MD5 7ca1ec14670b51d8cf824a58bc8d6621 vmware.png 470
-MD5 2d8c3b14a7c71a94cd374d71131198f0 vmware-workstation-4.5.2.8848-rpath-fix.tar.bz2 48014
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r5.ebuild
index f1edf90b9447..9e47e1d31505 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r4.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r5.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-4.5.2.8848-r4.ebuild,v 1.2 2005/02/11 00:06:41 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r5.ebuild,v 1.1 2005/02/11 16:45:54 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
@@ -26,9 +26,7 @@ SRC_URI="http://vmware-svca.www.conxion.com/software/wkst/${NP}.tar.gz
 	http://ftp.cvut.cz/vmware/obselete/${ANY_ANY}.tar.gz
 	http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
 	http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${ANY_ANY}.tar.gz
-	mirror://gentoo/vmware.png
-	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}-rpath-fix.tar.bz2
-	mirror://gentoo/${P}-rpath-fix.tar.bz2"
+	mirror://gentoo/vmware.png"
 
 LICENSE="vmware"
 IUSE=""
@@ -36,6 +34,8 @@ SLOT="0"
 KEYWORDS="-* x86 amd64"
 RESTRICT="nostrip"
 
+DEPEND=">=dev-lang/perl-5"
+
 RDEPEND=">=dev-lang/perl-5
 	sys-libs/glibc
 	virtual/x11
@@ -69,9 +69,10 @@ src_install() {
 	# 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 ${Ddir}/lib/modules/binary
-	# We also remove libgdk_pixbuf stuff, to resolve bug #81344.
-	rm -rf ${Ddir}/lib/lib/libgdk_pixbuf.so.2/libpixbufloader-{png,xpm}.so.1.0.0
-	cp ${WORKDIR}/rpath-fix/* ${Ddir}/lib/lib/libgdk_pixbuf.so.2
+	# We also remove the rpath libgdk_pixbuf stuff, to resolve bug #81344.
+	perl -pi -e 's#/tmp/rrdharan/out#/opt/vmware/null/#sg' \
+		${Ddir}/lib/lib/libgdk_pixbuf.so.2/lib{gdk_pixbuf.so.2,pixbufloader-{xpm,png}.so.1.0.0} \
+		|| die "Removing rpath"
 	# We set vmware-vmx and vmware-ping suid
 	chmod u+s ${Ddir}/bin/vmware-ping
 	chmod u+s ${Ddir}/lib/bin/vmware-vmx
@@ -118,8 +119,8 @@ src_install() {
 	dodir /usr/bin
 	dosym ${dir}/bin/vmware /usr/bin/vmware
 
-	# this removes the group warnings
-	chgrp -R root ${Ddir}
+	# this removes the user/group warnings
+	chown -R root:root ${D}
 
 	# Questions:
 	einfo "Adding answers to /etc/vmware/locations"