Remove old 3.0/3.1 versions, add minor release to ebuild version in latest 3.2

(Portage version: 2.2_rc1/cvs/Linux 2.6.26-gentoo x86_64)

4 files changed, 16 insertions, 174 deletions

diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog
index 350865885ebf..501c8832dd8b 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,15 @@
 # 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.29 2008/06/16 08:51:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.30 2008/07/21 15:45:35 voyageur Exp $
+
+*nxserver-freeedition-3.2.0.13 (21 Jul 2008)
+
+  21 Jul 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freeedition-3.1.0.ebuild, -nxserver-freeedition-3.1.0-r1.ebuild,
+  -nxserver-freeedition-3.2.0-r2.ebuild,
+  +nxserver-freeedition-3.2.0.13.ebuild:
+  Remove old 3.0/3.1 versions, add minor release to ebuild version in latest
+  3.2
 
 *nxserver-freeedition-3.2.0-r2 (16 Jun 2008)
 
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.1.0-r1.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.1.0-r1.ebuild
deleted file mode 100644
index dfb3bc9bb446..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.1.0-r1.ebuild,v 1.2 2008/03/19 11:12:56 pva Exp $
-
-inherit eutils
-
-MY_PV="${PV}-4"
-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.1*
-	!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"
-}
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.1.0.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.1.0.ebuild
deleted file mode 100644
index a3f80bb02267..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.1.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.1.0.ebuild,v 1.2 2008/02/18 17:56:55 opfer Exp $
-
-inherit eutils
-
-MY_PV="${PV}-2"
-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.1*
-	!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"
-}
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0-r2.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0.13.ebuild
index cb73a07bc053..bf80372a88fa 100644
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0-r2.ebuild
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0.13.ebuild
@@ -1,14 +1,15 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.2.0.13.ebuild,v 1.1 2008/07/21 15:45:35 voyageur Exp $
 
-inherit eutils
+inherit eutils versionator
 
-MY_PV="${PV}-13"
+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/${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 )"
+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"