Import latest vmware-{modules,workstation} from stefantalpalaru-overlay

Signed-off-by: Daniel Solano <gentoo@sattvik.com>

3 files changed, 6 insertions, 145 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index b162bf3..3b607e1 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -13,6 +13,6 @@ AUX 4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch 1131 BLAK
 AUX 4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch 1603 BLAKE2B 4eea61a743cb443e4a4c22a02a03410adbae66339ac7ed1c1aafe54e447135c1ed976ce3c97f22db9984926de9b9a09b1820e253978f457c0c2b9d22f8e4c59b SHA512 4413cd5e791dd19c4b47ba2178e386160912882b0e1a549151eafcceae484b5e48f527ee45b14584c98e06c11e28ee5bfef34b318e46b45704fbcf93a7b52b56
 AUX 4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch 1167 BLAKE2B b5c1c4d98d2aed5bb473270ea9b5737da05bab45748aa84b0a83c26abf8d826960ff3251132ae2770bf87168bfb9c01ab7c81ec99036af576ca3fa0eb08b36e2 SHA512 1cf13f9c745bcfcf24ac1e8f762d057f1afde46ec1de4e651a07e63e08d9073eca9bdbaa53c5a1ced556ec83da3bfd80d3c65c979fb91566cf3c7ddae38eaeac
 AUX 4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch 1097 BLAKE2B edf94d85be2caa69ca8b7856e636dd1fc41d60b43e56e08e913b9decca7f1f3a2a39d98681366a4c2f948a60acdce513f873b1c080d7329720abd0f235ee739a SHA512 f2e359183999f0396406724a8e0a80ceb3551772958a8a1e31eec0af8a746191bf5c7b7a5282d0f59d5a7cdd14744e1b775ad5af45bc5ee030434bcbb686d50c
-EBUILD vmware-modules-331.1.7.ebuild 3822 BLAKE2B 05a49087d81b84c5886e2bed6b0caa4af68d9b889db33e12be7bfae1f31aa824fdee80fc414186f5cfc7f0bde793f83b921f3477bba1e96cace22425b3069b1e SHA512 b35f653d74b66ec7c68f0bead761cc947641a5ececb78e3c0fe43e3472a5ce4254cd8192df343c274daaed8f725164fbd8880fdf483a39e906a2be61ccfc122d
-EBUILD vmware-modules-361.1.0.ebuild 3671 BLAKE2B bd724fb68aa7a47b9a3192be069b2c684cc87942e9aaef9b032c03fa459c391407c3f549237da718ce08848c000c4a6c9db84f14150f592ed3a70fac67e96be2 SHA512 59212c11de0915c437909f725872842248e8d7bc4aa01c4530ba76156fb0e32a3220126f45f86764261aecca9fbf7081c8f45690506e7cf9e53405fa6eab7ead
+DIST vmware-modules-15.1.0.zip 582538 BLAKE2B 1d4fddd10884b3462fbbc618697f089c2c8eed2ce99d46467344b581ef3be324c3823c20d537098866629a574ffcb528cc993de53e4daefbef339c93822e64f3 SHA512 8beb20e3d8aa583cf0bc1a47d76ea1d4cc14267ef0772b131e11fc5bfec455665b85f6b18ea21e040df680fc70a4bd06df00db4827fde9033d2f037b1c963003
+EBUILD vmware-modules-15.1.0.ebuild 2430 BLAKE2B 4ea49c6b0016dff442dc9dd72efca38784b0f60ad272342c54fbbcdd0d37359dde7976c489edf50ea8b23086224f34cc6f5e82a2938312e8356d34f9b9af5daf SHA512 ebfaf209ccae8f5832eb2eb7458d57a3f4d4f32b9d2a9b30a92166d9d6dee4608ecad6413b747a9642dadcc55668402a4b2ee2fad7ab51972c3264b8a84b8259
 MISC metadata.xml 322 BLAKE2B 178d5a7e0f6a26281fdeb655994b728e1b2e831a9bd7e07d6ed7c5ad2edb04d30bb8543ee5a1440f06e3a9eb1af20810a3e93800291f5feda877a644aacad14a SHA512 8ed1935f376c38b57fdcd973dab5a8dd714b2fbb74108228f3aab19cec95340c93f6ecff03b10fcafd261896efa711f47ef8c301f35fa0fc4490a4fb45f2fd55
diff --git a/app-emulation/vmware-modules/vmware-modules-361.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-15.1.0.ebuild
index 8d2a99e..5e61b09 100644
--- a/app-emulation/vmware-modules/vmware-modules-361.1.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-15.1.0.ebuild
@@ -8,7 +8,8 @@ inherit eapi7-ver eutils flag-o-matic linux-info linux-mod user udev
 DESCRIPTION="VMware kernel modules"
 HOMEPAGE="http://www.vmware.com/"
 
-SRC_URI=""
+MY_KERNEL_VERSION="5.3"
+SRC_URI="https://github.com/mkubecek/vmware-host-modules/archive/w${PV}-k${MY_KERNEL_VERSION}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,11 +17,9 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND=""
-DEPEND="
-	=app-emulation/vmware-workstation-15.$(ver_cut 2-3)*
-"
+DEPEND=""
 
-S=${WORKDIR}
+S="${WORKDIR}/vmware-host-modules-w${PV}-k${MY_KERNEL_VERSION}"
 
 pkg_setup() {
 	CONFIG_CHECK="~HIGH_RES_TIMERS"
@@ -50,29 +49,7 @@ pkg_setup() {
 	done
 }
 
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
 src_prepare() {
-	# from https://github.com/mkubecek/vmware-host-modules/tree/workstation-15.0.4
-	kernel_is ge 4 9 0 && epatch "${FILESDIR}/4.09-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 10 0 && epatch "${FILESDIR}/4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 12 0 && epatch "${FILESDIR}/4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch"
-	kernel_is ge 4 13 0 && epatch "${FILESDIR}/4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch"
-	epatch "${FILESDIR}/00-vmmon-quick-workaround-for-objtool-warnings.patch"
-	kernel_is ge 4 16 0 && epatch "${FILESDIR}/4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch"
-	epatch "${FILESDIR}/01-vmmon-fix-always_inline-attribute-usage.patch"
-	epatch "${FILESDIR}/02-vmmon-fix-indirect-call-with-retpoline-build.patch"
-	epatch "${FILESDIR}/03-vmmon-check-presence-of-file_operations-poll.patch"
-	epatch "${FILESDIR}/04-modules-replace-SUBDIRS-with-M.patch"
-	epatch "${FILESDIR}/06-vmmon-bring-back-the-do_gettimeofday-helper.patch"
-	epatch "${FILESDIR}/08-vmmon-use-KERNEL_DS-rather-than-get_ds.patch"
-	epatch "${FILESDIR}/09-vmmon-fix-return-type-of-vm_operations_struct-fault-.patch"
-
 	# decouple the kernel include dir from the running kernel version: https://github.com/stefantalpalaru/gentoo-overlay/issues/17
 	sed -i -e "s%HEADER_DIR = /lib/modules/\$(VM_UNAME)/build/include%HEADER_DIR = ${KERNEL_DIR}/include%" */Makefile || die "sed failed"
 
diff --git a/app-emulation/vmware-modules/vmware-modules-331.1.7.ebuild b/app-emulation/vmware-modules/vmware-modules-331.1.7.ebuild
deleted file mode 100644
index 22b5146..0000000
--- a/app-emulation/vmware-modules/vmware-modules-331.1.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver eutils flag-o-matic linux-info linux-mod user udev
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	=app-emulation/vmware-workstation-14.$(ver_cut 2-3)*
-"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-	CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI VMWARE_VMCI_VSOCKETS"
-
-	linux-info_pkg_setup
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmmon vmnet"
-
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-
-	filter-flags -mfpmath=sse -mavx -mpclmul -maes
-	append-cflags -mno-sse  # Found a problem similar to bug #492964
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	# from https://github.com/mkubecek/vmware-host-modules/tree/workstation-14.1.5
-	kernel_is ge 4 9 0 && epatch "${FILESDIR}/4.09-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 10 0 && epatch "${FILESDIR}/4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch"
-	kernel_is ge 4 12 0 && epatch "${FILESDIR}/4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch"
-	kernel_is ge 4 13 0 && epatch "${FILESDIR}/4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch"
-	epatch "${FILESDIR}/00-vmmon-quick-workaround-for-objtool-warnings.patch"
-	kernel_is ge 4 16 0 && epatch "${FILESDIR}/4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch"
-	epatch "${FILESDIR}/01-vmmon-fix-always_inline-attribute-usage.patch"
-	epatch "${FILESDIR}/02-vmmon-fix-indirect-call-with-retpoline-build.patch"
-	epatch "${FILESDIR}/03-vmmon-check-presence-of-file_operations-poll.patch"
-	epatch "${FILESDIR}/04-modules-replace-SUBDIRS-with-M.patch"
-	epatch "${FILESDIR}/05-vmmon-totalram_pages-is-a-function-since-5.0.patch"
-	epatch "${FILESDIR}/06-vmmon-bring-back-the-do_gettimeofday-helper.patch"
-	epatch "${FILESDIR}/07-modules-handle-access_ok-with-two-arguments.patch"
-	epatch "${FILESDIR}/08-vmmon-use-KERNEL_DS-rather-than-get_ds.patch"
-	epatch "${FILESDIR}/09-vmmon-fix-return-type-of-vm_operations_struct-fault-.patch"
-
-	# decouple the kernel include dir from the running kernel version: https://github.com/stefantalpalaru/gentoo-overlay/issues/17
-	sed -i -e "s%HEADER_DIR = /lib/modules/\$(VM_UNAME)/build/include%HEADER_DIR = ${KERNEL_DIR}/include%" */Makefile || die "sed failed"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE="660"
-		KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
-		KERNEL=="vmmon", GROUP="vmware", MODE="660"
-		KERNEL=="vsock", GROUP="vmware", MODE="660"
-	EOF
-	udev_dorules "${udevrules}"
-
-	dodir /etc/modprobe.d/
-
-	cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF
-		# Support for vmware vmci in kernel module
-		alias vmci	vmw_vmci
-	EOF
-
-	export installed_modprobe_conf=1
-	dodir /etc/modprobe.d/
-	cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF
-		# Support for vmware vsock in kernel module
-		alias vsock	vmw_vsock_vmci_transport
-	EOF
-
-	export installed_modprobe_conf=1
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	ewarn "Don't forget to run '/etc/init.d/vmware restart' to use the new kernel modules."
-}