New version of vmware-view-client. This also needs a 32bit version of libxkbfile, so an adjusted ebuild is needed (that uses 32bit xorg package support)

svn path=/trunk/overlay/; revision=161

5 files changed, 28 insertions, 8 deletions

diff --git a/app-emulation/vmware-view-client/Manifest b/app-emulation/vmware-view-client/Manifest
index efe566e..2fce6df 100644
--- a/app-emulation/vmware-view-client/Manifest
+++ b/app-emulation/vmware-view-client/Manifest
@@ -1,5 +1,5 @@
 AUX vmware-view-client-vmware.png 7213 SHA256 49bae736888697dd113857f635e8151e67a63eb392476770ce00747ba0795bd6 SHA512 715cf05152442609084e72cc1274578fd16b0ad05610534d72af02a97d3fb6aa3cb72bfc2986ef6e83bac8e72fedcf54d830ef16459f11e58d88c5b379fd65b1 WHIRLPOOL 982cdfc5eb94ebfab58ed8f8bc28052df01e1a043dc8dfe6e58260a6569cd04d2b633359f88d5d098be0c12ef5c708221b23855704ccb40fd042a2c80c6dbff2
-AUX vmware-view-client.desktop 223 SHA256 85076f797b1e05220a9b52ed67e56515c9bc2bbf264939f611bfc4a1dc080f97 SHA512 4f5262349c2830340e8770eb375638dcaa85bd6960b219c717b6d0b1f15e119133c43ffa57047fa6750e67249421b35e44422601e5ac2d53984dfeaf26d5d7ae WHIRLPOOL 13261ec9114fda34d2484a34e89debcf08f17f15ce8e41c80fed8065b095c19ebc7dd6891af8f8f1ebc5125ab8b1f5421bb0fdbb1e555714913b2590f75a5ef2
+AUX vmware-view-client.desktop 211 SHA256 95953bdb65948a497da852636c28ec10fce7da7bf7ee1b23867d55f3a945cae0 SHA512 a0b594fc2ae135bcc7aefabd0d5698dd81ef3db457ae734580499c0a273758cb42ba846d344ce3066e7573da4e70bbeb8813461d80d28e4a30a6c2593e37b0c2 WHIRLPOOL cac3e94fa606201fd2718360554ee1aa01d7346fe5795e70c9e4af10b5c1165abb986b72ddd68dd0506cc8b70b26a2e6935d9cdec472f5cc565df3228d4cd278
 AUX vmware-view.wrapper 102 SHA256 a502633eb4149ae1fa2a74032fc6bd7f197d348c8452f1a4d945470c91a4645f SHA512 322ac5fb6636cd047ca91fafa2d0cc514bd2f638f6121f55136adf9a2c89d54f07d846eddb806a47ae92b4edd5b8ceedb669b5797c20a72b53adfc60627d012e WHIRLPOOL 23a0098b3b19b090ccfe87f91e7849107695be5c173104ffa64d328b5ac9ae797c5e7fa74f40f95ec1896b69889ee7f0d17d1047b52c35ebb0005593c622c92b
-DIST vmware-view-client_2.1.0.orig.tar.gz 17442652 SHA256 111c1d753a42c3c0eb1829f7a1bcc4d654f23458830f4727883dc6516ef2bb12 SHA512 54a908b735b587431350688c5944ec3ff95b15de5d08e923f8fd5a94e3b551c8ba55dd735b66c2dd813886e0315a7cfad2ceab9dd73737426089a2cf2d264655 WHIRLPOOL 336b07477c14da4e81d5ae742168f011d61676ce37caf66bdd345209ae24b7c5ab309599d7438a7450c043eb02e84971c2be53a8e5de5920aefdab61f789a778
-EBUILD vmware-view-client-2.1.0.ebuild 2041 SHA256 727560c019c594d10e311f39d8d540d392290095e71f5228f7aab8cfb245a5b8 SHA512 0b200afc6410273cde0c9d24e67190710743fc9717817260b49333d9ea5739f0c99a6db44b3df9231b7d0460f944bce9677cf470033a1903ec1d1ec261b40a87 WHIRLPOOL 2afa622d1161294a052d4837e5e3ebeca2809f07f46d30560d1851ce65b196aebedd617342e5b38683cf0c32a398a9d6bb85426e8362ce3e4f8fb1a323b4c7e6
+DIST vmware-view-client_2.2.0.orig.tar.gz 12561204 SHA256 b011d4030b8227c3e39139905e6365b2ff9d32f8ed18a43f35b9c000b62a70c3 SHA512 040e219ce463cf1dae755166a72f8e327a29012d6d7f81ae81a491e9569bdaec38db1e7931b394201046ad4c6c3c46d33d3479772fdf9c704cfdd7bdf8791b41 WHIRLPOOL a2c7b9300a2705eae783762a330b50d3b5c1248b06559b44c459834c6f1ace067aad6d8217b66b95d00a1182dc3d46baa40e00055c45fcd795e98ef15306632f
+EBUILD vmware-view-client-2.2.0.ebuild 1978 SHA256 d175b417a208e14abedd9899af8dc6832b49d017033cbd7de4a23d46a0c621be SHA512 6731771eb4af8ca029c7f54331a3564b9e4909407b29d2193a7b714945f2cfa36e4c917d037b5da1fea34be8ff20bc2a910b87cfa5965b4e8ac8321681ee0c89 WHIRLPOOL c0d866d452e81b1c335bb7a71ae0f3768e52a75bfafe64a93d2189339143e78a44387fcdb41a4268fb032ab123c7ed0271673d6bac5e61f1b659c0f97fb5eeef
diff --git a/app-emulation/vmware-view-client/files/vmware-view-client.desktop b/app-emulation/vmware-view-client/files/vmware-view-client.desktop
index ca2826c..4e7fabd 100644
--- a/app-emulation/vmware-view-client/files/vmware-view-client.desktop
+++ b/app-emulation/vmware-view-client/files/vmware-view-client.desktop
@@ -3,6 +3,6 @@ Encoding=UTF-8
 Type=Application
 Icon=vmware-view-client-vmware
 Exec=vmware-view
-Categories=Application;Network;
+Categories=Network;
 Name=VMware View Client
 Comment=Deliver rich, personalized virtual desktops with VMware View 5
diff --git a/app-emulation/vmware-view-client/vmware-view-client-2.1.0.ebuild b/app-emulation/vmware-view-client/vmware-view-client-2.2.0.ebuild
index e7f5d14..2456ac4 100644
--- a/app-emulation/vmware-view-client/vmware-view-client-2.1.0.ebuild
+++ b/app-emulation/vmware-view-client/vmware-view-client-2.2.0.ebuild
@@ -29,9 +29,10 @@ KEYWORDS="~x86 ~amd64 -*"
 IUSE=""
 
 DEPEND="!app-emulation/vmware-view-open-client
-		|| ( >=net-misc/freerdp-1.0.2 net-misc/rdesktop )"
+		|| ( >=net-misc/freerdp-1.0.2 net-misc/rdesktop )
+		x11-libs/libxkbfile[abi_x86_32(-)]"
 
-RDEPEND=""
+RDEPEND="x11-libs/libxkbfile[abi_x86_32(-)]"
 
 RESTRICT="strip"
 
@@ -46,10 +47,9 @@ src_configure() {
 	fi
 	mkdir -p ${S}/usr/lib/vmware || die "Failure 2"
 	if use amd64; then
-		mv ${S}/usr/${LIB32}/vmware/vmware-* ${S}/usr/${LIB32}/vmware/xkeymap/ ${S}/usr/lib/vmware/ || die "Moving failed"
+		mv ${S}/usr/${LIB32}/vmware/xkeymap/ ${S}/usr/lib/vmware/ || die "Moving failed"
 	fi
 	mkdir -p ${S}/usr/libexec/vmware || die "Failure 4"
-	mv ${S}/usr/lib/vmware/vmware-view-usbd ${S}/usr/libexec/vmware/vmware-view-usb || die "Failure 5"
 	mv ${S}/usr/bin/vmware-view ${S}/usr/bin/vmware-view.bin || die "Failure 5"
 	cp ${FILESDIR}/vmware-view.wrapper ${S}/usr/bin/vmware-view || die "Failure 6"
 	chmod a+x ${S}/usr/bin/vmware-view || die "Failure 7"
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
new file mode 100644
index 0000000..c4bcf15
--- /dev/null
+++ b/x11-libs/libxkbfile/Manifest
@@ -0,0 +1,2 @@
+DIST libxkbfile-1.0.8.tar.bz2 335788 SHA256 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a SHA512 1d8766db2a15fe0a1f3775d38422eabd572ec8ba8417cde9f1ec95b0065e1acb6036fcf9a8e54f2e0517b358f9f3fe6f8b419554ec7688c24ec4072939c5e099 WHIRLPOOL f2a27fecabadffd8aa28434ab98254473191a6d5c211acbe8776287bec2306d3dca4137004db0ddea14a66910a2934030d9b6f67a08bd7d566ad79f7fb7a2202
+EBUILD libxkbfile-1.0.8-r1.ebuild 625 SHA256 016aaf9606ae71ef5264a6393d60dc3861a0e5929095d180565442c3f12afb3d SHA512 011a8ad0842dc96d6206fdd19d6e28d6e91cb413874b1bb949dbafab65812f2d6e3452f9d88e93562747229b041bc77a28698abf3889b4cfb424b78129004878 WHIRLPOOL 6cbc40874175c7ebe109750de76a2a367fb12d39c9ae257f57e4ae9fddb2f61556749b7597b0a30c21182db22afbeda4cc599cf779a3d3da532d636b4baa847d
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.8-r1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.8-r1.ebuild
new file mode 100644
index 0000000..00d8526
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.8-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild,v 1.10 2013/02/25 08:29:30 zmedico Exp $
+
+EAPI=4
+XORG_MULTILIB=yes
+
+inherit xorg-2
+
+
+DESCRIPTION="X.Org xkbfile library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-proto/kbproto"
+DEPEND="${RDEPEND}"