code cleanup

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 15 insertions, 54 deletions

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index fb8dd8c382ca..1ec5b61f5330 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/open-vm-tools-kmod
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.4 2010/02/19 17:53:19 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.5 2010/03/16 16:15:37 vadimk Exp $
+
+*open-vm-tools-kmod-0.0.20100223.236320 (16 Mar 2010)
+
+  16 Mar 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  -open-vm-tools-kmod-0.0.20091015.201664.ebuild,
+  -open-vm-tools-kmod-0.0.20100119.226760.ebuild,
+  +open-vm-tools-kmod-0.0.20100223.236320.ebuild:
+  small code cleanup
 
 *open-vm-tools-kmod-0.0.20100119.226760 (19 Feb 2010)
 
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20091015.201664.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20091015.201664.ebuild
deleted file mode 100644
index 710a46fbef59..000000000000
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20091015.201664.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 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-0.0.20091015.201664.ebuild,v 1.1 2009/10/29 14:02:43 vadimk Exp $
-
-#EAPI="2"
-
-inherit linux-mod versionator
-
-MY_DATE="$(get_version_component_range 3)"
-MY_BUILD="$(get_version_component_range 4)"
-MY_PN="${PN/-kmod}"
-MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
-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
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	VMWARE_MOD_DIR="modules/linux"
-	VMWARE_MODULE_LIST="pvscsi vmblock vmci vmhgfs vmsync vmmemctl vmxnet vmxnet3 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" -o "${mod}" == "vmxnet3" ];
-		then
-			MODTARGET="net"
-		else
-			MODTARGET="openvmtools"
-		fi
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
-	done
-}
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20100119.226760.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20100223.236320.ebuild
index 49394f2e1c1f..1e7a0c2f2c36 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20100119.226760.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20100223.236320.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-0.0.20100119.226760.ebuild,v 1.1 2010/02/19 17:53:19 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20100223.236320.ebuild,v 1.1 2010/03/16 16:15:37 vadimk Exp $
 
 inherit linux-mod versionator
 
@@ -38,7 +38,7 @@ pkg_setup() {
 
 	for mod in ${VMWARE_MODULE_LIST};
 	do
-		if [ "${mod}" == "vmxnet" -o "${mod}" == "vmxnet3" ];
+		if [ "${mod}" == "vmxnet" ];
 		then
 			MODTARGET="net"
 		else
@@ -47,3 +47,7 @@ pkg_setup() {
 		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
 	done
 }
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "vmxnet3 for Linux is now upstream (as of Linux 2.6.32)"
+}