From 93fed3f8c723a8d1f20f8face5028c3fc109edee Mon Sep 17 00:00:00 2001 From: Evan Teran Date: Sat, 11 Oct 2014 12:02:17 -0400 Subject: synching with mainline --- app-emulation/vmware-player/files/config-3.0 | 10 - .../vmware-player/files/list-bundle-components.xsl | 17 -- .../vmware-player/files/list-component-files.xsl | 19 -- app-emulation/vmware-player/files/vmware-3.0.rc | 33 --- .../vmware-player-5.0.2.1031769.ebuild | 245 --------------------- .../vmware-player-6.0.2.1744117.ebuild | 245 +++++++++++++++++++++ 6 files changed, 245 insertions(+), 324 deletions(-) delete mode 100644 app-emulation/vmware-player/files/config-3.0 delete mode 100644 app-emulation/vmware-player/files/list-bundle-components.xsl delete mode 100644 app-emulation/vmware-player/files/list-component-files.xsl delete mode 100644 app-emulation/vmware-player/files/vmware-3.0.rc delete mode 100644 app-emulation/vmware-player/vmware-player-5.0.2.1031769.ebuild create mode 100644 app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild (limited to 'app-emulation') diff --git a/app-emulation/vmware-player/files/config-3.0 b/app-emulation/vmware-player/files/config-3.0 deleted file mode 100644 index cc83931..0000000 --- a/app-emulation/vmware-player/files/config-3.0 +++ /dev/null @@ -1,10 +0,0 @@ -VMCI_CONFED = "yes" -NETWORKING = "yes" -initscriptdir = "/etc/init.d" -VMBLOCK_CONFED = "yes" -authd.fullpath = "@@VM_INSTALL_DIR@@/sbin/vmware-authd" -gksu.rootMethod = "su" -VSOCK_CONFED = "yes" -libdir = "@@VM_INSTALL_DIR@@/lib/vmware" -bindir = "@@VM_INSTALL_DIR@@/bin" -product.buildNumber = "@@BUILD_NUMBER@@" diff --git a/app-emulation/vmware-player/files/list-bundle-components.xsl b/app-emulation/vmware-player/files/list-bundle-components.xsl deleted file mode 100644 index db1a4e4..0000000 --- a/app-emulation/vmware-player/files/list-bundle-components.xsl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app-emulation/vmware-player/files/list-component-files.xsl b/app-emulation/vmware-player/files/list-component-files.xsl deleted file mode 100644 index 91c6152..0000000 --- a/app-emulation/vmware-player/files/list-component-files.xsl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app-emulation/vmware-player/files/vmware-3.0.rc b/app-emulation/vmware-player/files/vmware-3.0.rc deleted file mode 100644 index 573799a..0000000 --- a/app-emulation/vmware-player/files/vmware-3.0.rc +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - modprobe -a vmmon vmci vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -r vsock vmci vmmon vmblock vmnet - eend $? -} diff --git a/app-emulation/vmware-player/vmware-player-5.0.2.1031769.ebuild b/app-emulation/vmware-player/vmware-player-5.0.2.1031769.ebuild deleted file mode 100644 index 8776e08..0000000 --- a/app-emulation/vmware-player/vmware-player-5.0.2.1031769.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-5.0.2.1031769.ebuild,v 1.2 2013/06/22 22:37:55 dilfridge Exp $ - -EAPI="4" - -inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle - -MY_PN="VMware-Player" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/player/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar ) - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - " - -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="cups doc +vmware-tools" -RESTRICT="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/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 - cups? ( net-print/cups ) - 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/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-workstation" -PDEPEND="~app-emulation/vmware-modules-271.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" - -src_unpack() { - default - local bundle=${A%.tar} - - local component ; for component in \ - vmware-player \ - vmware-player-app \ - vmware-vmx \ - vmware-usbarbitrator \ - vmware-network-editor \ - vmware-player-setup - #vmware-ovftool - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ -} - -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() { - # 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/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - # install documentation - if use doc; then - dodoc doc/* - fi - - exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doexe vmware-config - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmplayer{,-daemon} \ - vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; 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/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - - pax-mark -m "${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 = "${MY_PV}" - product.buildNumber = "${PV_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" \ - -e "/^Encoding/d" \ - -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-6.0.2.1744117.ebuild b/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild new file mode 100644 index 0000000..39b2ee2 --- /dev/null +++ b/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild,v 1.1 2014/04/19 15:01:08 dilfridge Exp $ + +EAPI=5 + +inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle + +MY_PN="VMware-Player" +MY_PV=$(get_version_component_range 1-3) +PV_MINOR=$(get_version_component_range 3) +PV_BUILD=$(get_version_component_range 4) +MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" + +DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/player/" +BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" +SRC_URI=" + x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar ) + amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) + " + +LICENSE="vmware GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="cups doc +vmware-tools" +RESTRICT="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/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 + cups? ( net-print/cups ) + 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/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-workstation" +PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR} + vmware-tools? ( app-emulation/vmware-tools )" + +S=${WORKDIR} +VM_INSTALL_DIR="/opt/vmware" + +src_unpack() { + default + local bundle=${A%.tar} + + local component ; for component in \ + vmware-player \ + vmware-player-app \ + vmware-vmx \ + vmware-usbarbitrator \ + vmware-network-editor \ + vmware-player-setup + #vmware-ovftool + do + vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" + done +} + +src_prepare() { + rm -f bin/vmware-modconfig + rm -rf lib/modules/binary + # Bug 459566 + mv lib/libvmware-netcfg.so lib/lib/ +} + +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() { + # 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/* + + # Bug 432918 + dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 + dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 + + # install the ancillaries + insinto /usr + doins -r share + + if use cups; then + exeinto $(cups-config --serverbin)/filter + doexe extras/thnucups + + insinto /etc/cups + doins -r etc/cups/* + fi + + # install documentation + if use doc; then + dodoc doc/* + fi + + exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup + doexe vmware-config + + # create symlinks for the various tools + local tool ; for tool in thnuclnt vmplayer{,-daemon} \ + vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; 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/icu /etc/vmware/icu + + # fix permissions + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} + fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} + + pax-mark -m "${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 = "${MY_PV}" + product.buildNumber = "${PV_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" \ + -e "/^Encoding/d" \ + -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 +} -- cgit v1.2.3-65-gdbad