diff options
-rw-r--r-- | app-emulation/vmware-modules/Manifest | 8 | ||||
-rw-r--r-- | app-emulation/vmware-modules/vmware-modules-15.5.7-r4.ebuild (renamed from app-emulation/vmware-modules/vmware-modules-15.5.7-r1.ebuild) | 9 | ||||
-rw-r--r-- | app-emulation/vmware-modules/vmware-modules-16.1.1.ebuild (renamed from app-emulation/vmware-modules/vmware-modules-16.1.0-r1.ebuild) | 9 | ||||
-rw-r--r-- | app-emulation/vmware-workstation/Manifest | 9 | ||||
-rw-r--r-- | app-emulation/vmware-workstation/files/configure-hostd.sh | 20 | ||||
-rw-r--r-- | app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714-r1.ebuild (renamed from app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714.ebuild) | 27 | ||||
-rw-r--r-- | app-emulation/vmware-workstation/vmware-workstation-16.1.1.17801498-r1.ebuild (renamed from app-emulation/vmware-workstation/vmware-workstation-16.1.0.17198959.ebuild) | 28 |
7 files changed, 54 insertions, 56 deletions
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index 287d514..3e9c210 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -1,5 +1,5 @@ -DIST vmware-modules-15.5.7-5.10.zip 591122 BLAKE2B 584a70cd4620f65e00dec6bc7696e88ec6446e6beeb83cb4ccdd0dc69d8461e335912aa3b6690106a4a9bde2e95d73be5fb0434484f5e29c1991cd2fc82f1b88 SHA512 6c970d17d587f4fa97721cfdf233e6049c885713a1b0fd3e0236ee0a3580bd57bcdc2b8c8f6652514806966fcd62e57df8b8abac7adee5767a212e128251f148 -DIST vmware-modules-16.1.0-5.10.zip 605507 BLAKE2B 7369fe45d81c057f5a47def618f849d33a90586b5b13cf1f3e03d2daed689b4b7954588aaa0a4ce99a8ab7f47383ce1aa299b15753532c4367de89e9b7b943a5 SHA512 2b63ee5de6f8cff6bab8f0929c330e7c4c6ef7884db624b284cae625c8c28bf73fe9eed6f1852b3eab1856d9d71e2bb4b84a5d6ea02120fa301093d868499341 -EBUILD vmware-modules-15.5.7-r1.ebuild 2527 BLAKE2B 5e98d431aa7aea0c2368a8f88890f0ac2ab4b405b893132146de51d216b4e8233d83fc54f8d44fc5dc17ea78d2746595b1b61007af5f081d85867f504560bad1 SHA512 dfab0a0a4dc200c4e9d3115fc490316f98f45118b658cc9d67d9618df1816b0e1fe6be827674747148f6bd0f2065d04c95fbb8f6da0d252b39943a5c8bb4565e -EBUILD vmware-modules-16.1.0-r1.ebuild 2527 BLAKE2B 5e98d431aa7aea0c2368a8f88890f0ac2ab4b405b893132146de51d216b4e8233d83fc54f8d44fc5dc17ea78d2746595b1b61007af5f081d85867f504560bad1 SHA512 dfab0a0a4dc200c4e9d3115fc490316f98f45118b658cc9d67d9618df1816b0e1fe6be827674747148f6bd0f2065d04c95fbb8f6da0d252b39943a5c8bb4565e +DIST vmware-modules-15.5.7-5.11.zip 591122 BLAKE2B 81991704500def9c072970a11a38b538254c5750d9ee5001b507bbf6fd6177d3391a17f57bd655843bbc5c25be92c7f5c43e83dd3df33cccd1537b1d05c48cd1 SHA512 a39767a5685192e69cac8b050c3e7acecfcb9a6b9245e1b6663fdfb4c778818a635eb89e05a9099a200bc1568d3c110cef24ab24f35f5960876ef950dd76ef96 +DIST vmware-modules-16.1.1-5.11.zip 605507 BLAKE2B 4ac0c7792c8c05d26dcc0f7850107b6b6a2d4b3198d601595df8c40801ac5fb007d42def39ec1ffbcd1df090833f4e2c0cd2b90a4e86c0f990acfdad17e2b8f0 SHA512 dd834f6023ca4e07ef93aec6525151c35bf8d33eff16c5b25c4c535dd9145d8e0e411e998722561efc411c3eef7b404a6053f84497bbdc88da10dde123f9d6d7 +EBUILD vmware-modules-15.5.7-r4.ebuild 2627 BLAKE2B ab92a0474f8508d8a7e0b6ba57c3d90c07db5bc8725c3f96e439f6739f949eb7e795e5c5924ebabf11d4d1e81f0d494d4e033fed1e411b384954580bc0967bda SHA512 ab060f47332cd9ee8ce8e6e03052241c84e52174cf85ec7faf0e87e57eb600e87d328a713dbb3ca0c81d167d24e53ff971edd0772a65f0a121c474bb3afb79a5 +EBUILD vmware-modules-16.1.1.ebuild 2627 BLAKE2B ab92a0474f8508d8a7e0b6ba57c3d90c07db5bc8725c3f96e439f6739f949eb7e795e5c5924ebabf11d4d1e81f0d494d4e033fed1e411b384954580bc0967bda SHA512 ab060f47332cd9ee8ce8e6e03052241c84e52174cf85ec7faf0e87e57eb600e87d328a713dbb3ca0c81d167d24e53ff971edd0772a65f0a121c474bb3afb79a5 MISC metadata.xml 322 BLAKE2B 178d5a7e0f6a26281fdeb655994b728e1b2e831a9bd7e07d6ed7c5ad2edb04d30bb8543ee5a1440f06e3a9eb1af20810a3e93800291f5feda877a644aacad14a SHA512 8ed1935f376c38b57fdcd973dab5a8dd714b2fbb74108228f3aab19cec95340c93f6ecff03b10fcafd261896efa711f47ef8c301f35fa0fc4490a4fb45f2fd55 diff --git a/app-emulation/vmware-modules/vmware-modules-15.5.7-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-15.5.7-r4.ebuild index 23914ee..60a0bbd 100644 --- a/app-emulation/vmware-modules/vmware-modules-15.5.7-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-15.5.7-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit eutils flag-o-matic linux-info linux-mod user udev DESCRIPTION="VMware kernel modules" HOMEPAGE="https://github.com/mkubecek/vmware-host-modules" -MY_KERNEL_VERSION="5.10" +MY_KERNEL_VERSION="5.11" SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}-${MY_KERNEL_VERSION}.zip" LICENSE="GPL-2" @@ -19,10 +19,15 @@ IUSE="" RDEPEND="" DEPEND="" +RESTRICT="mirror" + S="${WORKDIR}/vmware-host-modules-w${PV}-k${MY_KERNEL_VERSION}" pkg_setup() { CONFIG_CHECK="~HIGH_RES_TIMERS" + if kernel_is -ge 5 5; then + CONFIG_CHECK="${CONFIG_CHECK} X86_IOPL_IOPERM" + fi if kernel_is -ge 2 6 37 && kernel_is -lt 2 6 39; then CONFIG_CHECK="${CONFIG_CHECK} BKL" fi diff --git a/app-emulation/vmware-modules/vmware-modules-16.1.0-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-16.1.1.ebuild index 23914ee..60a0bbd 100644 --- a/app-emulation/vmware-modules/vmware-modules-16.1.0-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-16.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit eutils flag-o-matic linux-info linux-mod user udev DESCRIPTION="VMware kernel modules" HOMEPAGE="https://github.com/mkubecek/vmware-host-modules" -MY_KERNEL_VERSION="5.10" +MY_KERNEL_VERSION="5.11" SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}-${MY_KERNEL_VERSION}.zip" LICENSE="GPL-2" @@ -19,10 +19,15 @@ IUSE="" RDEPEND="" DEPEND="" +RESTRICT="mirror" + S="${WORKDIR}/vmware-host-modules-w${PV}-k${MY_KERNEL_VERSION}" pkg_setup() { CONFIG_CHECK="~HIGH_RES_TIMERS" + if kernel_is -ge 5 5; then + CONFIG_CHECK="${CONFIG_CHECK} X86_IOPL_IOPERM" + fi if kernel_is -ge 2 6 37 && kernel_is -lt 2 6 39; then CONFIG_CHECK="${CONFIG_CHECK} BKL" fi diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index 50e5814..f2637b2 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -1,13 +1,12 @@ -AUX configure-hostd.sh 372 BLAKE2B 0ed2d479a46d69ff8498bfac180f0440fb57fb173fc1a427115872a40a47559725623399652e9663fa8a4ca0d7e020d5445bafb6c37f45449dea341fc9f6cce6 SHA512 87c84f5e51e8b4585a9a55f13771cd8b84f2e4e0bb33679e3a1b23eb84a5be5d523a57b6c770095c1d21712a98e9317bbd215ab027843b0586b35ecf9fb85b49 AUX vmware-15.5.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f AUX vmware-16.1.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f AUX vmware-server-15.5.rc 1506 BLAKE2B 886ed1de7a99320611a28a43b48cf17715fcab8bf533a73c28a1aa2f8d150ee2b84e1e510e864b18347f3bd7e43faec3cfc90f09d5ac9c0afe821f67654a68c4 SHA512 548ff69f87bee2b6c82bd931d22dd560370c4a00641ae47d05af05bbc72cedc8fd25054abc405a590b72227b10c5997d79f16ded67f3e0cfac142eb248b47d44 DIST VMware-Workstation-Full-15.5.7-17171714.x86_64.bundle 537751757 BLAKE2B 48fedccad49c806bde657c2300b806a0a3c50821290b7bf18c2db459d1019aaad5734bb81dce2c3666a78a72f2f06b22a13b7e666bb79b839c1b959caade127a SHA512 70e11d867df7f9053f5c684035bfcb72c5fa3151b58ac06e4fea11672f4e93b8d12ab7e3fe71435223fd0f8113e88c33d0e3c1490d5a1674fa729180ae5f4f27 -DIST VMware-Workstation-Full-16.1.0-17198959.x86_64.bundle 528130350 BLAKE2B 31dd2830ca8aab0e01a885e8df647a6dd8488969c69c83a585f5ade5e5292ee872e4ef35936743e6f239f838c852825b16c4c6876582d7ee2a3c9ca291200f31 SHA512 045157cd5b67da9a91d9d301c5a1c5a1d0f14657e3f2456a6990f5b0e16b3ecb32ddb9182e720e8e52554b92bf0c388544eb10fe79448a720bcb81ae32443417 +DIST VMware-Workstation-Full-16.1.1-17801498.x86_64.bundle 528128839 BLAKE2B 179a30bf36f326f4a232a7ede99b53fd59405502f758d79737d9af0df4da9990006e3b933f4256aab057fa6784f9561bbb3d876e377cab6f186e7b4a06eaf346 SHA512 a0d1ff994d4489b5393d2b3c250d120bf7f39dac4a8ac40b95141b51933e16a181dee59716114e268d98eae947dc94e5d7c920e275d59de7963577767f4e35b5 DIST com.vmware.fusion-15.5.7.17171714.zip.tar 635852800 BLAKE2B 43c6378a516fa3ead0eed2e015b8ddf05650a00241320a0ca11ef857f32a15f579e2bd98715aef980c75fcbae86314d68ca7205bb59239b34dfc7270ea6bad25 SHA512 0d76837262465139853dbef8c3a8797e53119ed0eb88afa9968e5b8b2fc25226de10113ca734eaae7e76e4cc024a7adee103a21449e66ad27a717bffd9f70707 -DIST com.vmware.fusion-16.1.0.17198959.zip.tar 658288640 BLAKE2B 1a3f35787bf9925ce8ef99f93f21be7f748f7149f2f6f177ecf9c9d42b2ed8551106bd95fbe7970ba7a38db07b1b26f14ec1766ea6a6f52096aadedac0ad9e52 SHA512 b3cc0cd71cd70ab47306c7dcf598f648cfc80a212c602bd39a8cd593ec4754dbfff40432e1c21f376a4e8c21a8d2969b834a70a17b748e1cb07feb016f2cdb4d +DIST com.vmware.fusion-16.1.1.17801498.zip.tar 658288640 BLAKE2B c82c54c04fe28cb3a6a1c2bad8f53164d0616d08512a5fd48817d55515b26baf4968560a1b5aff0d2ec08098c54944d0446d8bd8aa7b1ba0a7cf17f887726471 SHA512 fe67426372e4da04e8b0116e8cfd146bd95f68d9636bb678d42f7ac12f1f59ba25cc5b9bec018ce378d81931d2a4401bf88d61dedf40c96e3aa127ce37af4d38 DIST unlocker-3.0.3.tar.gz 13521100 BLAKE2B 5fd3865d55bdc842b98f921e536f36103a69f635eabb741f17e4d6e3b0bda6c0561c082f5921e12c4ca49b9f10c9c12a9ea3be3c154e97979dbdbc3d4658528c SHA512 d83bd1ca0de2ce56d93479ec14d456cfdb7ebae07df631ec67aa3b97c5090ac0af8d2c02ed4373af06e8e980f84b801b78fb2c486cac62397b23e2af521fa020 DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 -EBUILD vmware-workstation-15.5.7.17171714.ebuild 18665 BLAKE2B 4c7ccc8eef4cc815d730f859ab883602d76f77569bf157c78b057c2443bbac739b389b291f14b0b60fcd4ea0c58a11255e2e532068625cfdc0bf5dc8da546a80 SHA512 71913f5c2cce8307d2249d4d17efc962f5b9fff15c009e80b6811fb3575721cf9fd8238f753d2114a6260922f33730ae367413afe9f66cf1830874e9c0e749c4 -EBUILD vmware-workstation-16.1.0.17198959.ebuild 14061 BLAKE2B afd150a2fccd730bb842f5167245f5ff017111bee2c0939a94b0b6b5e7da12c34a9c157816cfb6f9ad4a8ab3e3e48972bc8ff00692faab61b6d8dcf8e4c6f555 SHA512 572e039efac81f421be5d8b30d7f6d35deaad4104dcfadce5ccfb908146c2e199f5153870ed9ec057fa670e784eb94b653fa7fe58f82dc4842d52de745da774d +EBUILD vmware-workstation-15.5.7.17171714-r1.ebuild 19085 BLAKE2B 5cc73193868208622d30d28f6ecce1788bfe8720a6acc79045ee44519c768089d1a1bf2ab278e78082fd01c312b61c300483a09b7f04037644cda1033228a428 SHA512 1dc5fa67e305e38455dca7e12a4df8c452d751463fa5976fef30dcea9e7f325fe0e9db108851f564a8bf10e4f7a0f033bc359b8338921f1cf11b1d45c84cd7dc +EBUILD vmware-workstation-16.1.1.17801498-r1.ebuild 14496 BLAKE2B 6ee1e776987f0aa473315609656fcfae81575f36e77dfd860d41dd08564abf30e2655e75d66d54a93b75a29c9043184d7f18129ce67a7229a56b9555141f0914 SHA512 1202135384d0081d71e1110f5f4b09139f6191463621b3e2666a86282412322add61928af5f5c277409e4cc914073a9c316c1bf4d129ec99cf30546e4afec756 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15 diff --git a/app-emulation/vmware-workstation/files/configure-hostd.sh b/app-emulation/vmware-workstation/files/configure-hostd.sh deleted file mode 100644 index 480e903..0000000 --- a/app-emulation/vmware-workstation/files/configure-hostd.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -action="$1" - -case $action in - add) - rc-update -q add vmware-workstation-server default - rc-service vmware-workstation-server start - ;; - remove) - rc-update -q del vmware-workstation-server default - rc-service vmware-workstation-server stop - ;; - status) - rc-service -q vmware-workstation-server status - ;; - *) - exit 1 - ;; -esac diff --git a/app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714.ebuild b/app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714-r1.ebuild index 1792f7f..3e5a2ee 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-15.5.7.17171714-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit eutils readme.gentoo-r1 gnome2-utils pam python-any-r1 systemd xdg-utils MY_PN="VMware-Workstation-Full" @@ -159,8 +159,7 @@ src_prepare() { 'env-update && source /etc/profile'\n Before you can use ${PN}, you must configure a default network setup. You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group.\n -" +To be able to run ${PN} your user must be in the vmware group." } src_install() { @@ -177,6 +176,13 @@ src_install() { dobin */bin/* dosbin */sbin/* rm "${ED}${VM_INSTALL_DIR}"/bin/configure-initscript.sh + mv "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher.bin + cat > "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher <<-EOF + #!/usr/bin/env bash + export LD_LIBRARY_PATH="/opt/vmware/lib/vmware/lib/libssl.so.1.0.2:/opt/vmware/lib/vmware/lib/libcrypto.so.1.0.2" + "${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher.bin "\$@" + EOF + chmod 755 "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher # install the libraries insinto "${VM_INSTALL_DIR}"/lib/vmware @@ -232,10 +238,6 @@ src_install() { # install vmware workstation server cd "${S}"/vmware-workstation-server - # install binaries - into "${VM_INSTALL_DIR}"/lib/vmware - dobin "${FILESDIR}"/configure-hostd.sh - # install the libraries insinto "${VM_INSTALL_DIR}"/lib/vmware/lib doins -r lib/* @@ -297,7 +299,8 @@ src_install() { doins -r * chmod 0755 "${ED}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym ../../lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool + sed -i 's/readlink/readlink -f/' "${ED}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool + dosym ../lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool cd - >/dev/null fi @@ -329,11 +332,11 @@ src_install() { # create the environment local envd="${T}/90vmware" cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' + PATH='${VM_INSTALL_DIR}/bin:${VM_INSTALL_DIR}/sbin' ROOTPATH='${VM_INSTALL_DIR}/bin' CONFIG_PROTECT_MASK='/etc/vmware-installer' + VMWARE_USE_SHIPPED_LIBS=1 EOF - echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" doenvd "${envd}" @@ -537,7 +540,7 @@ pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update gnome2_icon_cache_update - readme.gentoo_print_elog + elog "${DOC_CONTENTS}" } pkg_postrm() { diff --git a/app-emulation/vmware-workstation/vmware-workstation-16.1.0.17198959.ebuild b/app-emulation/vmware-workstation/vmware-workstation-16.1.1.17801498-r1.ebuild index f349480..22757a2 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-16.1.0.17198959.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-16.1.1.17801498-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit eutils readme.gentoo-r1 gnome2-utils pam python-any-r1 systemd xdg-utils MY_PN="VMware-Workstation-Full" @@ -11,7 +11,7 @@ MY_PV=$(ver_cut 1-3) PV_MODULES="${MY_PV}" PV_BUILD=$(ver_cut 4) MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" -VMWARE_FUSION_VER="12.1.0/17195230" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/ +VMWARE_FUSION_VER="12.1.1/17801503" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/ SYSTEMD_UNITS_TAG="gentoo-02" UNLOCKER_VERSION="3.0.3" @@ -44,8 +44,6 @@ REQUIRED_USE=" " RESTRICT="mirror preserve-libs strip" -# vmware should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. RDEPEND=" app-arch/bzip2 app-arch/unzip @@ -69,6 +67,7 @@ RDEPEND=" cups? ( net-print/cups ) sys-apps/tcp-wrappers sys-apps/util-linux + sys-auth/polkit x11-libs/libXxf86vm x11-libs/libdrm x11-libs/libxshmfence @@ -154,8 +153,7 @@ src_prepare() { 'env-update && source /etc/profile'\n Before you can use ${PN}, you must configure a default network setup. You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group.\n -" +To be able to run ${PN} your user must be in the 'vmware' group." } src_install() { @@ -172,6 +170,13 @@ src_install() { dobin */bin/* dosbin */sbin/* rm "${ED}${VM_INSTALL_DIR}"/bin/configure-initscript.sh || die + mv "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher.bin + cat > "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher <<-EOF + #!/usr/bin/env bash + export LD_LIBRARY_PATH="/opt/vmware/lib/vmware/lib/libssl.so.1.0.2:/opt/vmware/lib/vmware/lib/libcrypto.so.1.0.2" + "${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher.bin "\$@" + EOF + chmod 755 "${ED}${VM_INSTALL_DIR}"/sbin/vmware-authdlauncher # install the libraries insinto "${VM_INSTALL_DIR}"/lib/vmware @@ -253,7 +258,8 @@ src_install() { doins -r * chmod 0755 "${ED}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym ../../lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool + sed -i 's/readlink/readlink -f/' "${ED}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool + dosym ../lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool cd - >/dev/null fi @@ -283,11 +289,11 @@ src_install() { # create the environment local envd="${T}/90vmware" cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' + PATH='${VM_INSTALL_DIR}/bin:${VM_INSTALL_DIR}/sbin' ROOTPATH='${VM_INSTALL_DIR}/bin' CONFIG_PROTECT_MASK='/etc/vmware-installer' + VMWARE_USE_SHIPPED_LIBS=1 EOF - echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" doenvd "${envd}" @@ -401,7 +407,7 @@ pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update gnome2_icon_cache_update - readme.gentoo_print_elog + elog "${DOC_CONTENTS}" } pkg_postrm() { |