cleanup; 3.1.4 moved to portage

svn path=/trunk/; revision=473

4 files changed, 15 insertions, 247 deletions

diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 41fc2e8..bdd8b88 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Apr 2011; Vadim Kuznetsov <vadimk@gentoo.org>
+  -vmware-player-3.1.3.324285.ebuild, vmware-player-3.1.4.385536.ebuild:
+  cleanup; 3.1.4 moved to portage
+
   30 Mar 2011; Matt Whitlock (whitslack) <matt@whitlock.name>
   +vmware-player-3.1.4.385536.ebuild:
   bumped to 3.1.4.385536
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 50ca18e..e963df5 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -2,11 +2,8 @@ AUX config-3.0 308 RMD160 4773cf7aba9b54c37f24dddeaef24a3899d2efed SHA1 574e77f2
 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-3.0.rc 779 RMD160 ec0d76cac81573feb43d09d8450fcf6d5d93f580 SHA1 b8503204c5aa9a85ca253edd92b5d4191aca5ef9 SHA256 84620cd3bbe159d163eef37d8cd1bcffa21c8f2b56cd70d35bcd7c1a4a539760
-DIST VMware-Player-3.1.3-324285.i386.bundle 107374882 RMD160 814b7cd883457cf6bbbd3a17b2f71aaa22b0e71e SHA1 4abb87d37706c47a86337ada1d23d390455e4931 SHA256 333697a2812aec9cfbd95a8201f29a7e4b975281e163c43ce3e266240c4daa42
-DIST VMware-Player-3.1.3-324285.x86_64.bundle 103173173 RMD160 a56247dbfe97f139bcd6fb40dbadf68b8c42ace7 SHA1 6608bce64811be4480e667726aefefdc2b71e4e3 SHA256 79122e30e1df20ab7d684cd3427bc0d69d00ed1bc3b37c3d9cd805804b1d6d7d
 DIST VMware-Player-3.1.4-385536.i386.bundle 107830710 RMD160 af440db7c96856528acfe6db9f3c278dbac85525 SHA1 7350051c0fc781604d1d46bc24003434cbcd3b26 SHA256 3ebc950185bd101c34e1728ded4671b1cbc670e835e3ee634b4153663ce7b11e
 DIST VMware-Player-3.1.4-385536.x86_64.bundle 103561067 RMD160 78917bc4fcdf55f781e124ea27c8c5c97129dab3 SHA1 90031375a9c10d9a0a5e32be154c856693ad7526 SHA256 cae705500469587388612ad72ee2cdc6fc0d49fc60a747738c87c6b5e5bee931
-EBUILD vmware-player-3.1.3.324285.ebuild 6189 RMD160 d8ab4a5795986a83a5ed542db337e96336b51853 SHA1 3d721cbe397d2594323e02a94539225b7a4c3d4e SHA256 f89bbf76429dbca9e9bfbb260b415b98e96c496a0abcdd40d1ad71a9b05dfc3f
-EBUILD vmware-player-3.1.4.385536.ebuild 6189 RMD160 ffe43a6ec3ecddf5d6c99c20844afe946f8f171a SHA1 f52a7d4a4678177c4800446de86570f2597d39f1 SHA256 6815aa70b88f95674ecc84f4d70182905c5d89586e3bb05e75e3d48943dd1e59
-MISC ChangeLog 5239 RMD160 b03222f9ed59919bd32956738a04262e4d2459c0 SHA1 cf58655afacf1fe63d4116525f1f6599ce7ddd4d SHA256 4c808199e8d79d8ed9177c97d1b7606dd40fb3640a511b0e13d19e32e22e7dc8
+EBUILD vmware-player-3.1.4.385536.ebuild 6334 RMD160 3583e3f09e73e9520fa518a6eebcb2cbe9b92ff5 SHA1 61af3afb8ab8e5b25c9b1b3cd418abee6aa2ab01 SHA256 145e55cea8823e379251f6267c86a7f742a2e79502623363eb59e7e1654bc3d2
+MISC ChangeLog 5398 RMD160 7472bc1d0f57f03c09ab63e24a27999c6f0a0edb SHA1 86abc2fa42b073f082502ffca1b03d0720205787 SHA256 b0f92f4456769b4a1c0364a3720d91f5e7f5cd51a214526e60eacffbcaed81a2
 MISC metadata.xml 238 RMD160 beef158e0603e5808d104743feba4be3e7a7e8c4 SHA1 276217c6f03ae24c0196519197240031a6961254 SHA256 8374f3a2a8f05bf0690ab35f79a20980026aefa9fabae93fe81442f54291018b
diff --git a/app-emulation/vmware-player/vmware-player-3.1.3.324285.ebuild b/app-emulation/vmware-player/vmware-player-3.1.3.324285.ebuild
deleted file mode 100644
index 4689733..0000000
--- a/app-emulation/vmware-player/vmware-player-3.1.3.324285.ebuild
+++ /dev/null
@@ -1,233 +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-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
-	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-workstation"
-PDEPEND="~app-emulation/vmware-modules-238.3
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}/vmware-player-app
-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
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-
-	# remove superfluous libraries
-	ebegin 'Removing superfluous libraries'
-	cd 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
-	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"
-	dosbin sbin/* || die "failed to install sbin"
-
-	# 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}"/sbin/vmware-authd
-	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-3.1.4.385536.ebuild b/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild
index e6207c2..a7662d0 100644
--- a/app-emulation/vmware-player/vmware-player-3.1.4.385536.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.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-player/vmware-player-3.1.4.385536.ebuild,v 1.1 2011/04/15 12:33:18 vadimk Exp $
 
 EAPI="2"
 
@@ -26,21 +26,21 @@ 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
-	dev-cpp/gtkmm
-	dev-cpp/libgnomecanvasmm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-cpp/libsexymm
-	dev-cpp/pangomm
+	dev-cpp/pangomm:1.4
 	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