Add use flag to control building of vmhgfs module.

(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 16 insertions, 86 deletions

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index b97301c0bce0..5ae58d6f7af6 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,11 @@
 # 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.43 2013/12/31 17:03:48 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.44 2014/08/10 16:18:12 floppym Exp $
+
+  10 Aug 2014; Mike Gilbert <floppym@gentoo.org>
+  -open-vm-tools-kmod-2013.04.16.1098359.ebuild, metadata.xml,
+  open-vm-tools-kmod-2013.09.16.1328054.ebuild:
+  Add use flag to control building of vmhgfs module.
 
   31 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/fragsize.patch:
   [QA] Remove unused files.
diff --git a/app-emulation/open-vm-tools-kmod/metadata.xml b/app-emulation/open-vm-tools-kmod/metadata.xml
index 89f31836eabb..2e258f6a3d72 100644
--- a/app-emulation/open-vm-tools-kmod/metadata.xml
+++ b/app-emulation/open-vm-tools-kmod/metadata.xml
@@ -8,4 +8,7 @@
 		virtualization components that enhance performance and user experience
 		of virtual machines.
 	</longdescription>
+	<use>
+		<flag name="vmhgfs">Build the vmhgfs module for file sharing support with the host</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild
deleted file mode 100644
index 6d01ea697e9f..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.04.16.1098359.ebuild,v 1.3 2013/08/24 19:18:21 floppym Exp $
-
-EAPI="4"
-
-inherit eutils linux-info linux-mod versionator
-
-MY_PN="${PN/-kmod}"
-MY_PV="$(replace_version_separator 3 '-')"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	"
-
-CONFIG_CHECK="
-	~DRM_VMWGFX
-	~VMWARE_BALLOON
-	~VMWARE_PVSCSI
-	~VMXNET3
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	VMWARE_MOD_DIR="modules/linux"
-	VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock"
-
-	MODULE_NAMES=""
-	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
-
-	for mod in ${VMWARE_MODULE_LIST};
-	do
-		if [ "${mod}" == "vmxnet" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-}
-
-src_prepare() {
-	sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
-		|| die "Sed failed."
-	epatch "${FILESDIR}/frozen.patch"
-	epatch "${FILESDIR}/putname.patch"
-	epatch "${FILESDIR}/1098359-vmblock-3.10.0.patch"
-	epatch_user
-}
-
-src_configure() {
-	:				# do nothing at all
-}
-
-src_install() {
-	linux-mod_src_install
-
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	insinto /lib/udev/rules.d/
-	doins "${udevrules}"
-}
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 d60737f9e356..8ab6ce4d247f 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
+# Copyright 1999-2014 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.5 2013/10/22 22:21:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.09.16.1328054.ebuild,v 1.6 2014/08/10 16:18:12 floppym Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="vmhgfs"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -26,7 +26,9 @@ pkg_setup() {
 		!UIDGID_STRICT_TYPE_CHECKS"
 
 	# See logic in configure.ac.
-	local MODULES="vmxnet vmhgfs"
+	local MODULES="vmxnet"
+
+	use vmhgfs && MODULES+=" vmhgfs"
 
 	if kernel_is -lt 3 9; then
 		MODULES+=" vmci vsock"