Drop first 3.3.0 versions, add xhost RDEPEND for shadow suppport, spotted by Patrick <mail@patrick-nagel.net> in bug #296877

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

5 files changed, 12 insertions, 274 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index f6c5c05f9380..475be96e7a20 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.45 2009/11/25 14:00:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.46 2009/12/15 17:38:58 voyageur Exp $
+
+  15 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freeedition-3.3.0.8-r1.ebuild,
+  -nxserver-freeedition-3.3.0.22.ebuild,
+  -nxserver-freeedition-3.3.0.27.ebuild,
+  nxserver-freeedition-3.4.0.8.ebuild:
+  Drop first 3.3.0 versions, add xhost RDEPEND for shadow suppport, spotted
+  by Patrick <mail@patrick-nagel.net> in bug #296877
 
   25 Nov 2009; Markus Meier <maekke@gentoo.org>
   nxserver-freeedition-3.4.0.8.ebuild:
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.22.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.22.ebuild
deleted file mode 100644
index 2f10f4da73f0..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.22.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 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.3.0.22.ebuild,v 1.1 2009/03/25 23:00:22 voyageur Exp $
-
-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-3.3*
-	!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
-	epatch "${FILESDIR}"/nxserver-${MAJOR_PV}-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 ()
-{
-	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"
-}
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.27.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.27.ebuild
deleted file mode 100644
index 6f04095cd008..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.27.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2009 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.3.0.27.ebuild,v 1.2 2009/09/17 09:20:32 voyageur Exp $
-
-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-3.3*"
-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
-	epatch "${FILESDIR}"/nxserver-${MAJOR_PV}-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 ! built_with_use 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"
-}
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8-r1.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8-r1.ebuild
deleted file mode 100644
index d30f8eb1beaa..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 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.3.0.8-r1.ebuild,v 1.3 2009/03/08 15:23:26 maekke Exp $
-
-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-3.3*
-	!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
-	epatch "${FILESDIR}"/nxserver-${MAJOR_PV}-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 ()
-{
-	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"
-}
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.4.0.8.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.4.0.8.ebuild
index 25ab66f1c730..bd88ff6ce3cc 100644
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.4.0.8.ebuild
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.4.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.4.0.8.ebuild,v 1.4 2009/11/25 14:00:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.4.0.8.ebuild,v 1.5 2009/12/15 17:38:58 voyageur Exp $
 
 inherit eutils versionator
 
@@ -21,7 +21,8 @@ DEPEND="=net-misc/nxnode-${MAJOR_PV}*"
 RDEPEND="${DEPEND}
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
-	x11-apps/xauth"
+	x11-apps/xauth
+	x11-apps/xhost"
 
 S="${WORKDIR}"/NX