Remove old; add patch to build 264 with kernel 3.8, bug 458228

Package-Manager: portage-2.2.0_alpha183/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

5 files changed, 58 insertions, 100 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 059f8305e2a1..7c5236b7e241 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.105 2013/06/21 20:44:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.106 2013/06/23 13:13:19 dilfridge Exp $
+
+  23 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/264-3.8.0.patch, -vmware-modules-264.4.ebuild,
+  vmware-modules-264.5.ebuild:
+  Remove old; add patch to build 264 with kernel 3.8, bug 458228
 
   21 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   vmware-modules-238.6.ebuild, vmware-modules-264.5.ebuild,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 5dc43ea8ae9a..feaa2d940efc 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -11,6 +11,7 @@ AUX 238-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd4
 AUX 238-sema.patch 3621 SHA256 b56a5b6aa655f830f93424ec23cedd7dde7304f214357cde05bc89574600cbe0 SHA512 23eb215a97b72516069b10383356a3e8fe19c9689e4f0cb6f281536b8a7ec8b82598ed0360100b0107a5e5b2f001fa60e319198f97b3b05e1b25241574943007 WHIRLPOOL 1b12a66e322fad4d62b404257603e6acd73ba8edba641d8cff1f43a465c2915906335dddca2ade49fb8e54985fc760e712e973e795994aad311a3140deb2d6ee
 AUX 238-unlocked_ioctl.patch 1114 SHA256 d3ea574000ab0ccacad75534fc76b482ef78a47a7804e9f2abeb406ceccbb458 SHA512 9f1fea3c17c945f3da6b55f55343886584980e5c9556a8323ec3edcb776f102c41f15ace29790b02df9ce0c43e396ea96e1935a575bbeeac79fed422973e0958 WHIRLPOOL 5150d0c03dbbd4b74445b173e349df4be34faac0bb770c5d689590d105a7cfd053538f5006c8ef4b69820717cf50066f424c90df0a74caafaf65021059cf173d
 AUX 264-3.2.0.patch 2949 SHA256 4105952362a9bf8a054df1c23f2562e86f79b3bef70696422548c01db248c1b0 SHA512 d3b9f2ad688c7ad0922f9b036f3b2fb0e7209cf4814e34431dccb72f11d239ac8bf9cf16f7e6e8ddfbcf839ad043bbc45233fe488564665bb782b8e296e6facf WHIRLPOOL 4041bfbbb472c6eb7372ca8883ee037c0facc0d1b1c85fab3adb01783291e5c1f2b1685a9cfa41e4433d4255e495af735e0d8af0726c0bc31d15564c96abb0bc
+AUX 264-3.8.0.patch 1243 SHA256 75bca77a37dec85288c28805799690cbd39ef4dc87da9c7ee1486d7872a1e669 SHA512 4c6e437e7198cc24c344116410f175a460e81f5ec33e165dca80851c833925c722d0d0147b2df50aa5101afa16b9145538bf889a6d788b1265419bef04d40d49 WHIRLPOOL 0a4caf5729d1dfb05a0cc84176bc904383aaf184007fdc8fd953d9ba0c4234dc4fc49a99f5c1e1c1431dadff2a3d3bc8ce925a528306fa9ca5459e93321fd678
 AUX 264-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7 WHIRLPOOL 4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
 AUX 264-d-make-root.patch 519 SHA256 aad9819961203f4d2e65532567b4f5b485bb583f1a2f322e84919d95505ed0f1 SHA512 de192adfe94493d3e8ac405df035f9da44f9421093f2a2fc322dcf552b9ca3bea0582b1a23520ea1e31d13b8fabcabbe83ae4400172aae520fb2732f39a643da WHIRLPOOL 16f71333ac286a2ad1249bbc2ecabc07f849beaabf525d6d5d6abcd7d7fbb5e6533c723c4607145eb6d0f2463c72e3ae49f6004c942b25e593cb7da4c2601dd1
 AUX 264-jobserver.patch 2899 SHA256 131c606fdafe80f10151c667796270101f3b06ee70a1b872862e15bcfb4ee46d SHA512 cb744aaea00b6eb6970987dd62b71ee9194d8c9ee8941447f0f562af14ba342eee241a3b131de8ad96a8481a5cdf6d88149fd4d409d938ddfeb44b520c5bd790 WHIRLPOOL d7050bbb7160704a9f922a17e2aae14050f4618e9b469bcbb51ff0859be78f15374777b3e1504c87b5298b41ec8191dfa688a183a4d4c110bab8178d704562d1
@@ -26,27 +27,26 @@ AUX 271-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca0
 AUX 271-vmmon.patch 1581 SHA256 a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979 WHIRLPOOL 28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba
 AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
 EBUILD vmware-modules-238.6.ebuild 2216 SHA256 495f742c98fc4ea4aaaa9daf1ffbc6d79e56a77e2d032cfe0ebc6cf409fa904c SHA512 70d3d107ac3b72215054efdf355f2731720dfdbc5b4ba6736b5b12a4f7809b29cc04809b30c208398c90152ba14ee6124d82dc067d6c0342538a2c3c8e9075fe WHIRLPOOL 9ff331f9b7c6bde939730b0b2511776f14607b768c1748ab612f2f52754736cb889cfdfb16186b0d6ef38fd83bdd07c1aabe2095059e8f79f89d8c72ab470675
-EBUILD vmware-modules-264.4.ebuild 2101 SHA256 1e180351d7a30638a40b7dbdb03e4478799464ea0ad445389be1d3faa373c854 SHA512 d74a3892d05cde1d3a22511e8f08d13e7da3c9ed80e57aca4bbb6d744a092619c818ccf43af61f06f8617660dc493e3d70f376083eadc67a9b26f1c10f8f1ce3 WHIRLPOOL 4c2c5c6ca58354d476d912ac32531075e46537d372d32260ed5c30ade8199004be916f5d86ed9cfcfe780955cce654dcabffd032b2e6b9e5ae8f4a76ad7a15f3
-EBUILD vmware-modules-264.5.ebuild 2158 SHA256 d76a411c457a1a274a8c7e3d993b3b7fbd651a6f240a9833a22a7102e3f2dc32 SHA512 b2d68c2c5be1b2046611bde8dfeb5903b851ef3fcc9e1c034193148b6f77d50ff4da18241cbfd6deb3e349d9cb27a0ae15bdbdff3a6d0e85150259a8309560cd WHIRLPOOL 5f4d9664343922f4fc22c69c93995ed79b808af5919707aef21ea7970eebc95a4fce50b7bcd637f032fa31a89ba510e0115f8e2922c9c9f38b593cccc639856f
+EBUILD vmware-modules-264.5.ebuild 2226 SHA256 f88b53fafc3dd507087dcdf440fbe0f207efdb829e5f2c00ed0bf7c302f83b91 SHA512 bb547f3a53762b9d065d72a9175235c0cf356bfb4706bf9d0e9e72638b8416fd89d11a61320f917d5aae67b8320395fc0576d3ea7cd061563c877608e7c2ff19 WHIRLPOOL 140bb79184c8823c3750b3636e7ccc3577d4f6a3008f81f42853d787e121ee6d60d8cef8ae7923b320c1d73675313fd04c73b7b7b73d9e6a76e6811d67c3d8de
 EBUILD vmware-modules-271.2.ebuild 2108 SHA256 400c6f10922b7eca6ec4f83b75d20a5f0505c07e6fad618fee509f7eb4d78682 SHA512 4ac39743d7a3c7ec78ed75b94048adcdb1579e2575fcbd4bbd56a73cc789195ea12aa86059c52e1fb50777c93d11d670d2a516953a25acb0bd7b1dbb5e98a63b WHIRLPOOL 37e9e399327d74bf6941f05adfa5f709b8b3b2d9b1dc3371703464b5ba64e56fa76e968b5c7efaa9708e26353d22c7f49e513398a74a218a78457b79558c486f
-MISC ChangeLog 22991 SHA256 fe3ecc6d4e4d6f3b2bb1562e184a137a87dce6ee00b96bf6585f9585065b8ccb SHA512 a531c72a4da2f759ca3cb087447b66157332ca6bdcf8d40fbd2229f4b3e58462b22f6b4bde706dd912eb417552d75b2ac800ca8bf17cbbdc730267faf40c8f5e WHIRLPOOL c9da60343441a6b8af7c5713559a8acf27adff3d05b1d7feee7d588b0d5493d08bd626486d18788d2ed422bbfdaac497021b8578d08cc9a6b3fc5ce8f47f74db
+MISC ChangeLog 23201 SHA256 1270c5813936bc53bda8d1da44c033b5c932fba056094162a82a4c697ff08929 SHA512 af4347a3aa74b10778e30a73d6fbd2fc5a50f3ac01794f2c8324ac4bfb7945946b2047701bbb316f164978dfcf5b475a23f9130370228b18b866761622cccace WHIRLPOOL f151aca5cb33b54fc45b5ff6a80edea84681c426c559e63d31d1316b7197fdc23722d4579a6f87c0cee1501475611f33f6b3ae2a854721956787acdaba3523af
 MISC metadata.xml 318 SHA256 ac8fd80ce620f3ec98dfc0dac974408e862ac259c9e43830465598393faa95d0 SHA512 9f7b8c607064b29a2a80ab3af8e5a442a2af1cee3ef9f1929a525e8b3724cf7fef0a4de8d78f32b2bc30f1f734ecc204a3db06a0bcf1e09dbe3d6b8d49dba458 WHIRLPOOL de36c0b8febb345a20d876fceeaeab2bf6f2399620174028fe5bf956cdc871e6623981f8e42562668b34dbf0cf8c4fe35035f4696779f582f679614682c81c72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRxLuMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRxvTkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcrlgQALUbDzqioO0juAH+1qpHEsgi
-Of0ylPD3VsTpV/WFUtYGrqQ5ptgW2xcqNBnCDs8DUKP3Ls81LLCq5CBTNJjXIljE
-RFjx+qEaBn2LPo2SYfdzEsVtr2rPg00N3gjvtvGuMoURKGvNfYo/RLNWhZL8ll2k
-7x1WSwT7tC3v5cRdpW8Em+iVjK4FMxPXD/IA+ko5YpPF5TGNudmxH2rM8cRjD82s
-Mvh9WgFxa2Of3PwXJLeeSSPE+spv19S83604KSzvi38daGWsDKmh35AZtvnhyzib
-RNZONeOA5ToVW95dKCATpGYVYnMssXkfVOZFy5hf4pr1YrO4d4WVVtPqBgJZxxaC
-TfUYdOu02pHmrNyB1mLMA06YnXq0ZpCUs4F+JfJHDBFMWrr0RRM3q9RxhcS3YlbA
-kP2HVuFrpajWj/WZT1Y+WRnbQl2dd6posg+0p9sIx9qPU+XwU5XuRZhxk+6/Oc2t
-9NWNp7x0vYN/5KUOvHZluIqhKw838EPHxjMm2KHYJOMxj6IUXSz693W0GQbKb258
-oDMzJZ1aTRsyI6to0fNt6qCg9oYaKKGWjmAn8N5k6mLC8acR7FSC3Ftw6d27GjCG
-occpmNJsIYJIFGOOMz8uFk9aGm15cRSRFt81vkrkCRpFr4V9v7I4Lxtpzxr2natq
-go0+E0F0NhmP6XU5MSQL
-=rKLt
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcXU0P/A2QOKdWoU7ydEOW5Kez5fYv
+bgxvw7y3snlZB7bipWC/IULKrLEu6D6rzFidkBUsvLeEWu2GfqBzjFun3dNeglDR
+/CecDa8AXHq7VohOR04FcO7D7sPvk1ukNNszNoR0V02K4Yz4LJuz3Q+fFQj0mKcB
+mGg7iQ5RHaaISSlHfmQKGTZZ0gpjSV9iaesabU76QOTeDFZQdR43Uy1+HQnvMDQ/
+4NsLa+0k2CMpfJcMZfnSy8AYX5m4llznuuoZ0wRGFaDHz1s7tUWYfglPN6B2Q/W5
+N2hhlWcpnKIttJ0S4z6/7mYsKC1xVU0sR4ZuSn5Akg9luavnvOV0nZG7ziap+xub
+ExHx18iCTUdyvZQrdBM4Fw+O8PASU6MYdCdlOjzfFX+dYQWyir6mqGflR1bG+9n4
+0KLehqUzDxADaGxdJ4CEeR7tkfJSVwTecK3ycSPipYMKpGLifGr09m/Epd77AWuP
+Zf66ynl9cBhcH/BFZ36bhsUDGJyNIVfWR+cj2POK9ZtwfeykjP+eXLNL4lOyEtBN
+9yTVp6FE26s2Z38hgljTYMufM929WYivEzJttpTrzk+uYyfC+xLv8WrhJDXYe9hV
+NSKonqaHz+B5ICDZSPaiMdnRllK6fApfJUzI+GCls/bnaBXhJVEu00d46vj5l0Wt
+XejMyi0E/1dL1bEPImxt
+=4ESs
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/264-3.8.0.patch b/app-emulation/vmware-modules/files/264-3.8.0.patch
new file mode 100644
index 000000000000..e1a97d8c9b93
--- /dev/null
+++ b/app-emulation/vmware-modules/files/264-3.8.0.patch
@@ -0,0 +1,33 @@
+[patch] Vmware 9 on Linux Kernel 3.8rc4 and later
+source: http://communities.vmware.com/thread/432897 and bug 458228
+
+diff -rupN a/work/vmci-only/linux/driver.c b/work/vmci-only/linux/driver.c
+--- a/work/vmci-only/linux/driver.c	2012-10-31 23:28:45.000000000 -0400
++++ b/work/vmci-only/linux/driver.c	2013-03-18 15:23:52.488752357 -0400
+@@ -124,7 +124,7 @@ static struct pci_driver vmci_driver = {
+    .name     = "vmci",
+    .id_table = vmci_ids,
+    .probe = vmci_probe_device,
+-   .remove = __devexit_p(vmci_remove_device),
++   .remove = vmci_remove_device,
+ };
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+@@ -1741,7 +1741,7 @@ vmci_enable_msix(struct pci_dev *pdev) /
+  *-----------------------------------------------------------------------------
+  */
+ 
+-static int __devinit
++static int 
+ vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
+                   const struct pci_device_id *id) // IN: matching device ID
+ {
+@@ -1969,7 +1969,7 @@ vmci_probe_device(struct pci_dev *pdev,
+  *-----------------------------------------------------------------------------
+  */
+ 
+-static void __devexit
++static void 
+ vmci_remove_device(struct pci_dev* pdev)
+ {
+    struct vmci_device *dev = pci_get_drvdata(pdev);
diff --git a/app-emulation/vmware-modules/vmware-modules-264.4.ebuild b/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
deleted file mode 100644
index 64f5d39a5970..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.4.ebuild,v 1.2 2012/12/12 11:46:57 ssuominen Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-4.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-8.0.${PV_MINOR}* )"
-
-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
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	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
-
-	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() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
-	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-264.5.ebuild b/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
index 9cbb00f24476..74c92eebdd2d 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.5.ebuild,v 1.2 2013/06/21 20:44:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.5.ebuild,v 1.3 2013/06/23 13:13:19 dilfridge Exp $
 
 EAPI="4"
 
@@ -66,6 +66,7 @@ src_prepare() {
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.8.0.patch"
 
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user