Version bump, thanks to Timo Gurr <psy@monsterserver.de> in bug #182779

(Portage version: 2.1.3_rc4)

4 files changed, 161 insertions, 1 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index d77185340174..b69fb3476ed9 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.5 2007/05/27 17:10:51 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.6 2007/06/21 20:19:37 voyageur Exp $
+
+*nxnode-3.0.0 (21 Jun 2007)
+
+  21 Jun 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxnode-3.0.0-setup.patch, +nxnode-3.0.0.ebuild:
+  Version bump, thanks to Timo Gurr <psy@monsterserver.de> in bug #182779
 
   27 May 2007; Bernard Cafarelli <voyageur@gentoo.org> nxnode-2.1.0.ebuild:
   Dropped glib-1.2 dependency
diff --git a/net-misc/nxnode/files/digest-nxnode-3.0.0 b/net-misc/nxnode/files/digest-nxnode-3.0.0
new file mode 100644
index 000000000000..eef65226b361
--- /dev/null
+++ b/net-misc/nxnode/files/digest-nxnode-3.0.0
@@ -0,0 +1,6 @@
+MD5 9d5a0837fb774b9445b51180f8684a4d nxnode-3.0.0-70.i386.tar.gz 6229996
+RMD160 a0b3b7ccf65e7dbd118385876c3f2d088c4b0682 nxnode-3.0.0-70.i386.tar.gz 6229996
+SHA256 8c4b68df24907a3d00723d5eb8cb102d10eb8173d17c7e73ad7a95479f8b34d2 nxnode-3.0.0-70.i386.tar.gz 6229996
+MD5 016d6925be4623b1c68616c687fc19f3 nxnode-3.0.0-70.x86_64.tar.gz 6906520
+RMD160 68b17972c09d4d5b51b181116dd2546710482215 nxnode-3.0.0-70.x86_64.tar.gz 6906520
+SHA256 000ae1d6d6e6fb2bd8b73ef8fd1c869a3e02daa25ba3865304b94fc78927c618 nxnode-3.0.0-70.x86_64.tar.gz 6906520
diff --git a/net-misc/nxnode/files/nxnode-3.0.0-setup.patch b/net-misc/nxnode/files/nxnode-3.0.0-setup.patch
new file mode 100644
index 000000000000..c2c7be0231e0
--- /dev/null
+++ b/net-misc/nxnode/files/nxnode-3.0.0-setup.patch
@@ -0,0 +1,43 @@
+--- scripts/setup/nxnode.orig	2007-06-20 18:30:42.000000000 +0200
++++ scripts/setup/nxnode	2007-06-21 11:58:42.604968067 +0200
+@@ -1236,6 +1236,10 @@
+       runCommand "$RMCOMMAND -f /etc/rc0.d/K01nxsensor" "Unable to remove '/etc/rc0.d/K01nxsensor'" "warn"
+       fi
+ 
++  elif [ "$system" = "gentoo" ]; then
++    # do nothing; this is handled by Gentoo ebuild
++    echo > /dev/null
++
+   else
+       if [ -h /etc/rc.d/rc3.d/S99nxsensor ];
+       then
+@@ -1280,6 +1284,10 @@
+ 
+ addNXinit () {
+ 
++ if [ "$system" = "gentoo" ] ; then
++   return;
++ fi
++
+  runCommand "cat $NODE_ROOT/scripts/init/nxsensor > /etc/init.d/nxsensor" "Unable to create: '/etc/init.d/nxsensor'" "warn"
+  runCommand "chmod +x /etc/init.d/nxsensor" "Cannot set permissions of '/etc/init.d/nxsensor' file" "warn"
+ 
+@@ -2222,6 +2230,10 @@
+   system=fedora
+ fi
+ 
++if [ -d /usr/portage ]; then
++  system=gentoo
++fi
++
+ if [ "x$system" = "x" -a -f /etc/release ];
+ then
+   system=solaris
+@@ -2256,6 +2268,7 @@
+     "fedora"             ) ;;
+     "debian"             ) ;;
+     "solaris"             ) ;;
++    "gentoo"            );;
+     ""                 ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unable to autodetect the operating system type, please specify it" ;;
+     *                  ) ARGS=-1 && errMsg="$PREFIX $ERROR ERROR: Unsupported operating system '$system'" ;;
+   esac
diff --git a/net-misc/nxnode/nxnode-3.0.0.ebuild b/net-misc/nxnode/nxnode-3.0.0.ebuild
new file mode 100644
index 000000000000..c142ec3f7ecb
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.0.0.ebuild
@@ -0,0 +1,105 @@
+# 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.ebuild,v 1.1 2007/06/21 20:19:37 voyageur Exp $
+
+inherit eutils
+
+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/3.0.0/Linux/nxnode-${PV}-70.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/3.0.0/Linux/nxnode-${PV}-70.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="nostrip"
+
+DEPEND="!net-misc/nxserver-freenx
+	!<net-misc/nxserver-freeedition-3.0.0"
+
+RDEPEND="=net-misc/nxclient-3*
+	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 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/vnc needs to be built with USE=\"server\" for VNC support"
+	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-2.1.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 ENABLE_SENSOR to 1 in /usr/NX/etc/node.cfg"
+}