Sync changes from the tree back into the overlay.

svn path=/trunk/; revision=159

6 files changed, 57 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 87dbabc..26d086a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 # $ Id: $
 
   09 Apr 2007; Mike Auty <ikelos@gentoo.org>:
+  Sync changes in the tree back into the overlay.
+  
+  09 Apr 2007; Mike Auty <ikelos@gentoo.org>:
   Fix up vmware-server-tools configs:
     Only build vmxnet vmdesched for server-tools
     Only build vmdesched if not on amd64
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 66c056d..fbefe3a 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -6,6 +6,14 @@ AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681ff
 MD5 d2a8db48485977f21067a20798219821 files/patches/000_all_makefile-include-directory.patch 342
 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 files/patches/000_all_makefile-include-directory.patch 342
 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db files/patches/000_all_makefile-include-directory.patch 342
+AUX patches/010_all_makefile-vm-build-no-unused-warnings.patch 407 RMD160 38deb7f5697f16eedbe4c5470cbd21ca84802011 SHA1 e3a4255077e9b44a6e42114f9d30bcde8b7d588b SHA256 6e62697c6b17a2c0cc80b4bdeb06c32afa9960e6ef5f7254f2a54d1a762069b0
+MD5 56bae6429e200d45fce02c626ba060ce files/patches/010_all_makefile-vm-build-no-unused-warnings.patch 407
+RMD160 38deb7f5697f16eedbe4c5470cbd21ca84802011 files/patches/010_all_makefile-vm-build-no-unused-warnings.patch 407
+SHA256 6e62697c6b17a2c0cc80b4bdeb06c32afa9960e6ef5f7254f2a54d1a762069b0 files/patches/010_all_makefile-vm-build-no-unused-warnings.patch 407
+AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521
+MD5 58b71f6120139172fa6065ab7a2a691d files/patches/020_all_epoll-def-warnings.patch 435
+RMD160 b9152d9af93862c99c72abc1ef97639351d82141 files/patches/020_all_epoll-def-warnings.patch 435
+SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 files/patches/020_all_epoll-def-warnings.patch 435
 DIST VMware-workstation-e.x.p-36983.i386.tar.gz 202626242 RMD160 1d5f9b2dc407caff9a3da37d8a21f0c5937ed1ce SHA1 43d5df8fcc86925c05a25e60cb0f2a01b3c9a74a SHA256 44edf4f73a869c8d390a0b0a34eda48258316710c759354f1c5c8deb0624acec
 DIST vmware-any-any-update108.tar.gz 296976 RMD160 27ac3469d17e815a2f9564a7298b02a4b8cfb370 SHA1 6bd4c433cc8b6398b4abe514b72f073b7e48362b SHA256 048357bc3b180529db5e5adbc8a8efa7aebcd0b846d2319d37918e7398cde45c
 EBUILD vmware-modules-1.0.0.11-r1.ebuild 311 RMD160 c1022016ab270313119855fe76745f9e5411ef26 SHA1 3f4408471a775cc68d2401808f2b8bec4f950cd7 SHA256 7a8c427e8c4c55feb3ff87d7085938373bd9154e771cc8ba2ee969eb0cd771cb
diff --git a/app-emulation/vmware-modules/files/patches/010_all_makefile-vm-build-no-unused-warnings.patch b/app-emulation/vmware-modules/files/patches/010_all_makefile-vm-build-no-unused-warnings.patch
new file mode 100644
index 0000000..a0c47d5
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/010_all_makefile-vm-build-no-unused-warnings.patch
@@ -0,0 +1,11 @@
+--- Makefile.kernel
++++ Makefile.kernel
+@@ -14,7 +14,7 @@
+ endif
+ vm_check_build = $(shell if $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) \
+ 	$(EXTRA_CFLAGS) -Iinclude2/asm/mach-default -DKBUILD_BASENAME= \
+-	-Werror -S -o /dev/null -xc $(1) \
++	-Werror -Wno-unused -S -o /dev/null -xc $(1) \
+ 	$(VMWARE_DEBUG_REDIRECT); then echo "$(2)"; else echo "$(3)"; fi)
+ 
+ CC_WARNINGS := -Wall -Wstrict-prototypes 
diff --git a/app-emulation/vmware-modules/files/patches/020_all_epoll-def-warnings.patch b/app-emulation/vmware-modules/files/patches/020_all_epoll-def-warnings.patch
new file mode 100644
index 0000000..c30d7c9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/patches/020_all_epoll-def-warnings.patch
@@ -0,0 +1,18 @@
+--- include/compat_wait.h
++++ include/compat_wait.h
+@@ -34,13 +34,13 @@
+  * 2.4.20-wolk4.0s.
+  */
+ 
+-#if VMW_HAVE_EPOLL // {
++#ifdef VMW_HAVE_EPOLL // {
+ #define compat_poll_wqueues struct poll_wqueues
+ #else // } {
+ #define compat_poll_wqueues poll_table
+ #endif // }
+ 
+-#if VMW_HAVE_EPOLL // {
++#ifdef VMW_HAVE_EPOLL // {
+ 
+ /* If prototype does not match, build will abort here */
+ extern void poll_initwait(compat_poll_wqueues *);
diff --git a/app-emulation/vmware-server/files/vmware-server.rc b/app-emulation/vmware-server/files/vmware-server.rc
index 238d759..0397f5e 100644
--- a/app-emulation/vmware-server/files/vmware-server.rc
+++ b/app-emulation/vmware-server/files/vmware-server.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.1 2006/07/31 20:23:50 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.2 2007/03/07 17:45:00 wolf31o2 Exp $
 
 depend() {
 	need localmount xinetd
@@ -16,22 +16,22 @@ vmware-prettify() {
 	msgtype=0
 	while read line
 	do
-		[ "$line" == "" ] && continue
-		if [ "$msgtype" -le "0" ]
+		[[ "${line}" == "" ]] && continue
+		if [[ "${msgtype}" -le "0" ]]
 		then
-			if [ "$msgtype" == "-1" ]
+			if [[ "${msgtype}" == "-1" ]]
 			then
-				ewarn $line
+				ewarn ${line}
 				continue
 			fi
-			if [ "${line/*:*/}" == "" ]
+			if [[ "${line/*:*/}" == "" ]]
 			then
-				einfon $line
+				einfon ${line}
 				echo
 				eend 0
 				msgtype=1
 			else
-				ewarn $line
+				ewarn ${line}
 				msgtype=-1
 				waserror=1
 			fi
@@ -39,25 +39,25 @@ vmware-prettify() {
 		fi
 
 		# Strip out anything after the <esc> code
-		message=`echo $line | sed -e "s/^\(.*\).*$/\1/"`
-		einfon "  $message"
+		message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
+		einfon "  ${message}"
 		echo
 
-		echo $line | grep done > /dev/null
+		echo ${line} | grep done > /dev/null
 		status=$?
-		eend $status
+		eend ${status}
 
-		if [ "$status" != "0" ]
+		if [[ "${status}" != "0" ]]
 		then
-			logger -p local0.err -t vmware-${state} "$line"
-			waserror=$status
+			logger -p local0.err -t vmware-${state} "${line}"
+			waserror=${status}
 		fi
 	done
-	if [ "$msgtype" == "-1" ]
+	if [[ "${msgtype}" == "-1" ]]
 	then
 		eend 1 "VMware is not properly configured! See above."
 	fi
-	return $waserror
+	return ${waserror}
 }
 
 start() {
diff --git a/eclass/vmware-mod.eclass b/eclass/vmware-mod.eclass
index 19e98a3..d51adf7 100644
--- a/eclass/vmware-mod.eclass
+++ b/eclass/vmware-mod.eclass
@@ -18,8 +18,6 @@ IUSE=""
 [[ -z "${VMWARE_VER}" ]] && VMWARE_VER="VME_V55"
 VMWARE_MOD_DIR="${ANY_ANY}"
 
-DEPEND=">=sys-apps/portage-2.0.54"
-
 S="${WORKDIR}"
 
 # We needn't restrict this since it was only required to read