Updated with a better solution for bug #81344, as the old one broke amd64 support.

Package-Manager: portage-2.0.51.16

4 files changed, 23 insertions, 8 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index f8f035a1a8f0..078c3d1cfe65 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,14 @@
 # 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.72 2005/02/09 15:20:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.73 2005/02/10 19:15:20 wolf31o2 Exp $
+
+*vmware-workstation-4.5.2.8848-r4 (10 Feb 2005)
+
+  10 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -vmware-workstation-4.5.2.8848-r3.ebuild,
+  +vmware-workstation-4.5.2.8848-r4.ebuild:
+  Updated with a better solution for bug #81344, as the old one broke amd64
+  support.
 
 *vmware-workstation-4.5.2.8848-r3 (09 Feb 2005)
 
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index caccb6223ccd..37ae96b2f4ff 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 fdc71e655b382e019b21e26565b55648 vmware-workstation-4.5.2.8848-r3.ebuild 7041
 MD5 668f9feebaccd4f013d1a1030370cf21 vmware-workstation-5.0_beta1.ebuild 5954
 MD5 ea4ede5466ee22cb95eae1788de244bf vmware-workstation-3.2.1.2242-r3.ebuild 6909
-MD5 acad5c5f0ff1e71c1f02b561118f346c ChangeLog 15974
+MD5 aa398b0d8d45335f2f7d6b31aef4ed62 vmware-workstation-4.5.2.8848-r4.ebuild 7309
+MD5 1f3f4641040baccfb16717e38e6330b8 ChangeLog 16253
 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 6b80b2fbc93e98a8656064831376fffe files/digest-vmware-workstation-4.5.2.8848-r3 210
+MD5 505e948af9e36a1c87619a257bda7d02 files/digest-vmware-workstation-4.5.2.8848-r4 301
 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-r3 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r4
index a5e0f6bb657f..ecc766efbada 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r3
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r4
@@ -1,3 +1,4 @@
 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-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r4.ebuild
index 5a4e0dd423a8..987a9cd4b43c 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r3.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r4.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-r3.ebuild,v 1.1 2005/02/09 15:20:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r4.ebuild,v 1.1 2005/02/10 19:15:20 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,7 +26,9 @@ 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"
+	mirror://gentoo/vmware.png
+	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}-rpath-fix.tar.bz2
+	mirror://gentoo/${P}-rpath-fix.tar.bz2"
 
 LICENSE="vmware"
 IUSE=""
@@ -38,7 +40,6 @@ RDEPEND=">=dev-lang/perl-5
 	sys-libs/glibc
 	virtual/x11
 	virtual/os-headers
-	media-libs/gdk-pixbuf
 	sys-apps/pciutils"
 
 dir=/opt/vmware
@@ -46,6 +47,7 @@ Ddir=${D}/${dir}
 
 src_unpack() {
 	unpack ${NP}.tar.gz
+	unpack ${P}-rpath-fix.tar.bz2
 	cd ${S}
 	unpack ${ANY_ANY}.tar.gz
 	mv -f ${ANY_ANY}/*.tar ${S}/lib/modules/source/
@@ -68,7 +70,8 @@ src_install() {
 	# 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
+	rm -rf ${Ddir}/lib/lib/libgdk_pixbuf.so.2/libpixbufloader-{png,xpm}.so.1.0.0
+	cp ${S}/rpath-fix/* ${Ddir}/lib/lib/libgdk_pixbuf.so.2
 	# We set vmware-vmx and vmware-ping suid
 	chmod u+s ${Ddir}/bin/vmware-ping
 	chmod u+s ${Ddir}/lib/bin/vmware-vmx
@@ -115,6 +118,9 @@ src_install() {
 	dodir /usr/bin
 	dosym ${dir}/bin/vmware /usr/bin/vmware
 
+	# this removes the group warnings
+	chgrp -R root ${Ddir}
+
 	# Questions:
 	einfo "Adding answers to /etc/vmware/locations"
 	locations="${D}/etc/vmware/locations"