Add in vmware-workstation 5.5.9 and introduce 6.5.0 for bug 245941.

(Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo-r1 i686)
 (Signed Manifest commit)

4 files changed, 152 insertions, 4 deletions

diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index d56d0d090402..341f8b6ea060 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -13,6 +13,12 @@ AUX 5.5.8.108000/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025
 AUX 5.5.8.108000/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
 AUX 5.5.8.108000/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
 AUX 5.5.8.108000/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
+AUX 5.5.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
+AUX 5.5.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
+AUX 5.5.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
+AUX 5.5.9.126128/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
+AUX 5.5.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
+AUX 5.5.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX 6.0.4.93057/000_all_initd-location.patch 1133 RMD160 63a226ee89922fc7d1cc4de75e80ee0befb13bb2 SHA1 64d7d8e7218fa34e798ea1e9cdafe0085bbee0fa SHA256 f5a9aab71e5cd04292d0a37812505e08f0d7860399ab0dd35cccae9bfbb665be
 AUX 6.0.4.93057/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
 AUX 6.0.4.93057/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
@@ -27,13 +33,25 @@ AUX 6.0.5.109488/004_all_do-not-build-modules.patch 654 RMD160 dd279f8043ab99b03
 AUX 6.0.5.109488/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
 AUX 6.0.5.109488/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX 6.0.5.109488/011_all_legit-modules-only.patch 646 RMD160 484d15ebc05fb93d69866987cf805afdbba019c9 SHA1 f36a8b4b7153cfe213ee7cd1e82c871f3c9efa90 SHA256 b66a534d93ae7dc76b54631cbbaccc751691941ab704a9c1e566a9c866b15729
+AUX 6.5.0.118166/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
+AUX 6.5.0.118166/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
+AUX 6.5.0.118166/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
+AUX 6.5.0.118166/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
 AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e
+AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea
+AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78
+AUX helpers/vmware-config.sh 495 RMD160 abe3462c7b909d7280d6a7991b4cf34b4473a859 SHA1 43f7d5385b06617de4ad5bab0606fa2e6632e08c SHA256 f868a5df5485ad894ab948d8c574f77c0cec2676c67e6d9ecab12953447de44a
 AUX vmware-player.desktop 599 RMD160 a5a9897671da69c4706ba412d9a041edfd13a9b7 SHA1 12af70f7039b19838e298d1949df28b1b8d407a6 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54
+AUX vmware-workstation-6.5.0.118166-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
+AUX vmware-workstation-6.5.rc 1444 RMD160 8d3cb79bdcb48fb944615279e741146c36792bc2 SHA1 bd2784708b998c894dfdf661295b3e1708ce47fa SHA256 4636d8dbcb4f263d49769f7fb7c7f8945355f0bb2e858f4fd4aa96dff87d3dd1
 AUX vmware-workstation.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e
 AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782
 AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
+DIST VMware-Workstation-6.5.0-118166.i386.bundle 400427443 RMD160 88502c11a464900f53c20909d6926d37ac9d9e82 SHA1 9321eb0c353d33927e9b1f4305fb5eb959b6dec9 SHA256 b08481cae9808af3fa5815256e820e548b36a5a043a511ef2dae9833234ee32a
+DIST VMware-Workstation-6.5.0-118166.x86_64.bundle 366776834 RMD160 02d4e984a82738c6caa594f2434c3d0b743dbb4e SHA1 99067f8b2ed75a01580c7e22f08b8a1afac4068a SHA256 0bd04df2b70b0f5f3f06f34e458029593bd877e469d1a8063f3b6ff335cfa901
 DIST VMware-workstation-5.5.7-91707.tar.gz 111588946 RMD160 b785aa6f03fd8980df96130922da686a715033be SHA1 171bfbd391c8160daecbcc860186abd587808f71 SHA256 e024147ad6d4bc652d32f9f044046593edda4c727d1a494126250ae5fac60344
 DIST VMware-workstation-5.5.8-108000.tar.gz 111659310 RMD160 cd3dc50983772aac7c5eac0ca524f9842ccbcc2c SHA1 bade7eba751faa04417d3fa222e254fab4eaa3d8 SHA256 b2cdaa37e42153f8a2b94fe05a889992b94e4327ec2c2002988c6f909465edce
+DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a02821f8dd639a95b8c9ab38bc SHA1 eb8786111a74213ea4ec24636a4ba70b7f5dc741 SHA256 71a062e29480a48647c7323883e4e4b43a9365c1bb70000a23b768647db46444
 DIST VMware-workstation-6.0.4-93057.i386.tar.gz 218820759 RMD160 d3618e99925942b1c254c2c865cb5cd642bf0194 SHA1 f04b4f7afb550a5340f7c87aeb4ae1ab71dc39d6 SHA256 dcb818a9cf4e870983e0c302020151e7708ae449128203406b9c02a07cbbe74b
 DIST VMware-workstation-6.0.4-93057.x86_64.tar.gz 195472947 RMD160 ede570ce3ad92d0a3ca938efadc67e13fc158c21 SHA1 cdd31bbd590e952d698fa67f73ea45ec03971098 SHA256 746352d521925fc89b99c1ab1b4b14de6fa2d7fea91e217439f1f194947469f1
 DIST VMware-workstation-6.0.5-109488.i386.tar.gz 218827126 RMD160 3bbaf6c0d6ad63d8e95ba83381b3875c033fcd7b SHA1 6d24d25a6b15811e70a597628aafd8e1f1db5b85 SHA256 970bb72d7cc5114ca2c884f935381e4b9e419377993a2c3ac5ac09105da7232b
@@ -41,14 +59,16 @@ DIST VMware-workstation-6.0.5-109488.x86_64.tar.gz 195545057 RMD160 675002bc71a0
 DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
 EBUILD vmware-workstation-5.5.7.91707.ebuild 3244 RMD160 cd0c54dfaccc79dc46a42fae36b3068b880f8761 SHA1 42293e32af64ee56e1d9f8c2b51fbb68963de2d0 SHA256 270c3094a205e6439ef64c53ed20d2337554fa6fad3c0d1ba503023a69d932b2
 EBUILD vmware-workstation-5.5.8.108000.ebuild 3248 RMD160 93176eb64dd9698c229c8ddb9fd97186f38fbec9 SHA1 2928126a5cf5e17d3128a9fe3c2cb8d1c8647278 SHA256 af52d030ac7e98b13c8da0b15b619529d9f4cce259161c38f1dfd67a72f66af9
+EBUILD vmware-workstation-5.5.9.126128.ebuild 3248 RMD160 c9a7e65b13b84be7c64f2e024ebdb92b5ea6f60e SHA1 8ad70aaa64505e6bbf38fc0f3eaddbf300164a73 SHA256 b4c365ca6382b35e9ed8b00e3ad45ead66affbebd5f26e43716f7a09fab956fe
 EBUILD vmware-workstation-6.0.4.93057.ebuild 4046 RMD160 8460f1fc84cf736ad7a643dfd36824be53b53b59 SHA1 b2e865cde2b763641589b9c10e77b824b6971fe1 SHA256 161174ecc7612b56068317040cbcbdb211068193110fcb93e48c17b1cd8fb23e
 EBUILD vmware-workstation-6.0.5.109488.ebuild 4047 RMD160 ce8e8b274a98735b48ba49bbe02163de0cf2bf13 SHA1 01ee7a4b7a46f862c62f1e501741f21da0a66f5d SHA256 637a7a81960993e649e7255ede5b9ca0fc276827c670980d878400a386148031
-MISC ChangeLog 26512 RMD160 852a7ff1a4fa5d5dcb22ac17f03c716871d319b4 SHA1 7e18779c54644e7df25748740022d9c5d4686f07 SHA256 8d96adf395d3e1a08714b6540c8b99adf2d6fd30f5adf3f7616ded4139cac324
+EBUILD vmware-workstation-6.5.0.118166.ebuild 5148 RMD160 25798b19114edeb26e1b569c273b552df637228a SHA1 677c058f9f4f2d594f5ce417a3af75fac2e8fbd5 SHA256 dfb4a6751041c417cde08a606c161070f9c648a010892a3cf684b75ac94e3d8f
+MISC ChangeLog 27538 RMD160 9e3b946bed4f9a5d47b84b4eecc33e3fee48c269 SHA1 e6163ea7dbc3890c5a2146cc1dd9e03188f3b494 SHA256 03bd01e651ec591658c9fc471ca8067c561d218fc85864ada5e1970dc8b29020
 MISC metadata.xml 339 RMD160 9f4931e525280fd376eb7ac3e42c369acd23a33e SHA1 3948dcc9a9b7dc585f1783e0419b313084a231c0 SHA256 bb60a871a58964feaa59ec824a5d511455054461f0394a57a8c9ca019a0f4593
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjiV34ACgkQu7rWomwgFXpfDQCfTDachui7a1GKR7C1hBVNK+hc
-wxoAnR6dvDNAS9I7HB/AIjard8gHG3DF
-=4FpG
+iEYEARECAAYFAkkXTrAACgkQu7rWomwgFXphgQCdEBtLXXVsUerx/SzXATAxlDlF
+61MAn34KzsbXLfvfnl0uAWOBdqwYhHK0
+=DfyC
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/files/helpers/module_patcher.sh b/app-emulation/vmware-workstation/files/helpers/module_patcher.sh
new file mode 100755
index 000000000000..03c490a73959
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/helpers/module_patcher.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+MY_BASE=$(basename $1)
+if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
+then
+	echo -n "Module Patcher: "
+	patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
+fi
diff --git a/app-emulation/vmware-workstation/files/helpers/unbundler.sh b/app-emulation/vmware-workstation/files/helpers/unbundler.sh
new file mode 100755
index 000000000000..b19b587c2af5
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/helpers/unbundler.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+ORIGFILE="$1"
+
+is_relative() {
+    local path="$1"
+    shift
+
+    [ "${path:0:1}" != "/" ]
+    return
+}
+
+set_offsets() {
+	# This won't work with non-GNU stat.
+	FILE_SIZE=`stat -L --format "%s" "$1"`
+	local offset=$(($FILE_SIZE - 4))
+	
+	MAGIC_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	CHECKSUM_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	VERSION_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PREPAYLOAD_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PREPAYLOAD_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	LAUNCHER_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PAYLOAD_OFFSET=$offset
+	offset=$(($offset - 4))
+	
+	PAYLOAD_SIZE_OFFSET=$offset
+	offset=$(($offset - 4))
+}
+
+set_lengths() {
+   local file="$1"
+   if [ ! -s "$file" ]; then
+      echo "$file does not exist"
+      exit 1
+   fi
+
+   # XXX: put extraction in its own function
+   MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
+
+   if [ "$MAGIC_NUMBER" != "907380241" ]; then
+      echo "magic number does not match"
+      exit 1
+   fi
+
+   LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
+   PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
+   PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
+
+   SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
+
+   return 0
+}
+
+if is_relative "${ORIGFILE}"; then
+	ORIGFILE="`pwd`/${ORIGFILE}"
+fi
+
+
+set_offsets ${ORIGFILE}
+set_lengths ${ORIGFILE}
+
+echo "Unbundling" ${ORIGFILE}
+
+PREPAYLOAD="prepayload"
+PAYLOAD="payload"
+
+# Unpack the pre-payload file
+mkdir ${PREPAYLOAD}
+cd ${PREPAYLOAD}
+dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
+cd ..
+
+# Unpack the main file
+mkdir ${PAYLOAD}
+cd ${PAYLOAD}
+dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
+cd ..
+
diff --git a/app-emulation/vmware-workstation/files/helpers/vmware-config.sh b/app-emulation/vmware-workstation/files/helpers/vmware-config.sh
new file mode 100755
index 000000000000..d97a542d5ec1
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/helpers/vmware-config.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+CONFIG_FILE="${D}/etc/vmware/config"
+
+remove_key() {
+  local key=${1}
+  grep -v "${key} =" ${CONFIG_FILE}
+  grep -v "${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
+  mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
+}
+
+add_key() {
+  local key=${1}
+  local value=${2}
+  echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
+}
+
+mkdir -p $(dirname ${CONFIG_FILE})
+touch ${CONFIG_FILE}
+
+if [ "${1}" == "-s" ]; then
+  remove_key ${2}
+  add_key ${2} ${3/${D}/}
+fi
+
+if [ "${1}" == "-d" ]; then
+  remove_key ${2}
+fi
+