Maintenance release bump, minor bugfixes

Package-Manager: portage-2.1.5.5

4 files changed, 214 insertions, 2 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index ee758d4d0d0a..0a09e4785065 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.29 2008/06/05 15:11:07 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.30 2008/06/16 08:51:00 voyageur Exp $
+
+*nxnode-3.2.0-r2 (16 Jun 2008)
+
+  16 Jun 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +nxnode-3.2.0-r2.ebuild:
+  Maintenance release bump, minor bugfixes
 
   05 Jun 2008; Peter Volkov <pva@gentoo.org> nxnode-3.2.0.ebuild:
   amd64 stable, bug #222967.
diff --git a/net-misc/nxnode/nxnode-3.2.0-r2.ebuild b/net-misc/nxnode/nxnode-3.2.0-r2.ebuild
new file mode 100644
index 000000000000..63233abd74e0
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.2.0-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.2.0-r2.ebuild,v 1.1 2008/06/16 08:51:00 voyageur Exp $
+
+inherit eutils
+
+MY_PV="${PV}-10"
+DESCRIPTION="shared components between the different editions of NoMachine's NX
+Servers"
+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.2*
+	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_preinst()
+{
+	enewuser nx -1 -1 /usr/NX/home/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:0 "${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"
+}
diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index a59a6ea88f98..350865885ebf 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.28 2008/06/05 15:12:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.29 2008/06/16 08:51:39 voyageur Exp $
+
+*nxserver-freeedition-3.2.0-r2 (16 Jun 2008)
+
+  16 Jun 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +nxserver-freeedition-3.2.0-r2.ebuild:
+  Maintenance release bump, minor bugfixes
 
   05 Jun 2008; Peter Volkov <pva@gentoo.org>
   nxserver-freeedition-3.2.0.ebuild:
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0-r2.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0-r2.ebuild
new file mode 100644
index 000000000000..cb73a07bc053
--- /dev/null
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 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.2.0-r2.ebuild,v 1.1 2008/06/16 08:51:39 voyageur Exp $
+
+inherit eutils
+
+MY_PV="${PV}-13"
+DESCRIPTION="Free edition NX server from NoMachine"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${PV}/Linux/FE/nxserver-${MY_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${PV}/Linux/FE/nxserver-${MY_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND="=net-misc/nxnode-3.2*
+	!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"
+}