Switch to using rpm for both x86 and amd64; this has the advantage of

providing desktop files to install in /usr/share/applications.
(Portage version: 2.1_pre3-r1)

4 files changed, 92 insertions, 12 deletions

diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index a55ab58cc8fd..784029a97a44 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxclient
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.24 2005/12/15 17:20:04 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.25 2006/01/11 23:52:20 agriffis Exp $
+
+*nxclient-1.5.0-r2 (11 Jan 2006)
+
+  11 Jan 2006; Aron Griffis <agriffis@gentoo.org> +nxclient-1.5.0-r2.ebuild:
+  Switch to using rpm for both x86 and amd64; this has the advantage of
+  providing desktop files to install in /usr/share/applications.
 
 *nxclient-1.5.0-r1 (15 Dec 2005)
 
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index 1aa024a47c53..a1cb772f4727 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 97c74c23b051ad5d362515792dec030d ChangeLog 3753
 MD5 a2e15c37686ddad8dd3854b2b9b70700 files/1.3.0/50nxclient 57
 MD5 f44884663100850b12e1fdb12b55645b files/1.5.0/50nxclient 38
 MD5 6532e2cbed5e3c88e36520dc46b1be4b files/digest-nxclient-1.4.0-r5 71
 MD5 f88ec7c11f1f61ad0c0c390e5325e8d5 files/digest-nxclient-1.5.0 149
 MD5 3b564ade1d67ddea768e937fa379c857 files/digest-nxclient-1.5.0-r1 149
+MD5 142a71ee05218b6014d4d8872bc9cd7e files/digest-nxclient-1.5.0-r2 73
 MD5 c1c67a77261d3b3fede94b41a9d0ce1e metadata.xml 455
 MD5 4429f22294184b7381a98271588fc29b nxclient-1.4.0-r5.ebuild 1648
 MD5 79c0f4b4ba001e5eb9d0f7dc41ad5085 nxclient-1.5.0-r1.ebuild 2195
+MD5 b2fae6372eb86b9294e36f1343b5817d nxclient-1.5.0-r2.ebuild 2221
 MD5 ceb7fb63bb0069577d0bf90e30241ab1 nxclient-1.5.0.ebuild 2192
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDoaXoJrHF4yAQTrARAirGAJ4pccJsE6p+qha9a2rIs54SyGJWggCgy9Ui
-iylQw0JNLfKuxD3CL9CT9T8=
-=RWS1
------END PGP SIGNATURE-----
diff --git a/net-misc/nxclient/files/digest-nxclient-1.5.0-r2 b/net-misc/nxclient/files/digest-nxclient-1.5.0-r2
new file mode 100644
index 000000000000..10e28d39e175
--- /dev/null
+++ b/net-misc/nxclient/files/digest-nxclient-1.5.0-r2
@@ -0,0 +1 @@
+MD5 4f8e68873438f79e8f4f31f41ba2a824 nxclient-1.5.0-135.i386.rpm 3334053
diff --git a/net-misc/nxclient/nxclient-1.5.0-r2.ebuild b/net-misc/nxclient/nxclient-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..981112292108
--- /dev/null
+++ b/net-misc/nxclient/nxclient-1.5.0-r2.ebuild
@@ -0,0 +1,81 @@
+# 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-r2.ebuild,v 1.1 2006/01/11 23:52:20 agriffis 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=""
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 -mips -ppc -sparc ~x86"
+RESTRICT="nostrip"
+
+SRC_URI="http://web04.nomachine.com/download/1.5.0/client/$P-135.i386.rpm"
+
+DEPEND="
+	=net-misc/nxssh-1.5*
+	net-analyzer/gnu-netcat
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-2.1.4
+	)
+	x86? (
+		media-libs/jpeg
+		sys-libs/glibc
+		sys-libs/zlib
+		virtual/x11
+		dev-libs/expat
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/jpeg
+		x11-libs/qt
+	)"
+
+S=${WORKDIR}
+
+src_install() {
+	# rpm has usr/NX/; tarball has only NX/
+	if [[ ! -d usr ]]; then
+		mkdir usr
+		mv NX usr || die
+	fi
+
+	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/nx-x11 (at some point)
+	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
+
+	# Install env.d snippet to add /usr/NX/bin to the PATH
+	insinto /etc/env.d
+	doins ${FILESDIR}/1.5.0/50nxclient
+}