Version bump, fix some quoting

(Portage version: 2.1.4_rc6)

5 files changed, 182 insertions, 5 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index c53be8b6443c..e2acc997a314 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,14 @@
 # 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.18 2007/09/20 23:19:27 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.19 2007/12/03 21:49:48 voyageur Exp $
+
+*nxserver-freeedition-3.0.0-r4 (03 Dec 2007)
+
+  03 Dec 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nxserver-3.0.0-r4-setup.patch,
+  nxserver-freeedition-3.0.0-r3.ebuild,
+  +nxserver-freeedition-3.0.0-r4.ebuild:
+  Version bump, fix some quoting
 
   20 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
   -files/nxserver-2.1.0-setup.patch, -files/nxserver-3.0.0-setup.patch,
diff --git a/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0-r4 b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0-r4
new file mode 100644
index 000000000000..33fcf42f2b0b
--- /dev/null
+++ b/net-misc/nxserver-freeedition/files/digest-nxserver-freeedition-3.0.0-r4
@@ -0,0 +1,6 @@
+MD5 fdb1bcdef1aff5dec4bb23aa42636b11 nxserver-3.0.0-79.i386.tar.gz 6683894
+RMD160 1ea1aa93ef6a23d55dca8be4c7845d490097890a nxserver-3.0.0-79.i386.tar.gz 6683894
+SHA256 161db58a5a0be991413e406db4837633d11ac2212baa289ec532fe029719a94e nxserver-3.0.0-79.i386.tar.gz 6683894
+MD5 5e7db22e848412a0608a22c5f9c3014f nxserver-3.0.0-79.x86_64.tar.gz 7735239
+RMD160 e44cd3b09d040a4c1522e9c422cf209779ee3984 nxserver-3.0.0-79.x86_64.tar.gz 7735239
+SHA256 9f79040c63c49322be1ca99a41c6894cabe2c6df39134e964fe7275c6e8957b1 nxserver-3.0.0-79.x86_64.tar.gz 7735239
diff --git a/net-misc/nxserver-freeedition/files/nxserver-3.0.0-r4-setup.patch b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-r4-setup.patch
new file mode 100644
index 000000000000..fe9dd50e6bdd
--- /dev/null
+++ b/net-misc/nxserver-freeedition/files/nxserver-3.0.0-r4-setup.patch
@@ -0,0 +1,79 @@
+--- scripts/setup/nxserver.orig	2007-11-21 19:08:47.000000000 +0100
++++ scripts/setup/nxserver	2007-11-30 10:57:41.430044132 +0100
+@@ -598,6 +598,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" ];
+@@ -744,6 +748,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"
+ 
+@@ -858,6 +866,12 @@
+ }
+ 
+ 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"`;
+@@ -2515,6 +2529,11 @@
+   system=fedora
+ fi
+ 
++if [ -d /usr/portage ];
++then
++  system=gentoo
++fi
++
+ if [ "x$system" = "x" -a -f /etc/release ];
+ then
+   system=solaris
+@@ -2549,6 +2568,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'" ;;
+@@ -2701,21 +2721,6 @@
+     fi
+   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"
+-    printMsg "Cannot add user: nx" "error"
+-    printMsg "User: nx already exists" "error"
+-    printMsgNoDot "To fix the problem, you may try to completely uninstall NX" 
+-    printMsgNoDot "Server and install it from scratch. If this is not enough,"
+-    printMsgNoDot "please delete the nx user by using the system commands and"
+-    printMsg "proceed with a new installation of NX Server"
+-    exit 1
+-  fi
+-
+   LOGFILE="$INSTALLOG"
+   createLogdirectory
+   startLog
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild
index 6c8d79f5b54c..05d9a21d0852 100644
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-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/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v 1.5 2007/09/20 14:53:19 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r3.ebuild,v 1.6 2007/12/03 21:49:48 voyageur Exp $
 
 inherit eutils
 
@@ -56,9 +56,9 @@ src_install()
 
 	newins etc/server-debian.cfg.sample server-gentoo.cfg.sample
 
-	cp -R home ${D}/usr/NX || die "Unable to install home folder"
-	cp -R lib ${D}/usr/NX || die "Unable to install lib folder"
-	cp -R scripts ${D}/usr/NX || die "Unable to install scripts folder"
+	cp -R home "${D}"/usr/NX || die "Unable to install home folder"
+	cp -R lib "${D}"/usr/NX || die "Unable to install lib folder"
+	cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder"
 	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
 	cp -R var "${D}"/usr/NX || die "Unable to install var folder"
 
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r4.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r4.ebuild
new file mode 100644
index 000000000000..42e715060d68
--- /dev/null
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.0.0-r4.ebuild
@@ -0,0 +1,84 @@
+# 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-r4.ebuild,v 1.1 2007/12/03 21:49:48 voyageur Exp $
+
+inherit eutils
+
+MY_PV="${PV}-79"
+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-${MY_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/3.0.0/Linux/FE/nxserver-${MY_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+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-r4-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
+	dobin bin/nxserver
+
+	dodir /usr/NX/etc/keys
+	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 home "${D}"/usr/NX || die "Unable to install home folder"
+	cp -R lib "${D}"/usr/NX || die "Unable to install lib folder"
+	cp -R scripts "${D}"/usr/NX || die "Unable to install scripts folder"
+	cp -R share "${D}"/usr/NX || die "Unable to install share folder"
+	cp -R var "${D}"/usr/NX || die "Unable to install var folder"
+
+	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 || die "Update script failed"
+	else
+		einfo "Running NoMachine's setup script"
+		"${ROOT}"/usr/NX/scripts/setup/nxserver --install || die "Installation script failed"
+	fi
+
+	elog "Remember to add nxserver to your default runlevel"
+}