Move module logic to pkg_setup and add checks for mainline config options.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 37 insertions, 25 deletions

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index ca81efab97ff..ef77c39a3793 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/open-vm-tools-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.38 2013/10/19 16:32:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.39 2013/10/19 17:02:24 floppym Exp $
+
+  19 Oct 2013; Mike Gilbert <floppym@gentoo.org>
+  open-vm-tools-kmod-2013.09.16.1328054.ebuild:
+  Move module logic to pkg_setup and add checks for mainline config options.
 
   19 Oct 2013; Mike Gilbert <floppym@gentoo.org> +files/60-vmware.rules,
   -open-vm-tools-kmod-2012.10.14.874563.ebuild,
diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest
index ff1b3bb73dd3..41f116ec0812 100644
--- a/app-emulation/open-vm-tools-kmod/Manifest
+++ b/app-emulation/open-vm-tools-kmod/Manifest
@@ -9,13 +9,13 @@ AUX putname.patch 430 SHA256 dccba065f71f7a27dd7d38e3eb7d1de9e87b82a18db61853805
 DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f
 DIST open-vm-tools-2013.09.16-1328054.tar.gz 3793719 SHA256 470a6ea3ce14c2c5ea6b7bc59745eccbacc8d88a3f343e712312786435975d13 SHA512 7ae62d5411b4bdefd0e8db5f0a81bb357bfd4a624af06bf9a5a74f49ede0b7051b41dfe548c758fd7e73cded34af983c8aa0c412e65343092e05ae9b997895cb WHIRLPOOL 688fb4e494fb7aab7d0eb09189afff95ec8727bcc1893a4ec632bb8198661a1a55d58a813d2d56a3ac330fd7a55afc1fa7dc11f1d60c06c91ecf6a0bf866b249
 EBUILD open-vm-tools-kmod-2013.04.16.1098359.ebuild 1805 SHA256 904f03a7e1c24db74076a5661305910115350a86c0738a72f628f1414bc5e842 SHA512 ed8bc3f4292a34ffb0a9690d1e39daba9f3a6f2637a5a5d958d7fdf8671f2634745f081d01e05d53ae2f33abe91d231be42f6497a6833ca6bebf9b2ed6d7ff28 WHIRLPOOL cc66d89cd8a419d95dbe83081791bd0a7a1534ff7ba68d159df6507e19ee8ae0facf8ee2438406c578f746e515cbe09800b06ddcb01d360c85e0d63511a47227
-EBUILD open-vm-tools-kmod-2013.09.16.1328054.ebuild 1278 SHA256 a6b4b9916dc22751c33af61f08efef0455045b5e4924492370110b6768d10e06 SHA512 aedf5b0506972fac1dbe0f892cb906723325903cb12f7874d7aa5e52874e092c125579900b82e9d068b4379fb75343aabe270464774fd85b73f04edbdac788b4 WHIRLPOOL ab752522fdfcd247d7b2236f0338bb26726ba57163224ee10a9c28df3f2eba9219573d277f13526035cad55ed6e837df93a768df173ef923a0b1a18d32f2a2eb
-MISC ChangeLog 8029 SHA256 4cef379a34eb7764f9b59b3a7e9470b0ce595077a2eb9e90a463ab8de93baa0d SHA512 f1029e8206c448c960e3b14abbfb2f3659d81b96e91d0e3030f9ab20447080de24c86325257fbc4073c76b34b9643c5d5c57c1ad4b1d93ede72273a7ccb2c98e WHIRLPOOL 2ef417b444d46d5907d47d30bc9be66f0f10ad9dd2f3815f63e6b813ab6c333f1158f77edc223219d48ea8ebbb1967ba8cd2a94a327630f01d7a7e8a55e3e5c1
+EBUILD open-vm-tools-kmod-2013.09.16.1328054.ebuild 1430 SHA256 309d123d02357d99da8833aafad6eb8f045ac7e754877f0b77437fd6df077bf6 SHA512 fea0e855d4a01677c74ba8be2c68712e11aa99d005f8f6647fc8a2576969bb66aec39226d4d10e08ad293ee3a6cbf970a6fc8a831816bbae97ce6a6dfea0ea38 WHIRLPOOL 806d1787718937fe0ea6f6ea5860c136c8cd291c1dad35ee487d049e32fc9d4e01ba92b8d565aaaadddf5231550d606f49fcf50bd9adf3e7aa1ebf16bbe5fe11
+MISC ChangeLog 8204 SHA256 a3659bfacb8a35f773946118376f301c096990048566a1826ce213e340986cab SHA512 0cc8d3a9c923e6ce06ddbaf17c5089af5d0acaef1245dc9e499cd3402817a10af27e85e40a789236be5f5cee7865461f0f23f4282ec855688b79256bcf9d67d5 WHIRLPOOL 4e273629c322144d26d922ed7c628e9307be748e6fc9f8c770ca2d76be66ca31de90ddfad09aabb843b8c2840aa174f3f8fa24e6e5fba57f5e2b23fce35188c3
 MISC metadata.xml 439 SHA256 0d83c61a0bd4e45720f5c6052187d0aa236c246c330934533e7dffcc7668b2c6 SHA512 4080043ebdc6e0a172cd290a7c59dd2482a2bae3b00fc1d845b58e7e390d80e8db9d5311e473e1e384560026b6bc6c1dfcec84785b145047e08ed56c05829112 WHIRLPOOL 81b28c9e864047c0fccc948ac2f256546677b934d44830d084d3174458ffcbf8e092617b289af650840bfb1c66e4d8a8d246c1794b031aee84318ea1c846079b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJitBkACgkQC77qH+pIQ6QmOgD8DWeFQJm1vdQ73XYQIy6fqf77
-afDROgQGP4J/3u6s9M8BALIYR/dw31ZLCE/i2SveSOkdBjyWBSCcbzVbG/UdOt5t
-=hmUR
+iF4EAREIAAYFAlJiuyEACgkQC77qH+pIQ6TA9QD/aEoIsoUqseHuvY7vDLL3pv0s
+aHTTHTKtlSllKEbuAxsBALa0rSrXlT20dNS+lkmF1YxYzO1xUdM5wlRbxcxcI8Lf
+=Y4ew
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild
index 26c0b774ccb1..326561a30a99 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.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/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.2 2013/10/19 16:30:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.3 2013/10/19 17:02:24 floppym Exp $
 
 EAPI="5"
 
@@ -19,36 +19,44 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-CONFIG_CHECK="
-	~DRM_VMWGFX
-	~VMWARE_BALLOON
-	~VMWARE_PVSCSI
-	~VMXNET3
-"
-
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}/frozen.patch"
-	epatch "${FILESDIR}/putname.patch"
-	epatch_user
-}
-
-src_configure() {
-	export OVT_SOURCE_DIR="${S}"
-	export LINUXINCLUDE="${KV_OUT_DIR}/include"
+pkg_setup() {
+	CONFIG_CHECK="~DRM_VMWGFX ~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
 
 	# See logic in configure.ac.
 	local MODULES="vmxnet vmhgfs"
-	kernel_is -lt 3 9 && MODULES+=" vmci vsock"
-	kernel_is -lt 3 && MODULES+=" vmblock vmsync"
+
+	if kernel_is -lt 3 9; then
+		MODULES+=" vmci vsock"
+	else
+		CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
+	fi
+
+	if kernel_is -lt 3; then
+		MODULES+=" vmblock vmsync"
+	else
+		CONFIG_CHECK+=" ~FUSE_FS"
+	fi
 
 	local mod
 	for mod in ${MODULES}; do
 		MODULE_NAMES+=" ${mod}(ovt:modules/linux/${mod})"
 	done
 
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/frozen.patch"
+	epatch "${FILESDIR}/putname.patch"
+	epatch_user
+}
+
+src_configure() {
 	BUILD_TARGETS="auto-build"
+	export OVT_SOURCE_DIR="${S}"
+	export LINUXINCLUDE="${KV_OUT_DIR}/include"
 }
 
 src_install() {