3.5.0 version bump, mostly fixes consolidation from 3.4.0 branch

Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64

3 files changed, 93 insertions, 3 deletions

diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 6565b9b328e7..93490be361fd 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxclient
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.90 2010/12/22 09:47:27 voyageur Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.91 2011/05/22 14:02:18 voyageur Exp $
+
+*nxclient-3.5.0.6 (22 May 2011)
+
+  22 May 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +nxclient-3.5.0.6.ebuild:
+  3.5.0 version bump, mostly fixes consolidation from 3.4.0 branch
 
 *nxclient-3.4.0.7-r1 (22 Dec 2010)
 
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index 46a746c67a76..2f8687b9951f 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST nxclient-3.4.0-5.i386.tar.gz 4388189 RMD160 419f22ac81a2b7f3636cf663b8d538786f05997b SHA1 efa0d1bc53ac23541252a0bc31d66f4caf165a0e SHA256 1fb33b24e701a9b2b615c99d353872cfa3a84a6a4ec83c5e1858abcb5307b522
 DIST nxclient-3.4.0-5.x86_64.tar.gz 4575988 RMD160 aa1dc9cf0945cb0a39e33a14940827a9df0ac4f0 SHA1 50cbc6ac569da22a0045b4fdcbcbc12aaf8dc73d SHA256 23b8c75a7383ec750d02c4fd4bffca043d02d526340ad7f024764a80bde293e6
 DIST nxclient-3.4.0-7.i386.tar.gz 4384261 RMD160 d1a4eb34999ad952af413263ee3bca9ee890f91c SHA1 a9a1730b30ff0322532d7f437af658541b54ab3b SHA256 1b7355f54658dbce1e745323671f38f4149cbe5f269d062da11d92bdbfbae08a
 DIST nxclient-3.4.0-7.x86_64.tar.gz 4569907 RMD160 b07aeef6da63fbca0160baee093647d9ffe0c848 SHA1 decfa93cf8d33f45974b22e3d15f2000a29e9cbf SHA256 319378714e10c449dd3fed95a89058b734df2db0ec0f8b7194030cfc66540862
+DIST nxclient-3.5.0-6.i386.tar.gz 4389918 RMD160 0ceb8e9dd2dbeffa6c3e35a54a71f4c8e7196fa2 SHA1 931cea3619a30a77b2aa1c11ff451f729c4200d6 SHA256 1071ece3223003b75ebc87a9a552745326eccd96cc836f7f0554f3b4298a45b3
+DIST nxclient-3.5.0-6.x86_64.tar.gz 4576828 RMD160 d5049019cf422085e6e127e1c670d68346fee354 SHA1 846c42e0fba12d93b19e11c66572de4245fc1f1e SHA256 5692d5d39e4db9e536eaec3d47af9d13f6a08fb6124c9fcdb359ecde85a2e7a7
 EBUILD nxclient-3.4.0.5.ebuild 2050 RMD160 fe41daa12d3dc6a43c4e697e50afe5e81ae50426 SHA1 fb9942a49a2227e89628423ea11cf2d578a7b37b SHA256 14e028ce68c5ba746ada3d3d3db56d793dd7f9c21648e81470999e876bd3db75
 EBUILD nxclient-3.4.0.7-r1.ebuild 2093 RMD160 b105a89ef0592de342281ba6092c4eb78129a583 SHA1 d256c404e1e372cc5c5a7cdddb9ffa5712324e63 SHA256 c9d0d096f635f71f8723d6c4befd0232f6588734d603a48abe7eba3b64a05233
 EBUILD nxclient-3.4.0.7.ebuild 2052 RMD160 ea083df7170f2b1da9a0fe66ec9341d094cfb75d SHA1 7d2b3ada2bd3e75e344d1ec534c99b0b65e954de SHA256 cad9dc5a8514548c012ac5b835afdde8e219f9afbeea0fabb3a99471e7d43fa5
-MISC ChangeLog 14134 RMD160 d0dbe0f7f27bb7ddf727e1331fbaccf88be10d02 SHA1 29dbdc8a4e40c70cfe5fba82e310bd6b26cb2de4 SHA256 4a9a0b94343fe8103cc76c2b812dd47f2c687711680dc513ab63dc639f97cea8
+EBUILD nxclient-3.5.0.6.ebuild 2090 RMD160 5d766e238c3f8cea3a990573932a0aa1060e85aa SHA1 a33fa336102855873fc92befa6e03f0a4f79a62d SHA256 6e35ddaba5d26da75a129e4b4248cbd81f0e021688ca52699b9b3d6da0658fe9
+MISC ChangeLog 14318 RMD160 dadccda49d794bbadb8ca97a91e5aa79c7538fc4 SHA1 b2dce80ed0f0f9ee4c1d7bb4bf2ed8cdd16d6d45 SHA256 704fedfde4744e15de7f3bbe3c43e63e24ae987627c228c8a497c9d9073e9c73
 MISC metadata.xml 323 RMD160 5c60b28d4bc0e7d3120022994129867add0d1938 SHA1 0814e1fa95c7b410b0e40ec7221f45d75186d84e SHA256 3fbfa47bc46788bf3261c36eb8c18dbf19b695a3a4a3317d23ae3481f1caed63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk3ZF3kACgkQFYEBGcdFJfKbzAD+MhTTK/hbWuFAA/9Lq0+Wp7s5
+jX5Dbw6gqaR0JsL7dFkBAJre3oXGJpEjvZXoOp8o9qdjp9esBBFBjA8bFvNZ5yTf
+=eR33
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxclient/nxclient-3.5.0.6.ebuild b/net-misc/nxclient/nxclient-3.5.0.6.ebuild
new file mode 100644
index 000000000000..292640826414
--- /dev/null
+++ b/net-misc/nxclient/nxclient-3.5.0.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-3.5.0.6.ebuild,v 1.1 2011/05/22 14:02:18 voyageur Exp $
+
+EAPI=2
+inherit eutils versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="X11/VNC/NXServer client (remote desktops over low-bandwidth links)"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxclient-${FULL_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxclient-${FULL_PV}.i386.tar.gz )"
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cups"
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="dev-libs/expat
+	=dev-libs/openssl-0.9.8*
+	media-libs/audiofile
+	=media-libs/jpeg-6*
+	=media-libs/libpng-1.2*
+	media-libs/freetype
+	media-libs/fontconfig
+	cups? ( net-print/cups )
+	x11-libs/libXft
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXext
+	sys-libs/zlib"
+
+S=${WORKDIR}/NX
+
+src_install()
+{
+	# we install nxclient into /usr/NX, to make sure it doesn't clash
+	# with libraries installed for FreeNX
+	local binaries="nxclient nxesd nxkill nxservice nxssh"
+	use cups && binaries="$binaries nxprint"
+
+	for x in $binaries; do
+		into /usr/NX
+		dobin bin/$x
+		into /usr
+		make_wrapper $x ./$x /usr/NX/bin /usr/NX/lib || die
+	done
+
+	dodir /usr/NX/lib
+	cp -P lib/libXcompsh.so* lib/libXcomp.so* "${D}"/usr/NX/lib
+
+	dodir /usr/NX/share
+	cp -R share "${D}"/usr/NX
+
+	# Add icons/desktop entries (missing in the tarball)
+	cd share/icons
+	for size in *; do
+		dodir /usr/share/icons/hicolor/${size}/apps
+		for icon in admin desktop icon wizard; do
+			dosym /usr/NX/share/icons/${size}/nxclient-${icon}.png \
+				/usr/share/icons/hicolor/${size}/apps
+			done
+		done
+	make_desktop_entry "nxclient" "NX Client" nxclient-icon
+	make_desktop_entry "nxclient -admin" "NX Session Administrator" nxclient-admin
+	make_desktop_entry "nxclient -wizard" "NX Connection Wizard" nxclient-wizard
+}