Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 240 insertions, 2 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index accb4896920d..93048820d29d 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.45 2009/07/03 01:35:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.46 2009/08/22 01:45:09 vadimk Exp $
+
+*vmware-modules-1.0.0.25 (22 Aug 2009)
+
+  22 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
+  +files/1.0.0.25-makefile-include.patch, +vmware-modules-1.0.0.25.ebuild,
+  +files/1.0.0.25-makefile-kernel-dir.patch:
+  Version bump. modules for vmware-{workstation,player}-{6.2}.5.3
 
   03 Jul 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Fix e-mail address.
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index ecb5be51b983..52e4b5a52cf1 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -3,6 +3,8 @@ AUX 1.0.0.23-r1-kernel-2.6.29.patch 10451 RMD160 2f0094a87ae9530e6a5937f6b3dc3bd
 AUX 1.0.0.24-kernel-2.6.29.patch 10343 RMD160 4c93cab9f129a279671aa82af989121b3bf1f191 SHA1 1fcd62b30ca2a15c82ffc82924eef3447a4a4e08 SHA256 7bda64e6c0fb2fd30f71b38fa0920169356913e17bb8802ffc1e57622a0dd79c
 AUX 1.0.0.24-kernel-2.6.30.patch 1062 RMD160 8c02543ffcd46db13f179a63c589315f103b6c22 SHA1 f4d8030f1197788d9e2263ab4e3e861652702cd3 SHA256 deef76da29aec2aff33a0fe816faa1c4b61cb27858cdd6c1af70f9eaf9cde158
 AUX 1.0.0.24-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
+AUX 1.0.0.25-makefile-include.patch 3185 RMD160 a3aa2f7cb3a51c96be13080061543d9664d98096 SHA1 df61745eeb49f517a9b7fb882ec0baab772544dd SHA256 50b529606062794d90083a590e05966b3420f1f9c6648863bd0ff360c17d9b34
+AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db
 AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521
 AUX patches/vmblock/010_all_kernel-2.6.25.patch 2398 RMD160 d0a3464f03486eda983b230d0bd90bca8a5d7ed3 SHA1 b5de035a7d1f0051a76512be7e25b04ff3d0dbdd SHA256 4036d37415cad6109e95e82c3789f32ea2c4901961612fb158d5f7148671b32e
@@ -19,10 +21,13 @@ DIST vmware-modules-1.0.0.23.amd64.tar.bz2 489196 RMD160 5ef5d18ec22129cd4563d14
 DIST vmware-modules-1.0.0.23.x86.tar.bz2 486085 RMD160 d039206f0ed3fcd93f7acf3bc24c340b8641057a SHA1 5a4e9ed931f6592c8332239e424afdd80b1b46e5 SHA256 5780292e519da9e1512bf78b1e0e6c21e44f4e10f214dcc0caf83af482dedf68
 DIST vmware-modules-1.0.0.24.amd64.tar.bz2 486925 RMD160 64e81b90f9e838100bdc4e901021a86433efeed8 SHA1 bbbf3974afcb77fa0a670ac7821382a725cc6e4e SHA256 d010d0797bc303d2e3a69efc17dca56d3e3de5c43028c780334c57c69606ab94
 DIST vmware-modules-1.0.0.24.x86.tar.bz2 487178 RMD160 9dd4aa6ecabe1ff1621e0a7a9c573479ab92df3c SHA1 e861a6c2d33193a57226a9be562e9e7a1926e45f SHA256 0021b2eefdfb2de3d352d70f84f1e9ec3d375e1073c5f960435208cf3ee2409e
+DIST vmware-modules-1.0.0.25.amd64.tar.bz2 488816 RMD160 deb03d08b8cf1cad03967b3e1b0e98fc2649fd90 SHA1 00adbde24d72455837b5b81db49bc6a6390973d8 SHA256 f4c0baf981151ad3dbdbae104952983d44d83121048ecd7b88b8b34368dd05b7
+DIST vmware-modules-1.0.0.25.x86.tar.bz2 488848 RMD160 4511e6f7a389ed3affe7e058814597d4cfa2ca27 SHA1 155bccf1f27e6aecc765980443b6351e6ae15028 SHA256 ee794a0b714173a91bb523290a579306845f7af9696e5a274745d45c37f1f0e8
 EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7
 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d
 EBUILD vmware-modules-1.0.0.23-r1.ebuild 817 RMD160 e126704918b1c106185e7743006c8178a156620c SHA1 8aa89f0e4a772fa59e05b7a158817ccf84aba54d SHA256 c846170c19b8525ebcdbd01a3c0d9e0bad2ff02b8129475814c65c3f8403d711
 EBUILD vmware-modules-1.0.0.23.ebuild 724 RMD160 35c62995060e0c709dbd690ef63c48a431dfae8a SHA1 6ea6e450fd540c772f5c7227056848f8513939c2 SHA256 a132d0c74e914ff65e0cef0bdbe54e4e9e05e59ad7d1dc72e404d568bd0e31f4
 EBUILD vmware-modules-1.0.0.24.ebuild 1869 RMD160 365eaf6f73a6bc3a9fb89104124fd31760dd3c2f SHA1 f36147072ac47de26f64153b834fcf553bfaf1f8 SHA256 5f7c3ac912d9d1c95c49d946c5f16639967a1e4ebaeae5ef5d0c5910cd89ab2f
-MISC ChangeLog 10512 RMD160 2455f7260af700ee93b4a7ae4933594e2b3fac39 SHA1 8f84aeeed7652e3f33b01c4145aa1435cf68a829 SHA256 479f2e4b98c85a180968d9437480ebf20db1d5bef02442f7c962b59d60a7fca5
+EBUILD vmware-modules-1.0.0.25.ebuild 1796 RMD160 bab55753f941ce1619361887e463ab9f0f31386b SHA1 fbdaff93872ddf775172438ddb84c998306100e3 SHA256 43626138cc1100e360026429eb39132647115597025a34a7860c2e7f5beb833b
+MISC ChangeLog 10791 RMD160 1adca2d8ff62b3ecdd1659ac54e30f54cfa6be0d SHA1 0a7469e2180eb7712f6675d19a282a4dd9d26c31 SHA256 449e6c8fe4bd4fa240f0032aba22656720af1b44ef5caea7975859d2edfbff1c
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
diff --git a/app-emulation/vmware-modules/files/1.0.0.25-makefile-include.patch b/app-emulation/vmware-modules/files/1.0.0.25-makefile-include.patch
new file mode 100644
index 000000000000..79f4331eb470
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.25-makefile-include.patch
@@ -0,0 +1,72 @@
+diff -urN old/vmblock-only/Makefile.kernel work/vmblock-only/Makefile.kernel
+--- old/vmblock-only/Makefile.kernel	2009-08-21 16:10:32.000000000 -0400
++++ work/vmblock-only/Makefile.kernel	2009-08-21 16:11:34.000000000 -0400
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE := -I$(SRCROOT)/include
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
+diff -urN old/vmci-only/Makefile.kernel work/vmci-only/Makefile.kernel
+--- old/vmci-only/Makefile.kernel	2009-08-21 16:10:32.000000000 -0400
++++ work/vmci-only/Makefile.kernel	2009-08-21 16:11:47.000000000 -0400
+@@ -21,7 +21,7 @@
+ 
+ INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
+ 
+diff -urN old/vmmon-only/Makefile.kernel work/vmmon-only/Makefile.kernel
+--- old/vmmon-only/Makefile.kernel	2009-08-21 16:10:32.000000000 -0400
++++ work/vmmon-only/Makefile.kernel	2009-08-21 16:12:48.000000000 -0400
+@@ -22,7 +22,7 @@
+ INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
+ 	   -I$(SRCROOT)/vmcore
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c,   -DVMW_SKAS_MMAP, )
+diff -urN old/vmnet-only/Makefile.kernel work/vmnet-only/Makefile.kernel
+--- old/vmnet-only/Makefile.kernel	2009-08-21 16:10:32.000000000 -0400
++++ work/vmnet-only/Makefile.kernel	2009-08-21 16:13:02.000000000 -0400
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE := -I$(SRCROOT)
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c,   -DVMW_HAVE_EPOLL, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
+diff -urN old/vsock-only/linux/util.c work/vsock-only/linux/util.c
+--- old/vsock-only/linux/util.c	2009-08-21 16:10:32.000000000 -0400
++++ work/vsock-only/linux/util.c	2009-08-21 16:13:27.000000000 -0400
+@@ -154,7 +154,7 @@
+       goto error;
+    }
+ 
+-   Log(buf);
++   Log("%s", buf);
+ 
+    return;
+ 
+diff -urN old/vsock-only/Makefile.kernel work/vsock-only/Makefile.kernel
+--- old/vsock-only/Makefile.kernel	2009-08-21 16:10:32.000000000 -0400
++++ work/vsock-only/Makefile.kernel	2009-08-21 16:13:41.000000000 -0400
+@@ -25,7 +25,7 @@
+ INCLUDE += -I$(SRCROOT)/linux
+ INCLUDE += -I$(SRCROOT)/common
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c,   -DVMW_HAVE_EPOLL, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, )
+ 
diff --git a/app-emulation/vmware-modules/files/1.0.0.25-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.25-makefile-kernel-dir.patch
new file mode 100644
index 000000000000..8df4d8694e34
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.25-makefile-kernel-dir.patch
@@ -0,0 +1,80 @@
+diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
+index 0a9ffd6..4aa09e8 100644
+--- a/vmblock-only/Makefile
++++ b/vmblock-only/Makefile
+@@ -29,9 +29,9 @@ SRCROOT = .
+ VM_UNAME = $(shell uname -r)
+ 
+ # Header directory for the running kernel
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR) 
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmblock
+ PRODUCT := @PRODUCT@
+diff --git a/vmci-only/Makefile b/vmci-only/Makefile
+index 0a6c9c6..6cd0b6d 100644
+--- a/vmci-only/Makefile
++++ b/vmci-only/Makefile
+@@ -29,9 +29,9 @@ SRCROOT = .
+ VM_UNAME = $(shell uname -r)
+ 
+ # Header directory for the running kernel
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmci
+ PRODUCT := @PRODUCT@
+diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
+index d26e58c..f8a40f4 100644
+--- a/vmmon-only/Makefile
++++ b/vmmon-only/Makefile
+@@ -29,9 +29,9 @@ SRCROOT = .
+ VM_UNAME = $(shell uname -r)
+ 
+ # Header directory for the running kernel
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmmon
+ PRODUCT := @PRODUCT@
+diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
+index 4cabc30..568271a 100644
+--- a/vmnet-only/Makefile
++++ b/vmnet-only/Makefile
+@@ -29,9 +29,9 @@ SRCROOT = .
+ VM_UNAME = $(shell uname -r)
+ 
+ # Header directory for the running kernel
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmnet
+ PRODUCT := @PRODUCT@
+diff --git a/vsock-only/Makefile b/vsock-only/Makefile
+index a69bc22..8a74856 100644
+--- a/vsock-only/Makefile
++++ b/vsock-only/Makefile
+@@ -29,9 +29,9 @@ SRCROOT = .
+ VM_UNAME = $(shell uname -r)
+ 
+ # Header directory for the running kernel
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vsock
+ PRODUCT := ws
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild
new file mode 100644
index 000000000000..e3db8bf7e93f
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25.ebuild,v 1.1 2009/08/22 01:45:09 vadimk Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic linux-mod
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI="x86? (
+		mirror://gentoo/${P}.x86.tar.bz2
+		http://dev.gentoo.org/~vadimk/${P}.x86.tar.bz2
+	)
+	amd64? (
+	 	mirror://gentoo/${P}.amd64.tar.bz2
+		http://dev.gentoo.org/~vadimk/${P}.amd64.tar.bz2
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	VMWARE_VER="VME_V65" # THIS VALUE IS JUST A PLACE HOLDER
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} 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() {
+	unpack ${A}
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST}; do
+		unpack ./"${P}"/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV}-makefile-include.patch"
+}
+
+src_install() {
+	# this adds udev rules for vmmon*
+	if [[ -n "`echo ${VMWARE_MODULE_LIST} | grep vmmon`" ]];
+	then
+		dodir /etc/udev/rules.d
+		echo 'KERNEL=="vmmon*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
+		echo 'KERNEL=="vmnet*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
+	fi
+
+	linux-mod_src_install
+}
+