commit:     a5b6a684848ac6a47cac4838f08c1c021382c8d0
Author:     Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Wed Aug 12 05:51:35 2015 +0000
Commit:     Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Wed Aug 12 05:51:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/vmware.git/commit/?id=a5b6a684

some fixes/cleanups for vmware player

Package-Manager: portage-2.2.20

 .../vmware-player-7.1.0.2496824.ebuild             | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild 
b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild
index 7d271f1..d72a167 100644
--- a/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild
+++ b/app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
+inherit eutils versionator fdo-mime gnome2-utils pax-utils systemd 
vmware-bundle
 
 MY_PN="VMware-Player"
 MY_PV=$(get_version_component_range 1-3)
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="cups doc +vmware-tools"
+IUSE="cups doc ovftool +vmware-tools"
 RESTRICT="strip"
 
 # vmware-workstation should not use virtual/libc as this is a
@@ -93,10 +93,12 @@ src_unpack() {
                        vmware-usbarbitrator \
                        vmware-network-editor \
                        vmware-player-setup
-                       #vmware-ovftool
        do
                vmware-bundle_extract-bundle-component "${bundle}" 
"${component}" "${S}"
        done
+
+       use ovftool && \
+               vmware-bundle_extract-bundle-component "${bundle}" 
vmware-ovftool
 }
 
 src_prepare() {
@@ -135,7 +137,7 @@ src_install() {
                
"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
 
        # https://github.com/gentoo/vmware/issues/7
-       dosym "${VM_INSTALL_DIR}"lib/vmware/ /usr/$(get_libdir)/vmware
+       dosym "${VM_INSTALL_DIR}"/lib/vmware/ /usr/$(get_libdir)/vmware
 
        # install the ancillaries
        insinto /usr
@@ -157,6 +159,17 @@ src_install() {
        exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
        doexe vmware-config
 
+       # install ovftool
+       if use ovftool; then
+               cd "${S}"
+
+               insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+               doins -r vmware-ovftool/*
+
+               chmod 0755 
"${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+               dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool 
"${VM_INSTALL_DIR}"/bin/ovftool
+       fi
+
        # create symlinks for the various tools
        local tool ; for tool in thnuclnt vmplayer{,-daemon} \
                        
vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
@@ -209,6 +222,9 @@ src_install() {
                "${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die
        newinitd "${initscript}" vmware || die
 
+       systemd_dounit "${FILESDIR}/vmware-usbarbitrator.service"
+       systemd_dounit "${FILESDIR}/vmware-network.service"
+
        # 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

Reply via email to