Maintenance release bump, mostly fixes to work with nxplayer

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 211 insertions, 2 deletions

diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index 3a8c3dd4a8ef..a0c9800aa6e2 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.65 2011/08/23 17:21:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.66 2011/08/24 08:13:08 voyageur Exp $
+
+*nxnode-3.5.0.6 (24 Aug 2011)
+
+  24 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> +nxnode-3.5.0.6.ebuild:
+  Maintenance release bump, mostly fixes to work with nxplayer
 
   23 Aug 2011; Markos Chandras <hwoarang@gentoo.org> nxnode-3.5.0.4.ebuild:
   Stable on amd64 wrt bug #378345
diff --git a/net-misc/nxnode/nxnode-3.5.0.6.ebuild b/net-misc/nxnode/nxnode-3.5.0.6.ebuild
new file mode 100644
index 000000000000..34cc56b1d29d
--- /dev/null
+++ b/net-misc/nxnode/nxnode-3.5.0.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.5.0.6.ebuild,v 1.1 2011/08/24 08:13:08 voyageur Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+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/${MAJOR_PV}/Linux/nxnode-${FULL_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxnode-${FULL_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="rdesktop vnc"
+RESTRICT="strip"
+
+DEPEND="!<net-misc/nxserver-freeedition-3.0.0"
+RDEPEND="=net-misc/nxclient-${MAJOR_PV}*[cups]
+	sys-process/lsof
+	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? ( x11-misc/x11vnc
+		   net-misc/tightvnc )"
+
+S=${WORKDIR}/NX
+
+pkg_preinst()
+{
+	enewuser nx -1 -1 /usr/NX/home/nx
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}"/nxnode-3.4.0-setup.patch
+	epatch "${FILESDIR}"/nxnode-3.4.0-cups_path.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 87ee38f6bd9d..0d1baaf71836 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.55 2011/08/23 17:26:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.56 2011/08/24 08:14:19 voyageur Exp $
+
+*nxserver-freeedition-3.5.0.8 (24 Aug 2011)
+
+  24 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +nxserver-freeedition-3.5.0.8.ebuild:
+  Maintenance release bump, mostly fixes to work with nxplayer
 
   23 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
   nxserver-freeedition-3.5.0.5.ebuild:
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.8.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.8.ebuild
new file mode 100644
index 000000000000..28bdfa2950a4
--- /dev/null
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.5.0.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 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.5.0.8.ebuild,v 1.1 2011/08/24 08:14:19 voyageur Exp $
+
+EAPI=2
+inherit eutils versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
+DESCRIPTION="Free edition NX server from NoMachine"
+HOMEPAGE="http://www.nomachine.com/"
+SRC_URI="amd64? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/FE/nxserver-${FULL_PV}.x86_64.tar.gz )
+	x86? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/FE/nxserver-${FULL_PV}.i386.tar.gz )"
+
+LICENSE="nomachine"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+DEPEND="=net-misc/nxnode-${MAJOR_PV}*"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-apps/xauth
+	x11-apps/xhost"
+
+S="${WORKDIR}"/NX
+
+pkg_preinst() {
+	enewuser nx -1 -1 /usr/NX/home/nx
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch
+	epatch "${FILESDIR}"/nxserver-3.3.0-dontupdatekeys.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 () {
+	# Other NX servers ebuilds may have already created the nx account
+	# However they use different login shell/home directory paths
+	if [[ ${ROOT} == "/" ]]; then
+		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!!"
+	else
+		elog "If you had another NX server installed before, please make sure"
+		elog "the nx user account is correctly set to:"
+		elog " * login shell: /usr/NX/bin/nxserver"
+		elog " * home directory: /usr/NX/home/nx"
+	fi
+
+	# 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
+
+	if ! has_version net-misc/openssh[pam]; then
+		elog ""
+		elog "net-misc/openssh was not built with PAM support"
+		elog "You will need to unlock the nx account by setting a password for it"
+	fi
+
+	elog "Remember to add nxserver to your default runlevel"
+}