Version bump to make some modules optional, bug 501536

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

4 files changed, 124 insertions, 17 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 9b004b587a5f..3d43d5711bd1 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.115 2014/04/12 18:28:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.116 2014/04/12 20:13:46 dilfridge Exp $
+
+*vmware-modules-279.1-r1 (12 Apr 2014)
+
+  12 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +vmware-modules-279.1-r1.ebuild, metadata.xml:
+  Version bump to make some modules optional, bug 501536
 
 *vmware-modules-271.3 (12 Apr 2014)
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 205d99ce370b..bc0a9369f4ff 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -29,25 +29,26 @@ AUX 279-vmblock.patch 1041 SHA256 217d27619ac782711686cffee44fbc4bbb40eb0657f335
 AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
 EBUILD vmware-modules-271.3.ebuild 2178 SHA256 82ce0ec185be017baec7cc7a76019a6a076730cdbac66a966d4c4b72ecd8c909 SHA512 99c3fb09ba095ee02bd32ad4f31ef51a57db7a6afc5699c6fe1da12efe478667072353eb9aab178feaf8dee993059b906efbbfd1ce9e423d12ae1806fc154bbf WHIRLPOOL cc3f663646f2587c580369643f5240367b34be7cf28399a5b155341b2917e9c324580b8bab902208ee54719d7e49f7dfb7dcbd984da76737ca8c255d4cc2bc78
 EBUILD vmware-modules-279.0.ebuild 2178 SHA256 09592c9bb1daf287605436f90f5cabeec9d7a645eef8297f64fd9e0221fa7bfd SHA512 714a9b9c4fc3b9d116742ccc7e29733387514a42d93df8820566bf3fe6d9b4c75f75f7c780d87b29b770967e20db86c197a4b18b0c3146618ef2ca5882d83b78 WHIRLPOOL 8a3fc5030cc11e0b35e6f2bb5537360a98612b0374dc5e0fa0067cabe1578a9beafbfdc2792d6d126fdf82d972c067c3bbdb8ba74b6bd7c6c643603a45001e9e
+EBUILD vmware-modules-279.1-r1.ebuild 2682 SHA256 d696123ae38eed5a717c06d007dd71b6fd0e03e9da2e62ecc88e38a5bc874c05 SHA512 6814a7f149bc136eb8ae1d9933ab803455a72929b5aa19860c153ca1c12059bce11b09e209f4597fdcce5d7a28ca1747c47d716e83c6e0606ed52a50746603e9 WHIRLPOOL f7debc1a7911e995044ea25873cdc7a7d481e70ee2383750aa3d9fa1c531dd68f6402c56a70db015b72a0bfd3f17e4f725e69318c4d063afecd4d772fd9b714d
 EBUILD vmware-modules-279.1.ebuild 2178 SHA256 8cc26331ebccdcb9ad1b81d667372ac5ddd78d1d76ba1ef95327682f6c12e047 SHA512 dc902b2ca914cdc24a80b7e64e10702e4abb3c0afe29fff41a0e2cb35c0fd3898bc23aaadfdbc0b2d5c6cbd360d9e1e6cbd0288964731041d54e2217cffd1e1e WHIRLPOOL 01ce81730f7a3261944d8fd930637f65bf3eae6c5d173e658ddc552ad2cc496b08cffebffcad2c4c7277ad596f203300de23eadad3e2fb0a399848449b6a0813
-MISC ChangeLog 25261 SHA256 fe4f8840fb53f5987e9ac74172bfd965fa15e2222880080653a78de3b269f6ba SHA512 0866d3edf0826544e36e310b772229fe493b29cd736c6f5b28deba072f7ef9462c9e8f71fd71e967aafe33c6e8dbe08e24a8b20cfcf6f73de9a0e79b1bf410f1 WHIRLPOOL 37f7a5ba2713dd6bb5d3b0b7357bdccfc0ac433ed39a39715e5846ab9186d47e0201d0a923585746e565f87bb9b0a64d8e5f9c77fe4cb5bd341eb030710ebef4
-MISC metadata.xml 318 SHA256 ac8fd80ce620f3ec98dfc0dac974408e862ac259c9e43830465598393faa95d0 SHA512 9f7b8c607064b29a2a80ab3af8e5a442a2af1cee3ef9f1929a525e8b3724cf7fef0a4de8d78f32b2bc30f1f734ecc204a3db06a0bcf1e09dbe3d6b8d49dba458 WHIRLPOOL de36c0b8febb345a20d876fceeaeab2bf6f2399620174028fe5bf956cdc871e6623981f8e42562668b34dbf0cf8c4fe35035f4696779f582f679614682c81c72
+MISC ChangeLog 25465 SHA256 264162635355aeb194990e1cb6ec640ebfd45e73134f4186b61d5c763ba27fe8 SHA512 b13e29d55b59331e8bf89250c12e2bb2ce1a97cf7a9669ccd2695798b7b5eaf50bc3851ac3c7afff2656883fb7e556403a85fc04272a75f03aa675f48714ba3d WHIRLPOOL 42ce6d655ce7a0cc70467c86a31392fca13155bb36ca3a7c13ab0e5c42fc5f8c0f1d159ed4c5d0792d5d061b2951da7d905d7dae35ad84f83aaf226acde904a5
+MISC metadata.xml 626 SHA256 df85fe94586e898742dda5a30bf95be1c66bded72b9b679b4bda9fb3113bb94a SHA512 5c16977fa1e95f123891324b24d20161bfbfa5f4a38371374290e635bba33cbbc933761f44b826503c37e4bb2295c4026356eddc6aef091c07dc17f773f538ec WHIRLPOOL f83d377fa941fbcfe25dfc83ad276f55782c1e9bdff6dc7ae147be667d7129ae55dae6c19c18544dc27123977d3aa6273f185b4cced70ab841e87a04a4fcae82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTSYXiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTSZ6AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc2eAP/igGaVpHQHa4qzkmrKwyRZ1E
-oQpEjFji8zaB6HR+ZhTwv+o9k+M7JUBYWulsOxN4ONsK8skX3BQ6caJhhbpmmg5N
-W4Jfoa9ZGLBh7Dh4RC1HcxD3WU87ugB5JCY5cnRlD+uoEUsYUEp7WEYxdD2Q9xYA
-ssT2kFSQbiV25u0+GG/UP1RlngHvDRo+q4TR1vG0fpufQ//QXatn2xc20jq8WTko
-RbecKIJN5NuK6waB8DrUZOKNm4FkUnsbr/HGGIWNmfefRuxRT315FL7XQtOZb6Xw
-3HVhocM9CdhYmBX7Sw3gWOVwgNDeBDLa4QAD8A62/wZwloiVACnkKFqQcQuzAFTr
-CFpJ+4/CnNmB418vaia5hPv6IFJot4wNhy8iwn3ngVpEHyw6mbLSrn1hRnogGspt
-0QYD0vXfMj6CR7cPgW6QjTsolPNdcDoi0XfKBBWKx06hxbF79eRC1pTrrlaunN9b
-5HFtidDXICtGQqnwgcLcCL2AxlPpDqfn46u9Ig63M2rxkS8sFTl/lW6eh188o8hj
-ghbZi5WURIE0lA1Hdk+tzWuLpsF2qgsYGboeSPrPJD2CGj/F8UMVE74TOWPI2SQw
-E0sJ3ps3r7kl8JIvVlp/o8BZBpcNETTZ5phZ0GOSN9TDTiZIADwU81sdAL7OSvBu
-mIeG3jHIn08LK/uXD3Zm
-=WXHh
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcLugP/1HQJozLvGIJwgMTUb5MTKXW
+uFfoxSN1jNEpz9m+PlDmlOM7fUpRSNobJeFc0u/0XbpLR/3YeLc8zTBlbo59tJMl
+S7TMDMAoYjA+E77+KW1T11YQH8reiG0lfRtHVZi8zsj3EgC2toB/sqyf24EK4KoT
+6Ozxw76pGlcWsEr+5jVijZ5Phs94Rj9w6QD709kr/FcaOl6d1gzVJQOzEyt9tO1W
+xiMDqgTFdimMNLYNr6ZUb4zbQWADh30qagX6Vqw3vffgXKbLhCzgA3CIQYAI2m4p
+Zsyxh0JGS37eEjPr6nF4JZ6+nXIMZSrx76qMBNhb7+YwNdxC5hJ0uoXOteFqkhzQ
+MWRJ/x9kx9M+zWboxRDT0pFQ+FVslDfiqkhnn2WwMQZBzapbBYRwUiklh2llGIvv
+HpOiGMf276OC+TsSCIIOze6GahEzMzJwu50hk745WTnTFQPtMNRvOUrljThf2WQw
+rG3swAX8P+WEEKW52J+byrsrEFn08tffYjJVkicQ0QQayLXrG4qIPhLQaR7NDQ35
+PrTm3Vq1FVO2+TuuE+3ajSLPwEG/95WSTAH9Mk/5LVruN+c2qbRFX1tndjbM2RL6
+EeelOvrlr2AKr2zcbNso0CHf4w6LUOzda0cnVyXfFntGJFmB9V8f8uwIlRIfszrA
+UHmlHCWQc5roWtRvTikX
+=hKb2
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml
index a6932f58f745..313c1627f097 100644
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@@ -7,5 +7,7 @@
 	</longdescription>
 	<use>
     	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
+    	<flag name="vmci">Build the Virtual Machine Communication Interface module; disable this if you want to use the module from the mainline kernel</flag>
+    	<flag name="vsock">Build the VMware VMCI transport for Virtual Sockets; disable this if you want to use the module from the mainline kernel</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
new file mode 100644
index 000000000000..b15e0e8a9899
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild,v 1.1 2014/04/12 20:13:46 dilfridge Exp $
+
+EAPI=5
+
+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 +vmci +vsock"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
+	=app-emulation/vmware-workstation-10.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
+	if use vmci ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+	fi
+	if use vsock ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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_ALL}; 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}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/279-hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+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}"
+}