Move udev rules file to FILESDIR and install with udev.eclass. Remove old ebuilds.

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

7 files changed, 14 insertions, 318 deletions

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index c09a3ba8b4ef..3f1ca44d2da0 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,15 @@
 # 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.36 2013/10/19 01:42:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.37 2013/10/19 16:30:10 floppym Exp $
+
+  19 Oct 2013; Mike Gilbert <floppym@gentoo.org> +files/60-vmware.rules,
+  -open-vm-tools-kmod-2012.10.14.874563.ebuild,
+  -open-vm-tools-kmod-2012.12.26.958366.ebuild,
+  -open-vm-tools-kmod-8.8.2.590212-r1.ebuild,
+  -open-vm-tools-kmod-9.2.2.893683.ebuild,
+  open-vm-tools-kmod-2013.09.16.1328054.ebuild:
+  Move udev rules file to FILESDIR and install with udev.eclass. Remove old
+  ebuilds.
 
 *open-vm-tools-kmod-2013.09.16.1328054 (19 Oct 2013)
 
diff --git a/app-emulation/open-vm-tools-kmod/files/60-vmware.rules b/app-emulation/open-vm-tools-kmod/files/60-vmware.rules
new file mode 100644
index 000000000000..3c83e4606afc
--- /dev/null
+++ b/app-emulation/open-vm-tools-kmod/files/60-vmware.rules
@@ -0,0 +1 @@
+KERNEL=="vsock", GROUP="vmware", MODE=660
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild
deleted file mode 100644
index a9351b7e7c23..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild
+++ /dev/null
@@ -1,77 +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/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild,v 1.1 2012/12/09 14:11:50 vadimk 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"
-}
-
-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-2012.12.26.958366.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild
deleted file mode 100644
index 8158827a086e..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.12.26.958366.ebuild
+++ /dev/null
@@ -1,78 +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-2012.12.26.958366.ebuild,v 1.2 2013/03/15 19:48:53 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_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 1a84057e5a8c..26c0b774ccb1 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,10 +1,10 @@
 # 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.1 2013/10/19 01:42:17 floppym Exp $
+# $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 $
 
 EAPI="5"
 
-inherit eutils linux-mod versionator
+inherit eutils linux-mod versionator udev
 
 MY_PN="${PN/-kmod}"
 MY_PV="$(replace_version_separator 3 '-')"
@@ -53,11 +53,5 @@ src_configure() {
 
 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}"
+	udev_dorules "${FILESDIR}/60-vmware.rules"
 }
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild
deleted file mode 100644
index 0aad33e87e72..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild
+++ /dev/null
@@ -1,76 +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/open-vm-tools-kmod/open-vm-tools-kmod-8.8.2.590212-r1.ebuild,v 1.2 2012/05/31 23:14:43 zmedico 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."
-	kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch"
-}
-
-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-9.2.2.893683.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild
deleted file mode 100644
index 111fdd9445e0..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild
+++ /dev/null
@@ -1,77 +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/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild,v 1.1 2012/12/09 14:11:50 vadimk 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."
-	#kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch"
-	epatch "${FILESDIR}/frozen.patch"
-}
-
-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}"
-}