General cleanup and closing bug #81344.

(Portage version: 2.0.51.16)

5 files changed, 62 insertions, 41 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index f9717eef54c4..f8f035a1a8f0 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,15 @@
 # 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.71 2005/01/28 19:43:58 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.72 2005/02/09 15:20:18 wolf31o2 Exp $
+
+*vmware-workstation-4.5.2.8848-r3 (09 Feb 2005)
+
+  09 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -vmware-workstation-3.2.1.2242-r2.ebuild,
+  +vmware-workstation-3.2.1.2242-r3.ebuild,
+  -vmware-workstation-4.5.2.8848-r2.ebuild,
+  +vmware-workstation-4.5.2.8848-r3.ebuild:
+  General cleanup and closing bug #81344.
 
 *vmware-workstation-5.0_rc1 (28 Jan 2005)
 
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r2 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r3
index 345f2278b116..36b2460b02bd 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r2
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-3.2.1.2242-r3
@@ -1,3 +1,3 @@
 MD5 56dccf022582a374cf2eac06796115cf VMware-workstation-3.2.1-2242.tar.gz 12577292
-MD5 e8fb10c1f2fe8ae5a0d573b6551361c8 vmware-any-any-update84.tar.gz 263743
+MD5 97bff1ea0d8e96edea8f55115cf9aee0 vmware-any-any-update89.tar.gz 263782
 MD5 7ca1ec14670b51d8cf824a58bc8d6621 vmware.png 470
diff --git a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r2 b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r3
index c60a5a830128..a5e0f6bb657f 100644
--- a/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r2
+++ b/app-emulation/vmware-workstation/files/digest-vmware-workstation-4.5.2.8848-r3
@@ -1,3 +1,3 @@
 MD5 cd52130a4ad753ac9d017cc031038a3c VMware-workstation-4.5.2-8848.tar.gz 43948624
-MD5 9a09df5f9f0004d662f215435e2998f4 vmware-any-any-update88.tar.gz 263677
+MD5 97bff1ea0d8e96edea8f55115cf9aee0 vmware-any-any-update89.tar.gz 263782
 MD5 7ca1ec14670b51d8cf824a58bc8d6621 vmware.png 470
diff --git a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r3.ebuild
index d43789032a66..2c0f3aa5e210 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r3.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-3.2.1.2242-r2.ebuild,v 1.8 2005/01/11 16:37:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-3.2.1.2242-r3.ebuild,v 1.1 2005/02/09 15:20:18 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VM Ware.  The agreeing to a licence is part of the configure step
@@ -9,7 +9,7 @@
 inherit gcc eutils
 
 S=${WORKDIR}/vmware-distrib
-ANY_ANY="vmware-any-any-update84"
+ANY_ANY="vmware-any-any-update89"
 NP="VMware-workstation-3.2.1-2242"
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
@@ -32,10 +32,14 @@ KEYWORDS="-* x86"
 IUSE=""
 RESTRICT="nostrip"
 
-DEPEND="virtual/libc
+RDEPEND=">=dev-lang/perl-5
+	sys-libs/glibc
 	virtual/x11
 	virtual/os-headers
-	>=dev-lang/perl-5"
+	media-libs/gdk-pixbuf"
+
+dir=/opt/vmware
+Ddir=${D}/${dir}
 
 src_unpack() {
 	check_KV
@@ -64,23 +68,25 @@ src_install() {
 	# lets make gcc happy regardless of what version we're using
 	epatch ${FILESDIR}/${PV}/vmware-config.pl-gcc-generalized.patch
 
-	dodir /opt/vmware/bin
-	cp -a bin/* ${D}/opt/vmware/bin/
-	# vmware and vmware-ping needs to be suid root.
-	chmod u+s ${D}/opt/vmware/bin/vmware
-	chmod u+s ${D}/opt/vmware/bin/vmware-ping
+	dodir ${dir}/bin
+	cp -a bin/* ${Ddir}/bin
 
-	dodir /opt/vmware/lib
-	cp -a lib/* ${D}/opt/vmware/lib/
+	dodir ${Ddir}/lib
+	cp -a lib/* ${Ddir}/lib
 	# 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 ${D}/opt/vmware/lib/modules/binary
+	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
+	# We set vmware-vmx and vmware-ping suid
+	chmod u+s ${Ddir}/bin/vmware-ping
+	chmod u+s ${Ddir}/lib/bin/vmware-vmx
 
-	dodir /opt/vmware/doc
-	cp -a doc/* ${D}/opt/vmware/doc/
+	dodir ${dir}/doc
+	cp -a doc/* ${Ddir}doc
 
-	dodir /opt/vmware/man/
-	cp -a man/* ${D}/opt/vmware/man/
+	dodir ${dir}/man
+	cp -a man/* ${Ddir}/man
 
 	# vmware service loader
 	exeinto /etc/init.d
@@ -109,7 +115,7 @@ src_install() {
 	keepdir /etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d
 
 	# A simple icon I made
-	insinto /opt/vmware/lib/icon
+	insinto ${dir}/lib/icon
 	doins ${DISTDIR}/vmware.png || die
 	doicon ${DISTDIR}/vmware.png || die
 
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r3.ebuild
index 5dc581f4d8c5..5a4e0dd423a8 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.2.8848-r3.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-r2.ebuild,v 1.5 2005/01/11 16:37:45 wolf31o2 Exp $
+# $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 $
 
 # 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
@@ -9,7 +9,7 @@
 inherit eutils
 
 S=${WORKDIR}/vmware-distrib
-ANY_ANY="vmware-any-any-update88"
+ANY_ANY="vmware-any-any-update89"
 NP="VMware-workstation-4.5.2-8848"
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
@@ -34,12 +34,16 @@ SLOT="0"
 KEYWORDS="-* x86 amd64"
 RESTRICT="nostrip"
 
-DEPEND="virtual/libc
+RDEPEND=">=dev-lang/perl-5
+	sys-libs/glibc
 	virtual/x11
 	virtual/os-headers
-	>=dev-lang/perl-5
+	media-libs/gdk-pixbuf
 	sys-apps/pciutils"
 
+dir=/opt/vmware
+Ddir=${D}/${dir}
+
 src_unpack() {
 	unpack ${NP}.tar.gz
 	cd ${S}
@@ -55,23 +59,25 @@ src_unpack() {
 }
 
 src_install() {
-	dodir /opt/vmware/bin
-	cp -a bin/* ${D}/opt/vmware/bin/
-
-	dodir /opt/vmware/lib
-	cp -dr lib/* ${D}/opt/vmware/lib/
-
-	chmod u+s ${D}/opt/vmware/lib/bin/vmware-vmx || die
+	dodir ${dir}/bin
+	cp -a bin/* ${Ddir}/bin
 
+	dodir ${dir}/lib
+	cp -dr lib/* ${Ddir}/lib
 	# 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 ${D}/opt/vmware/lib/modules/binary
+	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
+	# We set vmware-vmx and vmware-ping suid
+	chmod u+s ${Ddir}/bin/vmware-ping
+	chmod u+s ${Ddir}/lib/bin/vmware-vmx
 
-	dodir /opt/vmware/doc
-	cp -a doc/* ${D}/opt/vmware/doc/
+	dodir ${dir}/doc
+	cp -a doc/* ${Ddir}/doc
 
-	dodir /opt/vmware/man/
-	cp -a man/* ${D}/opt/vmware/man/
+	dodir ${dir}/man
+	cp -a man/* ${Ddir}/man
 
 	# vmware service loader
 	exeinto /etc/init.d
@@ -100,14 +106,14 @@ src_install() {
 	keepdir /etc/vmware/init.d/rc{0,1,2,3,4,5,6}.d
 
 	# A simple icon I made
-	insinto /opt/vmware/lib/icon
+	insinto ${dir}/lib/icon
 	doins ${DISTDIR}/vmware.png || die
 	doicon ${DISTDIR}/vmware.png || die
 
 	make_desktop_entry vmware "VMWare Workstation" vmware.png
 
 	dodir /usr/bin
-	dosym /opt/vmware/bin/vmware /usr/bin/vmware
+	dosym ${dir}/bin/vmware /usr/bin/vmware
 
 	# Questions:
 	einfo "Adding answers to /etc/vmware/locations"
@@ -134,7 +140,7 @@ pkg_preinst() {
 
 	einfo "Generating /etc/vmware/locations file."
 	d=`echo ${D} | wc -c`
-	for x in `find ${D}/opt/vmware ${D}/etc/vmware` ; do
+	for x in `find ${Ddir} ${D}/etc/vmware` ; do
 		x="`echo ${x} | cut -c ${d}-`"
 		if [ -d ${D}/${x} ] ; then
 			echo "directory ${x}" >> ${D}/etc/vmware/locations
@@ -158,8 +164,8 @@ pkg_config() {
 	# In case pkg_config() ends up being the defacto standard for
 	# configuring packages (malverian <malverian@gentoo.org>)
 
-	einfo "Running /opt/vmware/bin/vmware-config.pl"
-	/opt/vmware/bin/vmware-config.pl
+	einfo "Running ${dir}/bin/vmware-config.pl"
+	${dir}/bin/vmware-config.pl
 }
 
 pkg_postinst() {