[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-player/

["Evan Teran" <evan.teran@gmail.com>]

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

fixing issue from: https://github.com/gentoo/vmware/issues/7

Despite /etc/vmware/config telling it to look for the libs in /opt/vmware/lib, it still insisted in looking in
/usr/lib/vmware. So a symlink solves the issue fairly cleanly.

Also added a minor improvement to the build

Package-Manager: portage-2.2.20

 app-emulation/vmware-player/vmware-player-7.1.0.2496824.ebuild | 5 ++++-
 app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 2 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 0a7ea6a..7d271f1 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
@@ -134,6 +134,9 @@ src_install() {
 	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
 
+	# https://github.com/gentoo/vmware/issues/7
+	dosym "${VM_INSTALL_DIR}"lib/vmware/ /usr/$(get_libdir)/vmware
+
 	# install the ancillaries
 	insinto /usr
 	doins -r share
@@ -203,7 +206,7 @@ src_install() {
 	local initscript="${T}/vmware.rc"
 
 	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-11.0.rc" > "${initscript}" || die
+		"${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die
 	newinitd "${initscript}" vmware || die
 
 	# fill in variable placeholders

diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild
index 3c04f5e..d72a167 100644
--- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild
+++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild
@@ -136,6 +136,9 @@ src_install() {
 	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
 
+	# https://github.com/gentoo/vmware/issues/7
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/ /usr/$(get_libdir)/vmware
+
 	# install the ancillaries
 	insinto /usr
 	doins -r share
@@ -216,7 +219,7 @@ src_install() {
 	local initscript="${T}/vmware.rc"
 
 	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-11.0.rc" > "${initscript}" || die
+		"${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die
 	newinitd "${initscript}" vmware || die
 
 	systemd_dounit "${FILESDIR}/vmware-usbarbitrator.service"