experimental: deleted libs, that available in the system

svn path=/trunk/; revision=397

4 files changed, 76 insertions, 190 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index b832b48..6efc798 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vmware-player-3.0.1.227600-r4 (09 Apr 2010)
+
+  09 Apr 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  -vmware-player-3.0.1.227600-r1.ebuild,
+  -vmware-player-3.0.1.227600-r3.ebuild,
+  +vmware-player-3.0.1.227600-r4.ebuild:
+  experimental: deleted libs, that available in the system
+
   24 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
   vmware-player-3.0.1.227600-r3.ebuild:
   added use flag doc, fixed dependencies, added bunch of "or die"
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 86f320e..3f6a3c6 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -4,8 +4,7 @@ AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4
 AUX vmware-3.0.rc 776 RMD160 21380174fda9e6bdc2a720ecd4c1742bf76b9439 SHA1 c6ec74a605b31cbb4f1f73a0639b8068545e8f33 SHA256 9a99d7c5a860893061f36ad2655f89340761cfbc3f58d7d633b3726b0cb5a7d0
 DIST VMware-Player-3.0.1-227600.i386.bundle 84974107 RMD160 4337339976d25d8dbd1f4904ba2ed2b53d1e9c49 SHA1 cff76010f0429576288ea1e5a594cd47a2c64f4a SHA256 9314e49ebb252fd937032481b13d0bea4a3af6409485e79576f797834b978285
 DIST VMware-Player-3.0.1-227600.x86_64.bundle 79959324 RMD160 c6652acadc760bab8ecfed2682706e31f51423ef SHA1 84f25370d24c03a18968a4f4c8e06cef3d21c2df SHA256 8347b3fa0c1cd1c88c3c8049462f3d0d752d6f7daa747a7d2a67667a3f55f190
-EBUILD vmware-player-3.0.1.227600-r1.ebuild 5798 RMD160 bfce84bbc42bbba9b701ece7e34eff34d073bbc5 SHA1 85e9235bfba89d9365cb81f9e1ee429cb9e46c41 SHA256 3e7084d363f1d76ee987db9d0bfc4dd11afec6410db3b8ba9f5d5e8bad93f65e
-EBUILD vmware-player-3.0.1.227600-r3.ebuild 6714 RMD160 00f429adeb8cfe613094a03bdad2f2e3776724e7 SHA1 5baebb1a8e187bb57727b688cbd3c4486531bd83 SHA256 d952cafac7ccd592eda49ad3549da7e1545c730eaf6b67be859eb06656fd38d1
+EBUILD vmware-player-3.0.1.227600-r4.ebuild 10549 RMD160 a83da758c0edf8bf952ad5319a71b323f1a9e9fd SHA1 4844c90c585589b36a1786b7e917a3233e5a30a2 SHA256 1a5bd9f8d95cb40f803732edfa63086326938998a82cf3ca7f1ed019e3cee0dd
 EBUILD vmware-player-3.0.1.227600.ebuild 5852 RMD160 b6a1ba2e67a5ed38c3be96c7e31db9dfaf54d3ad SHA1 d910759939a4a977db9411470e32b78b6342ca03 SHA256 cf1722ec1f3be23f3a43f7360bf8f200f28ba24d856faadf32a7c0ef8f80b78a
-MISC ChangeLog 1955 RMD160 93f3c89a11b913e226e8a997d770344f5c581d38 SHA1 aaf923aefe32ffb963115551a855ece78a9df1f5 SHA256 991233151d1d0f992ea08bf3e71ea51b887c99258035c9c4bda8bf0c34ec85f8
+MISC ChangeLog 2235 RMD160 a2ba839e8f90dd9017525848234b03bb64a0551e SHA1 3d47e32aa08303a19cb8e3516fb1ca58ce7f10dc SHA256 126b8b1e7e53e535a1c7eec6b971290ff303d4bfa420d5626b3246f65d284f11
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r1.ebuild b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r1.ebuild
deleted file mode 100644
index 085756e..0000000
--- a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild,v 1.4 2009/09/25 10:37:05 maekke Exp $
-
-EAPI="2"
-
-inherit eutils versionator fdo-mime gnome2-utils
-
-MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)"
-
-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"
-SRC_URI="
-	x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle )
-	amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
-	"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="binchecks fetch strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-DEPEND="dev-libs/libxslt"
-RDEPEND="
-	~app-emulation/vmware-modules-1.0.0.26
-	dev-cpp/cairomm
-	dev-cpp/libgnomecanvasmm
-	dev-cpp/libsexymm
-	sys-libs/glibc
-	sys-apps/pciutils
-	>=x11-libs/libview-0.6.2
-	x11-libs/libXcursor
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	!app-emulation/vmware-server
-	!app-emulation/vmware-workstation
-	"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-pkg_nofetch() {
-	if use x86; then
-		MY_P="${MY_PN}.i386"
-	elif use amd64; then
-		MY_P="${MY_PN}.x86_64"
-	fi
-
-	einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
-}
-
-src_unpack() {
-	bundle_extract_component "${DISTDIR}/${A}" vmware-player-app
-}
-
-src_prepare() {
-	rm -rf "${S}"/vmware-player-app/lib/modules/binary
-}
-
-src_install() {
-	local major_minor=$(get_version_component_range 1-2 "${PV}")
-	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-	local build=$(get_version_component_range 4 "${PV}")
-
-	cd "${S}"/vmware-player-app
-
-	# install the binaries
-	into /usr
-	dobin bin/*
-	dosbin sbin/*
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"
-	doins -r lib/*
-
-	# 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}"/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/bin/vmplayer /usr/bin/vmplayer
-
-	# fix up permissions
-	chmod 0755 "${D}${VM_INSTALL_DIR}"/{bin/*,lib/{libgksu2.so.0/gksu-run-helper,wrapper-gtk24.sh}}
-	chmod 04711 "${D}"/usr/sbin/vmware-authd
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/bin/vmware-vmx*
-
-	# create the configuration
-	dodir /etc/vmware
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='/usr/bin'
-		LIBDIR='/opt'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "/usr/bin"
-		libdir = "${VM_INSTALL_DIR}"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "/usr/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
-	newinitd "${FILESDIR}/vmware-${major_minor}.rc" vmware
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/libconf:g" \
-			-i "${D}${VM_INSTALL_DIR}"/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
-	sed -e "s:@@BINARY@@:/usr/bin/vmplayer:g" \
-			-i "${D}/usr/share/applications/${PN}.desktop"
-
-	# install documentation
-	dodoc doc/*
-}
-
-pkg_config() {
-	/usr/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	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
-}
-
-bundle_extract_component() {
-	local -i bundle_size=$(stat -L -c'%s' "${1}")
-	local -i bundle_manifestOffset=$(od -An -j$((bundle_size-36)) -N4 -tu4 "${1}")
-	local -i bundle_manifestSize=$(od -An -j$((bundle_size-40)) -N4 -tu4 "${1}")
-	local -i bundle_dataOffset=$(od -An -j$((bundle_size-44)) -N4 -tu4 "${1}")
-	local -i bundle_dataSize=$(od -An -j$((bundle_size-52)) -N8 -tu8 "${1}")
-	tail -c+$((bundle_manifestOffset+1)) "${1}" 2> /dev/null | head -c$((bundle_manifestSize)) |
-		xsltproc "${FILESDIR}"/list-bundle-components.xsl - |
-		while read -r component_offset component_size component_name ; do
-			if [[ ${component_name} == ${2} ]] ; then
-				ebegin "Extracting '${component_name}' component from '$(basename "${1}")'"
-				declare -i component_manifestOffset=$(od -An -j$((bundle_dataOffset+component_offset+9)) -N4 -tu4 "${1}")
-				declare -i component_manifestSize=$(od -An -j$((bundle_dataOffset+component_offset+13)) -N4 -tu4 "${1}")
-				declare -i component_dataOffset=$(od -An -j$((bundle_dataOffset+component_offset+17)) -N4 -tu4 "${1}")
-				declare -i component_dataSize=$(od -An -j$((bundle_dataOffset+component_offset+21)) -N8 -tu8 "${1}")
-				tail -c+$((bundle_dataOffset+component_offset+component_manifestOffset+1)) "${1}" 2> /dev/null |
-					head -c$((component_manifestSize)) | xsltproc "${FILESDIR}"/list-component-files.xsl - |
-					while read -r file_offset file_compressedSize file_uncompressedSize file_path ; do
-						if [[ ${file_path} ]] ; then
-							echo -n '.'
-							file_path="${component_name}/${file_path}"
-							mkdir -p "$(dirname "${file_path}")"
-							tail -c+$((bundle_dataOffset+component_offset+component_dataOffset+file_offset+1)) "${1}" 2> /dev/null |
-								head -c$((file_compressedSize)) | gzip -cd > "${file_path}"
-						fi
-					done
-				echo ; eend
-			fi
-		done
-}
diff --git a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r4.ebuild
index eb34f33..90f0e60 100644
--- a/app-emulation/vmware-player/vmware-player-3.0.1.227600-r3.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.0.1.227600-r4.ebuild
@@ -150,6 +150,72 @@ src_install() {
 		-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
+
+	# delete erroneous stuff
+	rm -rf "${D}${VM_INSTALL_DIR}"/bin/vmware-modconfig \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libaio.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libarchive.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libart_lgpl_2.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libatk-1.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libatkmm-1.6.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libcairomm-1.0.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libcairo.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libcurl.so.4 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libfontconfig.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libfreetype.so.6 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libfuse.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgailutil.so.17 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgcc_s.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgdkmm-2.4.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgdk_pixbuf-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgdk-x11-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgio-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgiomm-2.4.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libglade-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libglibmm-2.4.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libglibmm_generate_extra_defs-2.4.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgmodule-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgnomecanvas-2.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgnomecanvasmm-2.6.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgobject-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgthread-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgtkmm-2.4.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgtk-x11-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libgtop-2.0.so.7 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libpango-1.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libpangocairo-1.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libpangoft2-1.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libpangomm-1.4.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libpangox-1.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libpangoxft-1.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libpng12.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/librsvg-2.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libsexymm.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libsexy.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libsigc-2.0.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libspi.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libstartup-notification-1.so.0 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libstdc++.so.6 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXau.so.6 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXcomposite.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXcursor.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXdamage.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXdmcp.so.6 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXfixes.so.3 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXft.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXinerama.so.1 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxml2.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxmlrpc_client.so.3 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxmlrpc.so.3 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libxmlrpc_util.so.3 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXrandr.so.2 \
+		"${D}${VM_INSTALL_DIR}"/lib/vmware/lib/libXrender.so.1 \
+		|| die "failed to remove erroneous stuff"
+
 }
 
 pkg_config() {