cleanup; 7.1.4 moved to portage

svn path=/trunk/; revision=472

4 files changed, 16 insertions, 322 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 21a7b9c..caae4b1 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Apr 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+  -vmware-workstation-7.1.3.324285.ebuild,
+  vmware-workstation-7.1.4.385536.ebuild:
+  7.1.4 from the portage; cleanup7.1.4 from the portage; cleanup7.1.4 from the
+  portage; cleanup7.1.4 from the portage; cleanup7.1.4 from the portage;
+  cleanup7.1.4 from the portage; cleanup7.1.4 from the portage; cleanup
+
   30 Mar 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
   +vmware-workstation-7.1.4.385536.ebuild:
   bumped to 7.1.4.385536
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 8fb01c3..154f9a3 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -2,11 +2,8 @@ AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA
 AUX list-bundle-components.xsl 470 RMD160 c45fe9d1690eac831c79bc63ef68de45d1265891 SHA1 d35982cfe4f3052fff013059d1df495c672ddd0e SHA256 4fe6b25ecbb99b3a4f15cbb8de41be466ff545f8e9fa1110d62ca0cf24e72395
 AUX list-component-files.xsl 545 RMD160 46747c300daf5c6b2c143f02840a94a409f381c4 SHA1 40b6e4cd0bb189ec9997e8b6009c9508082ed51a SHA256 6682c07630ef4586016776e065018f8695a790c5297408597b1ae24692fab629
 AUX vmware-7.0.rc 778 RMD160 ed0dd6d11680d7ced8724970ee1be77efd48e970 SHA1 84d9aae6bbc8a33806842fd00699a2b81a7bb18c SHA256 50aab1855926e6ae808ed85ddc8b7d83d7441f7d7c4b3726cc1e8bebd4da8e63
-DIST VMware-Workstation-7.1.3-324285.i386.bundle 130627639 RMD160 97e00fe4e0a83bc6f7481291254f25b6e892eac0 SHA1 c588f48b4e57e2268a0f9e587edb7bc978a11427 SHA256 a9a2f9c6d030767a1a168ddb8c2b0aafdf9f52bbaa51f229cb8453278bb28b11
-DIST VMware-Workstation-7.1.3-324285.x86_64.bundle 137498515 RMD160 89f117beb98c5e813ce871e10f64438c1cd0615e SHA1 dd1712f9551fee14efa5b60bf079f70010cc11c7 SHA256 0a865d8724bae23605b2e8b93b0b0b3e256a58c16f43ac1fbae21cc8f37ac0ab
 DIST VMware-Workstation-7.1.4-385536.i386.bundle 131082749 RMD160 84852552195777ce636a6128cf8ff8c539e045dd SHA1 955b3a08375bb1fa39cb9c1c4142f13de604acf6 SHA256 abf63c5b922660307b62e47138d612e3c3ba2d7520b344d6a2d1e2f69a88ddff
 DIST VMware-Workstation-7.1.4-385536.x86_64.bundle 137897638 RMD160 c71a351e5d59f28f468907074170d3c0ca03c98c SHA1 58973839c0ff6f56a9d2371a1ca1b5189b3f7bc5 SHA256 75bcbae6cfdaa6ae920a4172171eaa8c49b36464f485df3ccd29e5d59b9ead73
-EBUILD vmware-workstation-7.1.3.324285.ebuild 8125 RMD160 add8bc42e33fd6aba9d5ddcb512781481b4e3a47 SHA1 9f513bf2e9a6b1bb0e8ae84a122d5d300b3085c8 SHA256 706e7e549cdda4dd4e6ac55529a6224c8b1b41a3690ccb55e204f53ce77d8560
-EBUILD vmware-workstation-7.1.4.385536.ebuild 8125 RMD160 148afb0aa9cd707bde4f4fec9d8afbd772bb3c72 SHA1 e441ae9692fadc763c58afbf4644d36bc8c61c52 SHA256 2a4be770735bd45c918f9a1612c09b0dca41d8d388c869999a8d453b22d30900
-MISC ChangeLog 5802 RMD160 3773aba8c3f48e97a6436c63524ea27d74cec302 SHA1 8852703682085f15529b1b74eb65667944737e58 SHA256 b2f86a6f975cde83d91fe4002d39e021d9057b156a132bbccd75b058d7c3c88b
+EBUILD vmware-workstation-7.1.4.385536.ebuild 8272 RMD160 b4a32250cad2ee8bba13e395fb752556d10ef6b7 SHA1 6e3448febb1d6489fca95f680f2e8d683b3065eb SHA256 aab253aefda1f86062287529bda3b7841d2e4608173cba6eb9abdac6806abce8
+MISC ChangeLog 6163 RMD160 30eaea5284ba20ca6ad8a69446f8e91b8499a76d SHA1 a046b6d9af9ce1311ed7efff9ed8295e4b18a045 SHA256 de59fb1bcae0b8e9505617a2986dd87ff56805cd0048504cec69af48848c97f9
 MISC metadata.xml 699 RMD160 13003f11d344342b6adffbe4f6be7cd72e64f9a3 SHA1 b85c9bb8a2312f7feab5200a9e3a2d6a45d3533f SHA256 0afdf7eebf72c9c781523ff4e2fff3b7f41b8948065c583ae4aa86e71ce067af
diff --git a/app-emulation/vmware-workstation/vmware-workstation-7.1.3.324285.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.1.3.324285.ebuild
deleted file mode 100644
index 869fb24..0000000
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.3.324285.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils versionator fdo-mime gnome2-utils vmware-bundle
-
-MY_PN="VMware-Workstation"
-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/workstation/"
-SRC_URI="
-	x86? ( ${MY_P}.i386.bundle )
-	amd64? ( ${MY_P}.x86_64.bundle )
-	"
-
-LICENSE="vmware"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc vix +vmware-tools"
-RESTRICT="binchecks fetch mirror 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
-	dev-cpp/gtkmm
-	dev-cpp/libgnomecanvasmm
-	dev-cpp/libsexymm
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib
-	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
-	gnome-base/librsvg
-	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+
-	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-player"
-PDEPEND="~app-emulation/vmware-modules-238.3
-	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() {
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-app
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-player-setup
-	vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-workstation
-	if use vix; then
-		vmware-bundle_extract-bundle-component "${DISTDIR}/${A}" vmware-vix
-	fi
-}
-
-src_prepare() {
-	rm -rf "${S}"/vmware-player-app/bin/vmware-modconfig
-	rm -rf "${S}"/vmware-player-app/lib/modules/binary
-
-	# remove superfluous libraries
-	ebegin 'Removing superfluous libraries'
-	cd vmware-player-app/lib/lib || die
-	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
-	# see http://forums.gentoo.org/viewtopic-t-835867.html
-	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8' | xargs -d'\n' -r rm -rf
-	cd ../../../vmware-workstation/lib/lib || die
-	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8' | xargs -d'\n' -r rm -rf
-	eend
-}
-
-src_install() {
-	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 "${VM_INSTALL_DIR}"
-	dobin bin/*
-	dosbin sbin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r 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
-
-	# install documentation
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	# install vmware-config
-	cd "${S}"/vmware-player-setup
-	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doins vmware-config
-
-	# install vmware-workstation
-	cd "${S}"/vmware-workstation
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	# install documentation
-	doman man/man1/vmware.1.gz
-
-	if use doc; then
-		dodoc -r doc/*
-	fi
-
-	# install vmware-vix
-	if use vix; then
-		cd "${S}"/vmware-vix
-
-		# install the binary
-		into "${VM_INSTALL_DIR}"
-		dobin bin/*
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-		doins -r lib/*
-
-		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-		# install headers
-		insinto /usr/include/vmware-vix
-		doins include/*
-
-		if use doc; then
-			dohtml -r doc/*
-		fi
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in vmware vmplayer{,-daemon} \
-			vmware-{acetool,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
-
-	# fix up permissions
-	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware/{bin/*,lib/wrapper-gtk24.sh,setup/*}
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/sbin/vmware-authd
-	chmod 04711 "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx*
-	if use vix; then
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-vix/setup/*
-	fi
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}"
-
-	# create the configuration
-	dodir /etc/vmware
-
-	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}"
-		product.name = "VMware Workstation"
-		workstation.product.version = "${major_minor_revision}"
-	EOF
-
-	if use vix; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-			vix.config.version = "1"
-		EOF
-	fi
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-7.0.rc" > ${initscript}
-	newinitd "${initscript}" vmware
-
-	# 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}}
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-		-i "${D}/usr/share/applications/${PN}.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-i "${D}/usr/share/applications/vmware-player.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
-}
-
-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-workstation/vmware-workstation-7.1.4.385536.ebuild b/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild
index a988323..5c24d53 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-7.1.4.385536.ebuild,v 1.1 2011/04/15 12:34:21 vadimk Exp $
 
 EAPI="2"
 
@@ -26,21 +26,21 @@ RESTRICT="binchecks fetch mirror 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
-	dev-cpp/gtkmm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
 	dev-cpp/libgnomecanvasmm
 	dev-cpp/libsexymm
 	dev-cpp/pangomm
 	dev-libs/atk
-	dev-libs/glib
+	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
-	gnome-base/librsvg
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
 	gnome-base/orbit
 	media-libs/fontconfig
 	media-libs/freetype
@@ -52,7 +52,7 @@ RDEPEND="dev-cpp/cairomm
 	sys-libs/glibc
 	sys-libs/zlib
 	x11-libs/cairo
-	x11-libs/gtk+
+	x11-libs/gtk+:2
 	x11-libs/libgksu
 	x11-libs/libICE
 	x11-libs/libsexy