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

(Portage version: 2.1.3_rc4)

4 files changed, 170 insertions, 1 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index 1e10101ddd6e..7f72a94c2eae 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxserver-freeedition
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.6 2007/06/11 11:55:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.7 2007/06/21 20:21:30 voyageur Exp $
+
+*nxserver-freeedition-3.0.0 (21 Jun 2007)
+
+  21 Jun 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-3.0.0-setup.patch, +nxserver-freeedition-3.0.0.ebuild:
+  Version bump, thanks to Timo Gurr <psy@monsterserver.de> in bug #182779
 
   11 Jun 2007; Bernard Cafarelli <voyageur@gentoo.org>
   nxserver-freeedition-2.1.0.ebuild:
diff --git a/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0 b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0
new file mode 100644
index 000000000000..5f4e00694ca6
--- /dev/null
+++ b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0
@@ -0,0 +1,6 @@
+MD5 8c5d93aa186d9b68aee4dcbb3fe2e309 nxserver-3.0.0-60.i386.tar.gz 6658532
+RMD160 d9a0b02c6cb04c40bff90927658cec5a7d6aeb4e nxserver-3.0.0-60.i386.tar.gz 6658532
+SHA256 aa1bd7242ecbe752088f8fa8ddf96ba0b3cc1ab8525beb0a6be5678cbcf97ea4 nxserver-3.0.0-60.i386.tar.gz 6658532
+MD5 850ff36f504ec945b295842d4ec96032 nxserver-3.0.0-60.x86_64.tar.gz 7701235
+RMD160 d9c9fb15430ca4c0410f440de908c4905ba62fd8 nxserver-3.0.0-60.x86_64.tar.gz 7701235
+SHA256 4c27e17149398154abff0a0bfa9ea9f4bee0e67f9cc77e2f96f9cc02a8b0a9a2 nxserver-3.0.0-60.x86_64.tar.gz 7701235
diff --git a/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch
new file mode 100644
index 000000000000..ab4ce9b482f6
--- /dev/null
+++ b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-setup.patch
@@ -0,0 +1,70 @@
+--- scripts/setup/nxserver.orig	2007-06-20 13:25:18.000000000 +0200
++++ scripts/setup/nxserver	2007-06-21 12:29:49.477230627 +0200
+@@ -535,6 +535,10 @@
+ 
+ removeNXinit () {
+ 
++  if [ "$system" = "gentoo" ]; then
++    return
++  fi
++
+   runCommand "$RMCOMMAND -f /etc/init.d/nxserver" "Unable to remove '/etc/init.d/nxserver'" "warn"
+ 
+   if [ "$system" = "solaris" ];
+@@ -681,6 +685,10 @@
+ 
+ addNXinit () {
+ 
++ if [ "$system" = "gentoo" ]; then
++   return
++ fi
++
+  runCommand "cat $NODE_ROOT/scripts/init/nxserver > /etc/init.d/nxserver" "Unable to create: '/etc/init.d/nxserver'" "warn"
+  runCommand "chmod +x /etc/init.d/nxserver" "Cannot set permissions of '/etc/init.d/nxserver' file" "warn"
+ 
+@@ -796,6 +804,11 @@
+ 
+ addNXUserLinux () {
+ 
++  # does the NX user already exist?
++  if id nx > /dev/null 2>&1 ; then
++    return
++  fi
++
+   if [ "x$system" != "xdebian" ]
+   then
+     sysuser=`useradd --help 2>&1|grep "\-r"`;
+@@ -2434,6 +2447,10 @@
+   system=fedora
+ fi
+ 
++if [ -d /usr/portage ]; then
++  system=gentoo
++fi
++
+ if [ "x$system" = "x" -a -f /etc/release ];
+ then
+   system=solaris
+@@ -2468,6 +2485,7 @@
+     "mandrake"           ) ;;
+     "fedora"             ) ;;
+     "debian"             ) ;;
++    "gentoo"             ) ;;
+     "solaris"             ) ;;
+     ""                 ) 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'" ;;
+@@ -2614,14 +2632,6 @@
+     procedureUpdateServer
+     return 0
+   fi
+-  
+-  result=`id nx 2>&1`
+-  if [ $? = 0 ];
+-  then
+-    printMsg "Cannot add user: nx. User: nx already exists" "error"
+-    printMsg "Please try to fix the problem by reinstalling the server" "error"
+-    exit 1
+-  fi
+ 
+   LOGFILE="$INSTALLOG"
+   createLogdirectory
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0.ebuild
new file mode 100644
index 000000000000..2c252fb35be1
--- /dev/null
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0.ebuild,v 1.1 2007/06/21 20:21:30 voyageur Exp $
+
+inherit eutils
+
+DESCRIPTION="Free edition NX server from NoMachine"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/3.0.0/Linux/FE/nxserver-${PV}-60.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/3.0.0/Linux/FE/nxserver-${PV}-60.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="nostrip"
+
+DEPEND="=net-misc/nxnode-3.0*
+	!net-misc/nxserver-freenx
+	!net-misc/nxserver-2xterminalserver"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-apps/xauth"
+
+S="${WORKDIR}"/NX
+
+pkg_preinst()
+{
+	enewuser nx -1 -1 /usr/NX/home/nx
+}
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/nxserver-3.0.0-setup.patch
+}
+
+src_install()
+{
+	# we install nxserver into /usr/NX, to make sure it doesn't clash
+	# with libraries installed for FreeNX
+
+	into /usr/NX
+	for x in nxserver ; do
+		dobin bin/$x
+	done
+
+	dodir /usr/NX/etc
+	insinto /usr/NX/etc
+	doins etc/administrators.db.sample
+	doins etc/guests.db.sample
+	doins etc/passwords.db.sample
+	doins etc/profiles.db.sample
+	doins etc/users.db.sample
+	doins etc/server.lic.sample
+
+	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
+
+	cp -R etc/keys ${D}/usr/NX/etc || die
+
+	cp -R home ${D}/usr/NX || die
+	cp -R lib ${D}/usr/NX || die
+	cp -R scripts ${D}/usr/NX || die
+	cp -R share ${D}/usr/NX || die
+	cp -R var ${D}/usr/NX || die
+
+	newinitd ${FILESDIR}/nxserver-2.1.0-init nxserver
+}
+
+pkg_postinst ()
+{
+	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
+	usermod -d /usr/NX/home/nx nx || die "Unable to set home directory of nx user!!"
+
+	# only run install when no configuration file is found
+	if [ -f /usr/NX/etc/server.cfg ]; then
+		einfo "Running NoMachine's update script"
+		${ROOT}/usr/NX/scripts/setup/nxserver --update
+	else
+		einfo "Running NoMachine's setup script"
+		${ROOT}/usr/NX/scripts/setup/nxserver --install
+	fi
+
+	elog "Remember to add nxserver to your default runlevel"
+}