Version bump, update dependencies in 3.0.0 ebuilds

(Portage version: 2.1.4_rc9)

5 files changed, 127 insertions, 5 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index 5be9380d8050..081254981cca 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.18 2007/12/03 21:48:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.19 2007/12/14 12:11:41 voyageur Exp $
+
+*nxnode-3.1.0 (14 Dec 2007)
+
+  14 Dec 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  nxnode-3.0.0-r3.ebuild, nxnode-3.0.0-r4.ebuild, +nxnode-3.1.0.ebuild:
+  Version bump, update dependencies in 3.0.0 ebuilds
 
 *nxnode-3.0.0-r4 (03 Dec 2007)
 
diff --git a/net-misc/nxnode/files/digest-nxnode-3.1.0 b/net-misc/nxnode/files/digest-nxnode-3.1.0
new file mode 100644
index 000000000000..b78d296af5d0
--- /dev/null
+++ b/net-misc/nxnode/files/digest-nxnode-3.1.0
@@ -0,0 +1,6 @@
+MD5 ceda9e41b3a62fb964929fccbb159b8e nxnode-3.1.0-3.i386.tar.gz 6281225
+RMD160 539fd4119ac9fb6575cd3aebe50defe9b966c62f nxnode-3.1.0-3.i386.tar.gz 6281225
+SHA256 cc87a7c2cf01b11300d0082ef2905c496055e959956dd8f610b41c7667fae708 nxnode-3.1.0-3.i386.tar.gz 6281225
+MD5 ea3da35852b8cbdb2f75fcc3dc88a2ec nxnode-3.1.0-3.x86_64.tar.gz 6960343
+RMD160 ab597de8862cb47ad8b808ae9d621d9b17c69a57 nxnode-3.1.0-3.x86_64.tar.gz 6960343
+SHA256 d2dad0c64583e85a8ee3d0b9f8e5a24d2afc220a8fc249815b59f211d015097b nxnode-3.1.0-3.x86_64.tar.gz 6960343
diff --git a/net-misc/nxnode/nxnode-3.0.0-r3.ebuild b/net-misc/nxnode/nxnode-3.0.0-r3.ebuild
index a61095ed924b..6413adee95e4 100644
--- a/net-misc/nxnode/nxnode-3.0.0-r3.ebuild
+++ b/net-misc/nxnode/nxnode-3.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.0.0-r3.ebuild,v 1.3 2007/09/20 14:51:02 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.0.0-r3.ebuild,v 1.4 2007/12/14 12:11:41 voyageur Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ RESTRICT="strip"
 DEPEND="!net-misc/nxserver-freenx
 	!<net-misc/nxserver-freeedition-3.0.0"
 
-RDEPEND="=net-misc/nxclient-3*
+RDEPEND="=net-misc/nxclient-3.0*
 	x11-libs/libICE
 	x11-libs/libXmu
 	x11-libs/libSM
diff --git a/net-misc/nxnode/nxnode-3.0.0-r4.ebuild b/net-misc/nxnode/nxnode-3.0.0-r4.ebuild
index 53913e8b126f..e4c7dea4154c 100644
--- a/net-misc/nxnode/nxnode-3.0.0-r4.ebuild
+++ b/net-misc/nxnode/nxnode-3.0.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.0.0-r4.ebuild,v 1.1 2007/12/03 21:48:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.0.0-r4.ebuild,v 1.2 2007/12/14 12:11:41 voyageur Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ RESTRICT="strip"
 DEPEND="!net-misc/nxserver-freenx
 	!<net-misc/nxserver-freeedition-3.0.0"
 
-RDEPEND="=net-misc/nxclient-3*
+RDEPEND="=net-misc/nxclient-3.0*
 	x11-libs/libICE
 	x11-libs/libXmu
 	x11-libs/libSM
diff --git a/net-misc/nxnode/nxnode-3.1.0.ebuild b/net-misc/nxnode/nxnode-3.1.0.ebuild
new file mode 100644
index 000000000000..e63f68546140
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.1.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.1.0.ebuild,v 1.1 2007/12/14 12:11:41 voyageur Exp $
+
+inherit eutils
+
+MY_PV="${PV}-3"
+DESCRIPTION="nxnode provides the components that are shared between the different editions of NoMachine's NX Server"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${PV}/Linux/nxnode-${MY_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${PV}/Linux/nxnode-${MY_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="strip"
+
+DEPEND="!net-misc/nxserver-freenx
+	!<net-misc/nxserver-freeedition-3.0.0"
+
+RDEPEND="=net-misc/nxclient-3.1*
+	x11-libs/libICE
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXpm
+	x11-apps/xrdb
+	rdesktop? ( net-misc/rdesktop )
+	vnc? ( || ( net-misc/vnc net-misc/tightvnc ) )"
+
+S=${WORKDIR}/NX
+
+pkg_setup() {
+	if use vnc; then
+		if has_version net-misc/vnc && ! built_with_use net-misc/vnc server;
+		then
+			die "net-misc/vnc needs to be built with USE=\"server\" for VNC support"
+		fi
+
+		if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server;
+		then
+			die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support"
+		fi
+	fi
+}
+
+src_unpack()
+{
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/nxnode-3.0.0-setup.patch
+}
+
+src_install()
+{
+	# we install nxnode into /usr/NX, to make sure it doesn't clash
+	# with libraries installed for FreeNX
+
+	into /usr/NX
+	for x in nxagent nxnode nxsensor nxspool nxuexec ; do
+		dobin bin/$x
+	done
+
+	dodir /usr/NX/etc
+	cp etc/node-debian.cfg.sample "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+	sed -e 's|COMMAND_FUSER = .*|COMMAND_FUSER = "/usr/bin/fuser"|;' -i "${D}"/usr/NX/etc/node-gentoo.cfg.sample || die
+	cp etc/node.lic.sample "${D}"/usr/NX/etc/node.lic.sample || die
+
+	dodir /usr/NX/lib
+	cp -R lib "${D}"/usr/NX || die
+
+	dodir /usr/NX/scripts
+	cp -R scripts "${D}"/usr/NX || die
+
+	dodir /usr/NX/share
+	cp -R share "${D}"/usr/NX || die
+
+	dodir /usr/NX/var
+	cp -R var "${D}"/usr/NX || die
+
+	dodir /etc/init.d
+	newinitd "${FILESDIR}"/nxnode-3.0.0-init nxsensor
+}
+
+pkg_postinst()
+{
+	# Only install license file if none is found
+	if [ ! -f /usr/NX/etc/node.lic ]; then
+		cp "${ROOT}"/usr/NX/etc/node.lic.sample "${ROOT}"/usr/NX/etc/node.lic || die
+		chmod 0400 "${ROOT}"/usr/NX/etc/node.lic
+		chown nx:root "${ROOT}"/usr/NX/etc/node.lic
+	fi
+
+	# only run install on the first time
+	if [ -f /usr/NX/etc/node.cfg ]; then
+		einfo "Running NoMachine's update script"
+		"${ROOT}"/usr/NX/scripts/setup/nxnode --update
+	else
+		einfo "Running NoMachine's setup script"
+		"${ROOT}"/usr/NX/scripts/setup/nxnode --install
+	fi
+
+	elog "If you want server statistics, please add nxsensor to your default runlevel"
+	elog
+	elog "  rc-update add nxsensor default"
+	elog
+	elog "You will also need to change EnableSensor to 1 in /usr/NX/etc/node.cfg"
+}