Version bump and remove the broken masked version.

Package-Manager: portage-2.1.4

6 files changed, 28 insertions, 214 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/Manifest b/app-emulation/open-vm-tools/Manifest
index 2ad31900ece8..cf1503839221 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -5,10 +5,6 @@ AUX disable-toolbox.patch 4995 RMD160 dcce189c748f6e718d822a05f3fa96196cc9b7fd S
 MD5 022ffa4cf3d85c2faf8a60e672b6d5a8 files/disable-toolbox.patch 4995
 RMD160 dcce189c748f6e718d822a05f3fa96196cc9b7fd files/disable-toolbox.patch 4995
 SHA256 337bdc179a32495e12931daf2f9c5438cb0dd08ee1009feb905d7f84c3d8115b files/disable-toolbox.patch 4995
-AUX open-vm-tools-kernel_stdint-soren.patch 4814 RMD160 c20a40af007d0c879cb2fafe8ae89dc68b44a920 SHA1 0fb5ca0cbeba83d467a95ccd5405ace7dc5cec9a SHA256 0d13be458a9b6408d376776df920f54e8fbe683d167b303c1f39da16719cd510
-MD5 c2a0621983febe2da1b39ccb530abe0b files/open-vm-tools-kernel_stdint-soren.patch 4814
-RMD160 c20a40af007d0c879cb2fafe8ae89dc68b44a920 files/open-vm-tools-kernel_stdint-soren.patch 4814
-SHA256 0d13be458a9b6408d376776df920f54e8fbe683d167b303c1f39da16719cd510 files/open-vm-tools-kernel_stdint-soren.patch 4814
 AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c
 MD5 2570d31a242f40eae8f8f2517536dd5f files/open-vm.confd 88
 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 files/open-vm.confd 88
@@ -26,18 +22,19 @@ MD5 1fc0cea9b2ea2303cd2346843dc08803 files/xautostart.conf 59
 RMD160 ca1ea3f1b82caa6e97d94835d88a39a6f153ff7a files/xautostart.conf 59
 SHA256 13398e0ffcd7005bc8c92f3cd62865d2601e52fc980a4702fa252bef5c1efcc7 files/xautostart.conf 59
 DIST open-vm-tools-2007.11.21-64693.tar.gz 2295022 RMD160 e166040e713f4b7f8fae835862128a7ec3fdca75 SHA1 5b5e8edd726a997e3db0585af010a4be3405cc67 SHA256 b00530bf578b07127880ad3107b2b98873d3e5f74876dd94644bac3883be4431
-EBUILD open-vm-tools-0.0.20071121.64693-r1.ebuild 3531 RMD160 7ccc5fe7adf85e275a3c139032257ad75e067a0d SHA1 e29c6e52224c6fe26ac6a1bbee8bb4a51c4fb881 SHA256 3fd46d150fd0c674282aafe5993e318193ee05b0725c4c1773e8d3f320edbbc7
-MD5 47a0a207d2f20816cdbe12ccef718734 open-vm-tools-0.0.20071121.64693-r1.ebuild 3531
-RMD160 7ccc5fe7adf85e275a3c139032257ad75e067a0d open-vm-tools-0.0.20071121.64693-r1.ebuild 3531
-SHA256 3fd46d150fd0c674282aafe5993e318193ee05b0725c4c1773e8d3f320edbbc7 open-vm-tools-0.0.20071121.64693-r1.ebuild 3531
+DIST open-vm-tools-2008.01.23-74039.tar.gz 2332290 RMD160 b8a78e28abb63f50b5b9f49ad5ebaa727eee4619 SHA1 9d3fb1c2b71533a6d6ee67ee8bbf21edb26e9d59 SHA256 78754c0ab0cb39aad96d80bd1ade4ac2174c4067625d603e2a6afcce6359cace
 EBUILD open-vm-tools-0.0.20071121.64693.ebuild 4030 RMD160 922452bced72694b5021f8bcfdca71be5d1b6ff4 SHA1 c1081a3d6f35a1aafe0e52c1ffb6135a0304395d SHA256 e568a71ec3629a429c11731c2427e0dd9359b953c2171d892fbf896f0dbaf135
 MD5 25187a8e494ca5bb82b36eaf3f6c2e98 open-vm-tools-0.0.20071121.64693.ebuild 4030
 RMD160 922452bced72694b5021f8bcfdca71be5d1b6ff4 open-vm-tools-0.0.20071121.64693.ebuild 4030
 SHA256 e568a71ec3629a429c11731c2427e0dd9359b953c2171d892fbf896f0dbaf135 open-vm-tools-0.0.20071121.64693.ebuild 4030
-MISC ChangeLog 826 RMD160 0efa32d4613964f64e991665a2f17d7afc13f1f5 SHA1 744a907c80662290f3fc5942b27e65910e55c5ad SHA256 3dfaa9fea66fb4b52ac1c359f1088640aa5bc3444de0b824e791eed6f762dc49
-MD5 2ccbd7e2a11d0564d63bf2e11b71f564 ChangeLog 826
-RMD160 0efa32d4613964f64e991665a2f17d7afc13f1f5 ChangeLog 826
-SHA256 3dfaa9fea66fb4b52ac1c359f1088640aa5bc3444de0b824e791eed6f762dc49 ChangeLog 826
+EBUILD open-vm-tools-0.0.20080123.74039.ebuild 3430 RMD160 54b84960d1608beca7ed4ab0146e25113b363dc4 SHA1 2cf1bc68c981aaa2752ded827c8ba20591346fee SHA256 7b384eb393b5c38bed69cc2b5c06beeeadc0d384a14439b025d4fe1edd8b5a73
+MD5 b1859f5a74af2eba11f76fdd42abc02f open-vm-tools-0.0.20080123.74039.ebuild 3430
+RMD160 54b84960d1608beca7ed4ab0146e25113b363dc4 open-vm-tools-0.0.20080123.74039.ebuild 3430
+SHA256 7b384eb393b5c38bed69cc2b5c06beeeadc0d384a14439b025d4fe1edd8b5a73 open-vm-tools-0.0.20080123.74039.ebuild 3430
+MISC ChangeLog 1115 RMD160 e852c2a1184686f66726500678309e48909c7c9e SHA1 a73e914859acba48fc1a53d1c572ba900c08c1ff SHA256 5189ccdc17bcdbd40f0ee5c2c324a9f356f469a1e2445b2b97f46fe5ce90c1a4
+MD5 97306823cfd91958c43a22af86b30d6b ChangeLog 1115
+RMD160 e852c2a1184686f66726500678309e48909c7c9e ChangeLog 1115
+SHA256 5189ccdc17bcdbd40f0ee5c2c324a9f356f469a1e2445b2b97f46fe5ce90c1a4 ChangeLog 1115
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
@@ -45,13 +42,13 @@ SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 metadata
 MD5 98190eb2fb503544118ea873c5da3d6a files/digest-open-vm-tools-0.0.20071121.64693 295
 RMD160 1a5ef15378cf57e458f229751345db28f8c67442 files/digest-open-vm-tools-0.0.20071121.64693 295
 SHA256 f3e44909e659ccdedad3d828d823b688ab875d846989013a7490c4462bd041d1 files/digest-open-vm-tools-0.0.20071121.64693 295
-MD5 98190eb2fb503544118ea873c5da3d6a files/digest-open-vm-tools-0.0.20071121.64693-r1 295
-RMD160 1a5ef15378cf57e458f229751345db28f8c67442 files/digest-open-vm-tools-0.0.20071121.64693-r1 295
-SHA256 f3e44909e659ccdedad3d828d823b688ab875d846989013a7490c4462bd041d1 files/digest-open-vm-tools-0.0.20071121.64693-r1 295
+MD5 f60eb7c65c23caceeba16caf37b8a45e files/digest-open-vm-tools-0.0.20080123.74039 295
+RMD160 da0020ea1c536bc998c6e405f5de6ad39be964af files/digest-open-vm-tools-0.0.20080123.74039 295
+SHA256 e7e15f867d473c7e5737734c65e8e82d743de5dc76cb5fec89789d36112976f9 files/digest-open-vm-tools-0.0.20080123.74039 295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHnhgSu7rWomwgFXoRAhPnAJ469SVIc3moekCGIlPRcrUoHbcLugCeJv7Q
-ZM3cXfkRhQDu13Oo5zWzEa0=
-=iDxI
+iD8DBQFHoIULu7rWomwgFXoRAuQ2AKC0HtJmg8szbKv/ERdwfxbC1O/dtgCbBFtT
+iWND5GqLOGSk8zc6690cZKk=
+=CNOI
 -----END PGP SIGNATURE-----
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) \