From c8f900a8c96ec65471cce27e65f7542241c85006 Mon Sep 17 00:00:00 2001
From: Vadim Kuznetsov <vadimk@gentoo.org>
Date: Sun, 23 Oct 2011 16:06:30 +0000
Subject: clean_bundled_libs does not work in multilib

svn path=/trunk/; revision=508
---
 app-emulation/vmware-player/Manifest               |   2 +-
 .../vmware-player-4.0.0.471780-r1.ebuild           | 233 ++++++++++++++++++++
 .../vmware-player-4.0.0.471780.ebuild              | 244 ---------------------
 3 files changed, 234 insertions(+), 245 deletions(-)
 create mode 100644 app-emulation/vmware-player/vmware-player-4.0.0.471780-r1.ebuild
 delete mode 100644 app-emulation/vmware-player/vmware-player-4.0.0.471780.ebuild

(limited to 'app-emulation/vmware-player')

diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 9981e9b..ee125e5 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -7,5 +7,5 @@ DIST VMware-Player-3.1.5-491717.x86_64.bundle 103019114 RMD160 b1a2544e5718474a1
 DIST VMware-Player-4.0.0-471780.i386.bundle 131366064 RMD160 e4513ea96b557a5067b3a822b399cb5fcb4de426 SHA1 c8cb81e1d35dab000e7dbe3e1aee519fd6aa89fd SHA256 5a88940b92bebc1b5c09caecbfcbe46b05e857b8383e52d392ee62fab822e00b
 DIST VMware-Player-4.0.0-471780.x86_64.bundle 129048195 RMD160 0c4a2174212e80dc62781ef5f3b53cee682f1bcf SHA1 e1452a72895c902cc6b4f85be9f4fb79c85ac809 SHA256 5218c6d2c27b7b0d2019aaaa2573a1411bc202ad7bfa06a1a6c3df913d8dd5c4
 EBUILD vmware-player-3.1.5.491717.ebuild 6334 RMD160 ee39299fbfb01c28c1890c862d3f39a4e3d7c163 SHA1 8b90cfe522e17a5c15b742afbc139d60decf9ca6 SHA256 ea378d1d5d1308689bacf2104f618dec655f732eff2c3e52ee11acb26656c57e
-EBUILD vmware-player-4.0.0.471780.ebuild 6610 RMD160 01058b2a1f928186568cc7a3846a135127ea1a41 SHA1 281d04ddd781c1ac1692ceee19dd89479395ce66 SHA256 49cda31c67e372817a86ac689eb765ac3a702a0791be2f3e33844b5dda5eecd1
+EBUILD vmware-player-4.0.0.471780-r1.ebuild 6119 RMD160 95de6fc511bb09642221952dcd3bfc4027c482c1 SHA1 ec7687005ff737ce51da4b5a1cc414d8a47ccb52 SHA256 e07af6b3fbddfb6491fb0e04d9927b03164d5b248f7b0fe4b6b68d5fc10e40a5
 MISC metadata.xml 238 RMD160 beef158e0603e5808d104743feba4be3e7a7e8c4 SHA1 276217c6f03ae24c0196519197240031a6961254 SHA256 8374f3a2a8f05bf0690ab35f79a20980026aefa9fabae93fe81442f54291018b
diff --git a/app-emulation/vmware-player/vmware-player-4.0.0.471780-r1.ebuild b/app-emulation/vmware-player/vmware-player-4.0.0.471780-r1.ebuild
new file mode 100644
index 0000000..eea39ec
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-4.0.0.471780-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild,v 1.1 2011/04/15 12:33:18 vadimk Exp $
+
+EAPI="2"
+
+inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
+
+MY_PN="VMware-Player"
+MY_PV="$(replace_version_separator 3 - $PV)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+SRC_URI="
+	x86? ( ${MY_P}.i386.bundle )
+	amd64? ( ${MY_P}.x86_64.bundle )
+	"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc +vmware-tools"
+RESTRICT="binchecks fetch strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-cpp/libsexymm
+	dev-cpp/pangomm:1.4
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	=dev-libs/openssl-0.9.8*
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	net-misc/curl
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libsexy
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/startup-notification
+	!app-emulation/vmware-server
+	!app-emulation/vmware-workstation"
+PDEPEND="~app-emulation/vmware-modules-264.0
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+pkg_nofetch() {
+	local bundle
+
+	if use x86; then
+		bundle="${MY_P}.i386.bundle"
+	elif use amd64; then
+		bundle="${MY_P}.x86_64.bundle"
+	fi
+
+	einfo "Please download ${bundle}"
+	einfo "from ${HOMEPAGE}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_unpack() {
+	local component ; for component in \
+			vmware-player-app \
+			vmware-vmx \
+			vmware-usbarbitrator \
+			vmware-network-editor
+			#vmware-player-setup
+			#vmware-ovftool
+	do
+		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" "${component}" "${S}"
+	done
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
+	# see http://forums.gentoo.org/viewtopic-t-835867.html
+	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
+	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
+libssl.so.0.9.8
+libgcr.so.0' | while read -r libname libpath ; do
+		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
+	done
+	eend
+}
+
+src_install() {
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/* || die "failed to install bin"
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/* || die "failed to install lib"
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share || die "failed to install share"
+
+	# install documentation
+	if use doc; then
+		dodoc doc/* || die "failed to install docs"
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in vmplayer{,-daemon} \
+			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" || die
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer || die
+
+	# fix up permissions
+	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh}
+	chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}" || die
+
+	# create the configuration
+	dodir /etc/vmware || die
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+	EOF
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware || die
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-i "${D}/usr/share/applications/${PN}.desktop" || die
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	ewarn "Before you can use vmware-player, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-player/vmware-player-4.0.0.471780.ebuild b/app-emulation/vmware-player/vmware-player-4.0.0.471780.ebuild
deleted file mode 100644
index 836ba20..0000000
--- a/app-emulation/vmware-player/vmware-player-4.0.0.471780.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild,v 1.1 2011/04/15 12:33:18 vadimk Exp $
-
-EAPI="2"
-
-inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV="$(replace_version_separator 3 - $PV)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-SRC_URI="
-	x86? ( ${MY_P}.i386.bundle )
-	amd64? ( ${MY_P}.x86_64.bundle )
-	"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc +vmware-tools"
-RESTRICT="binchecks fetch strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-cpp/libsexymm
-	dev-cpp/pangomm:1.4
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	net-misc/curl
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libsexy
-	x11-libs/libSM
-	>=x11-libs/libview-0.6.6
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/startup-notification
-	!app-emulation/vmware-server
-	!app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-264.0
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-pkg_nofetch() {
-	local bundle
-
-	if use x86; then
-		bundle="${MY_P}.i386.bundle"
-	elif use amd64; then
-		bundle="${MY_P}.x86_64.bundle"
-	fi
-
-	einfo "Please download ${bundle}"
-	einfo "from ${HOMEPAGE}"
-	einfo "and place it in ${DISTDIR}"
-}
-
-src_unpack() {
-	local component ; for component in \
-			vmware-player-app \
-			vmware-vmx \
-			vmware-usbarbitrator \
-			vmware-network-editor
-			#vmware-player-setup
-			#vmware-ovftool
-	do
-		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" "${component}" "${S}"
-	done
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-}
-
-src_install() {
-	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-	local build=$(get_version_component_range 4 "${PV}")
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/* || die "failed to install bin"
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/* || die "failed to install lib"
-
-	# commented out until Portage gets OpenSSL 0.9.8 with AES-NI support
-	# see http://forums.gentoo.org/viewtopic-t-835867.html
-	## these two libraries do not like to load from /usr/lib*
-	#local each ; for each in libcrypto.so.0.9.8 libssl.so.0.9.8 ; do
-	#	if [[ ! -f "${VM_INSTALL_DIR}/lib/vmware/lib/${each}" ]] ; then
-	#		dosym "/usr/$(get_libdir)/${each}" \
-	#			"${VM_INSTALL_DIR}/lib/vmware/lib/${each}/${each}"
-	#	fi
-	#done
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share || die "failed to install share"
-
-	# install documentation
-	if use doc; then
-		dodoc doc/* || die "failed to install docs"
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in vmplayer{,-daemon} \
-			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" || die
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer || die
-
-	# fix up permissions
-	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh}
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}" || die
-
-	# create the configuration
-	dodir /etc/vmware || die
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${major_minor_revision}"
-		product.buildNumber = "${build}"
-	EOF
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
-	newinitd "${initscript}" vmware || die
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-i "${D}/usr/share/applications/${PN}.desktop" || die
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# remove superfluous libraries
-	ebegin 'Removing superfluous libraries'
-	cd "${VM_INSTALL_DIR}"/lib/vmware/lib || die
-	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
-	# see http://forums.gentoo.org/viewtopic-t-835867.html
-	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
-	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
-		ln -sfn "${libpath}" "${libname}/${libname}" 2> /dev/null
-	done
-	eend
-
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware-player, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-- 
cgit v1.2.3-18-g5258