Version bump and remove the broken masked version.

(Portage version: 2.1.4)

5 files changed, 13 insertions, 196 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 318ba0421656..4e7e684c1422 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/open-vm-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.2 2008/01/28 17:59:29 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.3 2008/01/30 14:08:32 ikelos Exp $
+
+*open-vm-tools-0.0.20080123.74039 (30 Jan 2008)
+
+  30 Jan 2008; Mike Auty <ikelos@gentoo.org>
+  -files/open-vm-tools-kernel_stdint-soren.patch,
+  -open-vm-tools-0.0.20071121.64693-r1.ebuild,
+  +open-vm-tools-0.0.20080123.74039.ebuild:
+  Version bump and remove the broken masked version.
 
 *open-vm-tools-0.0.20071121.64693-r1 (28 Jan 2008)
 
diff --git a/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20071121.64693-r1 b/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20071121.64693-r1
deleted file mode 100644
index 6dfad2de76b7..000000000000
--- a/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20071121.64693-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1cc034f14769375f41f6410d709dacbc open-vm-tools-2007.11.21-64693.tar.gz 2295022
-RMD160 e166040e713f4b7f8fae835862128a7ec3fdca75 open-vm-tools-2007.11.21-64693.tar.gz 2295022
-SHA256 b00530bf578b07127880ad3107b2b98873d3e5f74876dd94644bac3883be4431 open-vm-tools-2007.11.21-64693.tar.gz 2295022
diff --git a/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20080123.74039 b/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20080123.74039
new file mode 100644
index 000000000000..55f078bd4d09
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/digest-open-vm-tools-0.0.20080123.74039
@@ -0,0 +1,3 @@
+MD5 dd82eb1859d907870ee77c927ca36f1b open-vm-tools-2008.01.23-74039.tar.gz 2332290
+RMD160 b8a78e28abb63f50b5b9f49ad5ebaa727eee4619 open-vm-tools-2008.01.23-74039.tar.gz 2332290
+SHA256 78754c0ab0cb39aad96d80bd1ade4ac2174c4067625d603e2a6afcce6359cace open-vm-tools-2008.01.23-74039.tar.gz 2332290
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools-kernel_stdint-soren.patch b/app-emulation/open-vm-tools/files/open-vm-tools-kernel_stdint-soren.patch
deleted file mode 100644
index 994600115243..000000000000
--- a/app-emulation/open-vm-tools/files/open-vm-tools-kernel_stdint-soren.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff -u open-vm-tools-2007.11.21-64693/debian/changelog open-vm-tools-2007.11.21-64693/debian/changelog
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmblock/include/driver-config.h
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmblock/include/driver-config.h
-@@ -59,6 +59,11 @@
- #endif
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-+/* Prevent uintptr_t from being declared in vm_basic_types.h. */
-+#define _STDINT_H 1
-+#endif
-+
- #ifndef __KERNEL__
- #define __KERNEL__
- #endif
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/cpNameLite.c
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/cpNameLite.c
-@@ -25,8 +25,8 @@
-  *
-  */
- 
--#include "vm_assert.h"
- #include "cpNameLite.h"
-+#include "vm_assert.h"
- 
- /*
-  *----------------------------------------------------------------------
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/cpName.c
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/cpName.c
-@@ -28,9 +28,9 @@
- #include <string.h>
- #endif
- 
--#include "vm_assert.h"
- #include "cpName.h"
- #include "cpNameInt.h"
-+#include "vm_assert.h"
- 
- /*
-  *----------------------------------------------------------------------
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/cpNameLinux.c
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/cpNameLinux.c
-@@ -28,9 +28,9 @@
- #include <memory.h>
- #endif
- 
--#include "vm_assert.h"
- #include "cpName.h"
- #include "cpNameInt.h"
-+#include "vm_assert.h"
- 
- 
- /*
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/driver-config.h
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/driver-config.h
-@@ -59,6 +59,11 @@
- #endif
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-+/* Prevent uintptr_t from being declared in vm_basic_types.h. */
-+#define _STDINT_H 1
-+#endif
-+
- #ifndef __KERNEL__
- #define __KERNEL__
- #endif
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/staticEscape.c
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/staticEscape.c
-@@ -36,8 +36,8 @@
- #   endif
- #endif
- 
--#include "vm_assert.h"
- #include "staticEscape.h"
-+#include "vm_assert.h"
- 
- 
- /*
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/fsutil.c
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/fsutil.c
-@@ -46,8 +46,8 @@
- #include "fsutil.h"
- #include "hgfsProto.h"
- #include "staticEscape.h"
--#include "vm_assert.h"
- #include "vm_basic_types.h"
-+#include "vm_assert.h"
- 
- static struct inode *HgfsInodeLookup(struct super_block *sb,
-                                      ino_t ino);
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/hgfsBd.c
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/hgfsBd.c
-@@ -33,10 +33,10 @@
- #   include "debug.h"
- #endif
- 
--#include "vm_assert.h"
- #include "rpcout.h"
- #include "hgfs.h"     // for common HGFS definitions
- #include "hgfsBd.h"
-+#include "vm_assert.h"
- 
- 
- /*
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmhgfs/kernelStubs.h
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmhgfs/kernelStubs.h
-@@ -28,10 +28,10 @@
- #define __KERNELSTUBS_H__
- 
- #ifdef linux
--#include "vm_basic_types.h"
- #include "driver-config.h"
- #include <linux/kernel.h>
- #include <linux/string.h>
-+#include "vm_basic_types.h"
- #elif defined(_WIN32)
- #include "vm_basic_types.h"
- #include <ntddk.h>   /* kernel memory APIs */
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmmemctl/driver-config.h
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmmemctl/driver-config.h
-@@ -59,6 +59,11 @@
- #endif
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-+/* Prevent uintptr_t from being declared in vm_basic_types.h. */
-+#define _STDINT_H 1
-+#endif
-+
- #ifndef __KERNEL__
- #define __KERNEL__
- #endif
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmxnet/driver-config.h
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmxnet/driver-config.h
-@@ -59,6 +59,11 @@
- #endif
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-+/* Prevent uintptr_t from being declared in vm_basic_types.h. */
-+#define _STDINT_H 1
-+#endif
-+
- #ifndef __KERNEL__
- #define __KERNEL__
- #endif
-only in patch2:
-unchanged:
---- open-vm-tools-2007.11.21-64693.orig/modules/linux/vmsync/driver-config.h
-+++ open-vm-tools-2007.11.21-64693/modules/linux/vmsync/driver-config.h
-@@ -59,6 +59,11 @@
- #endif
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
-+/* Prevent uintptr_t from being declared in vm_basic_types.h. */
-+#define _STDINT_H 1
-+#endif
-+
- #ifndef __KERNEL__
- #define __KERNEL__
- #endif
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20080123.74039.ebuild
index 464f77377ebc..c43ad31fcdf2 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693-r1.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20080123.74039.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20071121.64693-r1.ebuild,v 1.1 2008/01/28 17:59:29 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-0.0.20080123.74039.ebuild,v 1.1 2008/01/30 14:08:32 ikelos Exp $
 
 inherit pam eutils linux-mod autotools versionator
 
@@ -69,12 +69,6 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-kernel_stdint-soren.patch"
-}
-
 src_compile() {
 	econf \
 	$(use_with X x) \