Drop 3.3 NX versions

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

10 files changed, 20 insertions, 628 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index f0c3dbf43d2f..fff2383c5df1 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.50 2010/06/14 20:31:52 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.51 2010/06/14 20:37:34 voyageur Exp $
+
+  14 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.3.0-r1.ebuild,
+  -nx-3.3.0-r4.ebuild, -nx-3.3.0-r5.ebuild:
+  Drop 3.3 NX versions
 
 *nx-3.4.0-r2 (14 Jun 2010)
 
diff --git a/net-misc/nx/nx-3.3.0-r1.ebuild b/net-misc/nx/nx-3.3.0-r1.ebuild
deleted file mode 100644
index 936be4f4b08e..000000000000
--- a/net-misc/nx/nx-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,123 +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/nx/nx-3.3.0-r1.ebuild,v 1.2 2009/03/08 15:29:14 maekke Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php"
-
-URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
-SRC_NX_X11="nx-X11-$PV-3.tar.gz"
-SRC_NXAGENT="nxagent-$PV-6.tar.gz"
-SRC_NXAUTH="nxauth-$PV-1.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-3.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-2.tar.gz"
-SRC_NXCOMPSHAD="nxcompshad-$PV-2.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-2.tar.gz"
-
-SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="rdesktop vnc"
-
-RDEPEND="x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	>=media-libs/jpeg-6b-r4
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3
-	rdesktop? ( net-misc/rdesktop )
-	vnc? ( || ( net-misc/vnc[server] net-misc/tightvnc[server] ) )"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${PN}-X11
-
-src_unpack() {
-	unpack ${A}
-
-	# For nxcl/qtnx
-	cd "${WORKDIR}"/nxproxy
-	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
-	# Quiet some warnings
-	cd "${WORKDIR}"/nxcomp
-	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
-
-	cd "${WORKDIR}"
-	# Fix sandbox violation
-	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	# -fPIC
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-	# Respect CFLAGS/CXXFLAGS
-	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
-	# Run autoreconf in all neeed folders
-	for i in nxcomp nxcompext nxcompshad nxproxy; do
-		cd "${WORKDIR}"/${i}
-		eautoreconf ${i}
-		cd "${WORKDIR}"
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	cd "${S}"
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-}
-
-src_compile() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	econf || die "nxcomp econf failed"
-	emake || die "nxcomp emake failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-
-	econf || die "nxcompshad econf failed"
-	emake || die "nxcompshad emake failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	econf || die "nxproxy econf failed"
-	emake || die "nxproxy emake failed"
-
-	cd "${S}" || die "No nx-X11 directory found"
-	# Again, from xorg-x11-6.9.0-r3.ebuild
-	unset MAKE_OPTS
-	FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed"
-
-	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
-	econf || die "nxcompext econf failed"
-	emake || die "nxcompext emake failed"
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
-			die " $x wrapper creation failed"
-	done
-
-	into ${NX_ROOT}
-	dobin "${S}"/programs/Xserver/nxagent
-	dobin "${S}"/programs/nxauth/nxauth
-	dobin "${WORKDIR}"/nxproxy/nxproxy
-
-	dolib.so "${S}"/lib/X11/libX11.so*
-	dolib.so "${S}"/lib/Xext/libXext.so*
-	dolib.so "${S}"/lib/Xrender/libXrender.so*
-	dolib.so "${WORKDIR}"/nxcomp/libXcomp.so*
-	dolib.so "${WORKDIR}"/nxcompext/libXcompext.so*
-	dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so*
-}
diff --git a/net-misc/nx/nx-3.3.0-r4.ebuild b/net-misc/nx/nx-3.3.0-r4.ebuild
deleted file mode 100644
index 6fbaa53de226..000000000000
--- a/net-misc/nx/nx-3.3.0-r4.ebuild
+++ /dev/null
@@ -1,121 +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/nx/nx-3.3.0-r4.ebuild,v 1.2 2009/07/06 10:48:04 voyageur Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php"
-
-URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
-SRC_NX_X11="nx-X11-$PV-6.tar.gz"
-SRC_NXAGENT="nxagent-$PV-13.tar.gz"
-SRC_NXAUTH="nxauth-$PV-1.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-4.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-4.tar.gz"
-SRC_NXCOMPSHAD="nxcompshad-$PV-3.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-2.tar.gz"
-
-SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	>=media-libs/jpeg-6b-r4
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${PN}-X11
-
-src_prepare() {
-	# For nxcl/qtnx
-	cd "${WORKDIR}"/nxproxy
-	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
-	# Quiet some warnings
-	cd "${WORKDIR}"/nxcomp
-	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
-	# GCC 4.4 + glibc 2.10
-	epatch "${FILESDIR}"/${P}-nxcomp-glibc2.10.patch
-
-	cd "${WORKDIR}"
-	# Fix sandbox violation
-	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	# -fPIC
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-	# Respect CFLAGS/CXXFLAGS
-	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
-	# Run autoreconf in all neeed folders
-	for i in nxcomp nxcompext nxcompshad nxproxy; do
-		cd "${WORKDIR}"/${i}
-		eautoreconf ${i}
-		cd "${WORKDIR}"
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	cd "${S}"
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-}
-
-src_compile() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	econf || die "nxcomp econf failed"
-	emake || die "nxcomp emake failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-
-	econf || die "nxcompshad econf failed"
-	emake || die "nxcompshad emake failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	econf || die "nxproxy econf failed"
-	emake || die "nxproxy emake failed"
-
-	cd "${S}" || die "No nx-X11 directory found"
-	# Again, from xorg-x11-6.9.0-r3.ebuild
-	unset MAKE_OPTS
-	FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed"
-
-	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
-	econf || die "nxcompext econf failed"
-	emake || die "nxcompext emake failed"
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
-			die " $x wrapper creation failed"
-	done
-
-	into ${NX_ROOT}
-	dobin "${S}"/programs/Xserver/nxagent
-	dobin "${S}"/programs/nxauth/nxauth
-	dobin "${WORKDIR}"/nxproxy/nxproxy
-
-	dolib.so "${S}"/lib/X11/libX11.so*
-	dolib.so "${S}"/lib/Xext/libXext.so*
-	dolib.so "${S}"/lib/Xrender/libXrender.so*
-	dolib.so "${WORKDIR}"/nxcomp/libXcomp.so*
-	dolib.so "${WORKDIR}"/nxcompext/libXcompext.so*
-	dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so*
-}
diff --git a/net-misc/nx/nx-3.3.0-r5.ebuild b/net-misc/nx/nx-3.3.0-r5.ebuild
deleted file mode 100644
index 35824e85700d..000000000000
--- a/net-misc/nx/nx-3.3.0-r5.ebuild
+++ /dev/null
@@ -1,121 +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/nx/nx-3.3.0-r5.ebuild,v 1.1 2009/09/01 21:36:33 voyageur Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php"
-
-URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
-SRC_NX_X11="nx-X11-$PV-7.tar.gz"
-SRC_NXAGENT="nxagent-$PV-18.tar.gz"
-SRC_NXAUTH="nxauth-$PV-1.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-4.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-4.tar.gz"
-SRC_NXCOMPSHAD="nxcompshad-$PV-3.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-2.tar.gz"
-
-SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	>=media-libs/jpeg-6b-r4
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${PN}-X11
-
-src_prepare() {
-	# For nxcl/qtnx
-	cd "${WORKDIR}"/nxproxy
-	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
-
-	# Quiet some warnings
-	cd "${WORKDIR}"/nxcomp
-	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
-	# GCC 4.4 + glibc 2.10
-	epatch "${FILESDIR}"/${P}-nxcomp-glibc2.10.patch
-
-	cd "${WORKDIR}"
-	# Fix sandbox violation
-	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	# -fPIC
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-	# Respect CFLAGS/CXXFLAGS
-	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
-	# Run autoreconf in all neeed folders
-	for i in nxcomp nxcompext nxcompshad nxproxy; do
-		cd "${WORKDIR}"/${i}
-		eautoreconf ${i}
-		cd "${WORKDIR}"
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	cd "${S}"
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-}
-
-src_compile() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	econf || die "nxcomp econf failed"
-	emake || die "nxcomp emake failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-
-	econf || die "nxcompshad econf failed"
-	emake || die "nxcompshad emake failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	econf || die "nxproxy econf failed"
-	emake || die "nxproxy emake failed"
-
-	cd "${S}" || die "No nx-X11 directory found"
-	# Again, from xorg-x11-6.9.0-r3.ebuild
-	unset MAKE_OPTS
-	FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed"
-
-	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
-	econf || die "nxcompext econf failed"
-	emake || die "nxcompext emake failed"
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
-			die " $x wrapper creation failed"
-	done
-
-	into ${NX_ROOT}
-	dobin "${S}"/programs/Xserver/nxagent
-	dobin "${S}"/programs/nxauth/nxauth
-	dobin "${WORKDIR}"/nxproxy/nxproxy
-
-	dolib.so "${S}"/lib/X11/libX11.so*
-	dolib.so "${S}"/lib/Xext/libXext.so*
-	dolib.so "${S}"/lib/Xrender/libXrender.so*
-	dolib.so "${WORKDIR}"/nxcomp/libXcomp.so*
-	dolib.so "${WORKDIR}"/nxcompext/libXcompext.so*
-	dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so*
-}
diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 41e6127ad17b..82fefbfd87fb 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nxclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.87 2010/05/11 07:08:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.88 2010/06/14 20:35:57 voyageur Exp $
+
+  14 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxclient-3.3.0.6.ebuild:
+  Drop 3.3 NX versions
 
   11 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   nxclient-3.3.0.6.ebuild, nxclient-3.4.0.5.ebuild, nxclient-3.4.0.7.ebuild:
diff --git a/net-misc/nxclient/nxclient-3.3.0.6.ebuild b/net-misc/nxclient/nxclient-3.3.0.6.ebuild
deleted file mode 100644
index ef08f46fd3e7..000000000000
--- a/net-misc/nxclient/nxclient-3.3.0.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-3.3.0.6.ebuild,v 1.7 2010/05/11 07:08:50 ssuominen Exp $
-
-EAPI=2
-inherit eutils versionator
-
-MAJOR_PV="$(get_version_component_range 1-3)"
-FULL_PV="${MAJOR_PV}-$(get_version_component_range 4)"
-DESCRIPTION="X11/VNC/NXServer client (remote desktops over low-bandwidth links)"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="amd64? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxclient-${FULL_PV}.x86_64.tar.gz )
-	x86? ( http://64.34.161.181/download/${MAJOR_PV}/Linux/nxclient-${FULL_PV}.i386.tar.gz )"
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="dev-libs/expat
-	>=dev-libs/openssl-0.9.8e
-	media-libs/audiofile
-	=media-libs/jpeg-6*
-	=media-libs/libpng-1.2*
-	media-libs/freetype
-	media-libs/fontconfig
-	net-print/cups
-	x11-libs/libXft
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXrender
-	x11-libs/libXau
-	x11-libs/libXext
-	sys-libs/zlib
-	!net-misc/nxclient-2xterminalserver"
-
-S=${WORKDIR}/NX
-
-src_install()
-{
-	# we install nxclient into /usr/NX, to make sure it doesn't clash
-	# with libraries installed for FreeNX
-
-	for x in nxclient nxesd nxkill nxprint nxservice nxssh ; do
-		into /usr/NX
-		dobin bin/$x
-		into /usr
-		make_wrapper $x ./$x /usr/NX/bin /usr/NX/lib || die
-	done
-
-	dodir /usr/NX/lib
-	cp -P lib/libXcompsh.so* lib/libXcomp.so* "${D}"/usr/NX/lib
-
-	dodir /usr/NX/share
-	cp -R share "${D}"/usr/NX
-
-	# Add icons/desktop entries (missing in the tarball)
-	cd share/icons
-	for size in *; do
-		dodir /usr/share/icons/hicolor/${size}/apps
-		for icon in admin desktop icon wizard; do
-			dosym /usr/NX/share/icons/${size}/nxclient-${icon}.png \
-				/usr/share/icons/hicolor/${size}/apps
-			done
-		done
-	make_desktop_entry "nxclient" "NX Client" nxclient-icon
-	make_desktop_entry "nxclient -admin" "NX Session Administrator" nxclient-admin
-	make_desktop_entry "nxclient -wizard" "NX Connection Wizard" nxclient-wizard
-}
diff --git a/net-misc/nxnode/ChangeLog b/net-misc/nxnode/ChangeLog
index 6e5b6c51354e..feea65b2efcf 100644
--- a/net-misc/nxnode/ChangeLog
+++ b/net-misc/nxnode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nxnode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.56 2010/06/14 20:33:50 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/ChangeLog,v 1.57 2010/06/14 20:36:42 voyageur Exp $
+
+  14 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxnode-3.3.0.17.ebuild:
+  Drop 3.3 NX versions
 
 *nxnode-3.4.0.13 (14 Jun 2010)
 
diff --git a/net-misc/nxnode/nxnode-3.3.0.17.ebuild b/net-misc/nxnode/nxnode-3.3.0.17.ebuild
deleted file mode 100644
index cefe1c9965ca..000000000000
--- a/net-misc/nxnode/nxnode-3.3.0.17.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxnode/nxnode-3.3.0.17.ebuild,v 1.4 2010/01/18 15:05:53 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-freenx
-	!<net-misc/nxserver-freeedition-3.0.0"
-
-RDEPEND="=net-misc/nxclient-3.3*
-	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? ( || ( net-misc/vnc[server] net-misc/tightvnc[server] ) )"
-
-S=${WORKDIR}/NX
-
-pkg_preinst()
-{
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_prepare()
-{
-	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 f1879f81b2b8..cdc83be036ad 100644
--- a/net-misc/nxserver-freeedition/ChangeLog
+++ b/net-misc/nxserver-freeedition/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nxserver-freeedition
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.47 2010/02/09 23:22:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.48 2010/06/14 20:37:06 voyageur Exp $
+
+  14 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -nxserver-freeedition-3.3.0.14.ebuild:
+  Drop 3.3 NX versions
 
 *nxserver-freeedition-3.4.0.12 (09 Feb 2010)
 
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.14.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.14.ebuild
deleted file mode 100644
index d97a85b79866..000000000000
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.14.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.14.ebuild,v 1.2 2009/04/04 15:09:48 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"
-}