Sync from overlay

(Portage version: 2.0.54)

4 files changed, 102 insertions, 27 deletions

diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 94231b1013b5..cf13e429a858 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/nxclient
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.27 2006/03/21 20:37:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.28 2006/04/30 17:35:16 stuart Exp $
+
+*nxclient-1.5.0-r4 (30 Apr 2006)
+
+  30 Apr 2006; Stuart Herbert <stuart@gentoo.org> +nxclient-1.5.0-r4.ebuild:
+  Huge thanks to Jon Scruggs for these changes:
+  
+  * Added nxesd dependency.
+  * Added more amd64 depends. (Thanks to Jon Severinsson)
+  * Cleaned up the x86 depends
+  * Fixed comments regarding nxesd
+  * Added xft use flag to allow the installation of the xft version of the
+  client.
 
   21 Mar 2006; Aron Griffis <agriffis@gentoo.org> nxclient-1.4.0-r5.ebuild,
   -nxclient-1.5.0.ebuild, -nxclient-1.5.0-r1.ebuild,
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index eab9a732dd44..f6e0bdc48a12 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -1,34 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2cd1fcff81beb7379e677b5c095e4a29 ChangeLog 4334
-RMD160 a2a61716517fc615a65cdf4b27649f107feb641b ChangeLog 4334
-SHA256 db203a0a5750936fca53cc1a74dda405542f970f1e14ecb95e8706999dcec3c8 ChangeLog 4334
 MD5 a2e15c37686ddad8dd3854b2b9b70700 files/1.3.0/50nxclient 57
-RMD160 a0e6eb6022859da08876263d60ab80ebfa58525a files/1.3.0/50nxclient 57
-SHA256 ebf64a790519261542ca7210f17a3b0f668ce79f5486cdd515ba499560410c02 files/1.3.0/50nxclient 57
 MD5 f44884663100850b12e1fdb12b55645b files/1.5.0/50nxclient 38
-RMD160 6d29978719f6b46dfa07f9ebcc8c04c9c5a48fbf files/1.5.0/50nxclient 38
-SHA256 e90d501d1600a5cd811e6da1a2a1ffdecaa4dfbeb58df3352313ac1100bc9f28 files/1.5.0/50nxclient 38
 MD5 6532e2cbed5e3c88e36520dc46b1be4b files/digest-nxclient-1.4.0-r5 71
-RMD160 9d61e0a9112df802ea66f7a48f2148c17b42cec7 files/digest-nxclient-1.4.0-r5 71
-SHA256 81db6b132b8d9207677faa33916c8afa3be3eebc23b8bd40eb26fb6b6240f2b0 files/digest-nxclient-1.4.0-r5 71
 MD5 142a71ee05218b6014d4d8872bc9cd7e files/digest-nxclient-1.5.0-r2 73
-RMD160 54c1c36eada0e5b52d6b7a195e201150272af928 files/digest-nxclient-1.5.0-r2 73
-SHA256 6102246c13cd6e58ddc17a005f40f54159d067d651101635f2734d9b62a1f1b9 files/digest-nxclient-1.5.0-r2 73
+MD5 1c18975ce0c3b75b08def80ec4846342 files/digest-nxclient-1.5.0-r4 150
 MD5 c1c67a77261d3b3fede94b41a9d0ce1e metadata.xml 455
-RMD160 4be2c66d765fbe16df201f981c76f0c10265b921 metadata.xml 455
-SHA256 f1b98d76aa41c8483716a7ec1b48a7c70a943edfc07ae39bac23d95bd5ce27cd metadata.xml 455
 MD5 50aec3b613c8f24cd291f2a645bd089e nxclient-1.4.0-r5.ebuild 1702
-RMD160 a3941b63fbb8254e2c302ddd2fbfac4c527813fe nxclient-1.4.0-r5.ebuild 1702
-SHA256 7ac7ef17c202055b38bd3e1287b65b64a9c81d54190bf9a633fcb49b41236d07 nxclient-1.4.0-r5.ebuild 1702
 MD5 f0e6e7745483a6c3cbcb373819f84258 nxclient-1.5.0-r2.ebuild 2336
-RMD160 46d7680de235f3e534f94fbacdaac7ff73e3e65f nxclient-1.5.0-r2.ebuild 2336
-SHA256 a6300f437f542d002078eeec0aeada6ac44dcc2c43d1ebbd4fb7f2f3ae64206f nxclient-1.5.0-r2.ebuild 2336
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEIGP7JrHF4yAQTrARAgKoAKDKV28oy/u9qHpb6H9hfleHPtEZDwCgsDuL
-OQutfnxeNlz7+If/rDv3kHE=
-=fIjZ
------END PGP SIGNATURE-----
+MD5 ce4a535514be1de3cef3301f9257c8cc nxclient-1.5.0-r4.ebuild 2348
diff --git a/net-misc/nxclient/files/digest-nxclient-1.5.0-r4 b/net-misc/nxclient/files/digest-nxclient-1.5.0-r4
new file mode 100644
index 000000000000..84c4f91cbe0a
--- /dev/null
+++ b/net-misc/nxclient/files/digest-nxclient-1.5.0-r4
@@ -0,0 +1,2 @@
+MD5 5eacad0dee7dc8ead5aef52cb3024ff5 nxclient-1.5.0-141.i386.rpm 3315783
+MD5 8169192dd74019fcd84da186358ba088 nxclient-xft-1.5.0-141.i386.rpm 3362203
diff --git a/net-misc/nxclient/nxclient-1.5.0-r4.ebuild b/net-misc/nxclient/nxclient-1.5.0-r4.ebuild
new file mode 100644
index 000000000000..cac364c3369b
--- /dev/null
+++ b/net-misc/nxclient/nxclient-1.5.0-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.5.0-r4.ebuild,v 1.1 2006/04/30 17:35:16 stuart Exp $
+
+inherit rpm
+
+DESCRIPTION="NXClient is a X11/VNC/NXServer client especially tuned for using remote desktops over low-bandwidth links such as the Internet"
+HOMEPAGE="http://www.nomachine.com"
+
+IUSE="xft"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 -mips -ppc -sparc ~x86"
+RESTRICT="nostrip"
+
+SRC_URI="!xft? ( http://web04.nomachine.com/download/1.5.0/client/${P}-141.i386.rpm )
+	xft? ( http://svn.gnqs.org/svn/gentoo-nx-overlay/downloads/${PN}-xft-${PV}-141.i386.rpm )"
+
+DEPEND="
+	|| ( ~net-misc/nxssh-1.5.0
+	     ~net-misc/nxserver-personal-1.5.0
+	     ~net-misc/nxserver-business-1.5.0
+	     ~net-misc/nxserver-enterprise-1.5.0 )
+	~net-misc/nxesd-1.5.0
+	net-analyzer/gnu-netcat
+	amd64? (
+		app-emulation/emul-linux-x86-compat
+		>=app-emulation/emul-linux-x86-baselibs-2.1.4
+		>=app-emulation/emul-linux-x86-xlibs-2.2.1
+		>=app-emulation/emul-linux-x86-qtlibs-2.1.1
+	)
+	x86? (
+		>=dev-libs/expat-1.95.7
+		>=media-libs/fontconfig-2.2.2
+		>=media-libs/freetype-2.1.9
+		>=x11-libs/qt-3.3.4
+		sys-libs/lib-compat
+	)"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	if use xft ; then
+		debian_src_unpack
+	else
+		rpm_src_unpack
+	fi
+}
+
+src_install() {
+	cp -dPR usr ${D}
+
+	# All of the libraries delivered by nxclient are available in our deps.
+	# Additionally a couple of the binaries are better installed as deps.
+	# Remove those now...
+
+	# delivered by net-misc/nxcomp
+	rm -f ${D}/usr/NX/lib/libXcomp.so*
+
+	# delivered by net-misc/nxesd
+	rm -f ${D}/usr/NX/bin/nxesd
+
+	# delivered by net-misc/nxssh
+	rm -f ${D}/usr/NX/bin/nxssh
+
+	# delivered by other deps (emul-linux-x86-baselibs on amd64)
+	rm -f ${D}/usr/NX/lib/lib{crypto,jpeg,png,z}*
+
+	# make sure there are no libs left (this is to catch problems when this
+	# package is updated)
+	rmdir ${D}/usr/NX/lib || die "leftover libraries in ${D}/usr/NX/lib"
+
+	# FIXME: Of the options in the applnk directory, the desktop files in the
+	# "network" directory seem to make the most sense.  I have no idea if this
+	# works for KDE or just for Gnome.
+	declare applnk=/usr/NX/share/applnk apps=/usr/share/applications
+	if [[ -d ${D}${applnk} ]]; then
+		dodir ${apps}
+		mv ${D}${applnk}/network/*.desktop ${D}${apps}
+		rm ${D}${apps}/nxclient-help.desktop
+		rm -rf ${D}${applnk}
+	fi
+}