Remove vulnerable versions, security bug #210317

Package-Manager: portage-2.1.4.4

6 files changed, 7 insertions, 365 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index c2ee59be9408..824e3b605182 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.17 2008/03/31 20:50:53 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.18 2008/04/03 08:10:53 voyageur Exp $
+
+  03 Apr 2008; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.0.0.ebuild,
+  -nx-3.0.0-r1.ebuild, -nx-3.1.0.ebuild:
+  Remove vulnerable versions, security bug #210317
 
   31 Mar 2008; Bernard Cafarelli <voyageur@gentoo.org>
   +files/nx-3.1.0-gcc-4.3.patch, nx-3.1.0-r1.ebuild:
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 8dda038ddd50..129ada81cefc 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -3,28 +3,13 @@ AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e8
 AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a SHA1 fc41d3539af12dd3d5a1dafc63b0ca40893fbf1b SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973
 AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01
 AUX nx-3.1.0-gcc-4.3.patch 373 RMD160 3a8585a19fae38b7814e85c68a475df18765fbc6 SHA1 ba38ca0ee36b2c48ee09d855c4b32027e10c0fcc SHA256 696c7545ebbb14c0bc7c6d88d3ab8b9b7bf0758c4b636c8c3a85b408b5d0c05d
-DIST nx-X11-3.0.0-37.tar.gz 20183918 RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 SHA1 8e875243758722cae03bc8697fd678c08e5e3eb9 SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df
-DIST nx-X11-3.1.0-1.tar.gz 20175237 RMD160 918ea4f90d463e71dd245d2f54de2a6af267e36e SHA1 f4090090ca573c2915f84d746905c2ef73612ca8 SHA256 1998164fb6741046398cdbe822483f45a438a0c761db61b0b0284030c48d51f9
 DIST nx-X11-3.1.0-4.tar.gz 20193596 RMD160 c242d8455f89920379b3c63c588ddc7480794780 SHA1 83bdcae4a97ab3f33646f3f3155c2ff7e04c4ee4 SHA256 111b58893bfcdf309b585a46758347c141ba12751f47cdc19d4cdc9bdd0d7f48
-DIST nxagent-3.0.0-85.tar.gz 1537674 RMD160 5c80dbf2c016fafe9e20816c3e7b0fd5291f368c SHA1 f8a18851346454b4c05491db1fe067c812fed717 SHA256 3d5b223e7bd0ae3ba4348fe5afee62d22cf457412f254c33fd11ae5898a716d9
-DIST nxagent-3.0.0-93.tar.gz 1534641 RMD160 8d73b31e4c5930737b19dbb6db0a4de9b69b911b SHA1 a1ac0b4cd222b7663d2c32de7a6937c148a12167 SHA256 6cb345921fb527a7093f96484b9550526f9b9c07e9bb1210a7733cd8ce3f2e24
-DIST nxagent-3.1.0-2.tar.gz 1538314 RMD160 e355556fa098b3cf2e1c2db7be1de4cdd2863c59 SHA1 72799be7ab793f74843b66c8d129d03b8b014f75 SHA256 68c4900aa1947073c4381d54546baac353558508788d22ba78a2959eb06c3757
 DIST nxagent-3.1.0-7.tar.gz 1543192 RMD160 000e9050017fc61d134c54285e4724092ff201d9 SHA1 8b35c774fb584fe4fc6b046c11b37cee7a95f723 SHA256 c0e6a2c1e273f32a2de4223f33b4d9c07450fb032f3a4fc0b965012f77ae33e5
-DIST nxauth-3.0.0-6.tar.gz 30474 RMD160 e71ae1b83b78f47f9bacf6d85cca529bfda8b2d0 SHA1 4813adbfb99908da73979456fa381a40fea7489e SHA256 09868f985ab71f9cefa61ddd0e809cb41583b31af5098a0b4cdc7a0f4d7fdd62
 DIST nxauth-3.1.0-1.tar.gz 29922 RMD160 4813d95a64b424143d7e36b761376daab14e7dbf SHA1 4bc9eaa75ac62d73cd2d2eeec6d008ef790496ee SHA256 3636bd340ab4de613cdb3e7995c683d19f0a267ec77a8e3371635d57c33c91dc
-DIST nxcomp-3.0.0-43.tar.gz 530677 RMD160 8d0d04333b1a90d10da0d4653e196c1754dcab28 SHA1 af6554c2748691f6d5206d23215b6acc45141f9b SHA256 cff0ae97284b8a6d32f57cf20617e6aa021565fe3595545e888eeaaaf5aef48e
-DIST nxcomp-3.0.0-48.tar.gz 500084 RMD160 0b71022cd986914d4f98144f82a6e16c487a374a SHA1 39f5fc9256e180dee9dad6ef0f2c65cbdca00bb1 SHA256 9df9122d898d8cd4bce83c3cfb8c61133b5138f83ec6887ff5944ab4bf10e79f
-DIST nxcomp-3.1.0-4.tar.gz 500228 RMD160 fdd35bd5bac75729af380943c9d1d4a8ce1c0e97 SHA1 bd468baf4b5af46925d6c596cfec8e2bc10926b6 SHA256 7355a9b8e386ffcabddbd164024c852a8902e19e34641078b2b9bd855a7928eb
 DIST nxcomp-3.1.0-6.tar.gz 500256 RMD160 d02a4b8127e55e05e8e728334dac713710831fa8 SHA1 784ff5eaede3ac284232afcd8d8b2e57f8363756 SHA256 54be15ae0eed1bfedb89d78f35ac6aaa6f1afcdf2f91e28904a7bd906a883b4f
-DIST nxcompext-3.0.0-18.tar.gz 89984 RMD160 8b4e483e0226041d758920957b4a20626342b797 SHA1 ef7021673fbbe11ed5635c1f58052127c0d7466a SHA256 a6c2bb400d6a970e94db453491d345cbeebd4be0a1b3969b38281a658f6fa554
 DIST nxcompext-3.1.0-2.tar.gz 121284 RMD160 9bf0df1453ff32e1fc730271ea2a9e27a91cf5a8 SHA1 63210a5ea6514d4d6e2f60480162811a25e9c413 SHA256 8502082a56cfeed4fd2b11fbd2a467e44b9b0fcc7c6ebe50661ec0784d966ce6
-DIST nxcompshad-3.0.0-19.tar.gz 71747 RMD160 0a0d1142024544956eece74d0ea5929ebdb67ec8 SHA1 37519203e0a12762607f64c3978f01383dab81df SHA256 0011b7cff616001e7e9f846ed4f128b39ed6a4a0a40aa62138afc13fbb0c6cec
 DIST nxcompshad-3.1.0-2.tar.gz 72510 RMD160 cce5e3031c23574c70f6c8851bf5637f8d99c1ec SHA1 b4786468cac0509e5f530a626f866da31958908e SHA256 3741dbd427fb40363c34170cb90e61c108c1414453665b5aac2644f09b8b5974
-DIST nxproxy-3.0.0-4.tar.gz 82730 RMD160 b96e8752fce7015da88e2e304c8647abc6591892 SHA1 b4e22c541f3ae6f08f16c0239494475519de4045 SHA256 e2a838697d79b8621851e1fbe12dd699699f6ab62fa2caa92c53a0fefe901954
 DIST nxproxy-3.1.0-2.tar.gz 80127 RMD160 5fa986880540e61674f2d510d8ae22d4b1bc4825 SHA1 2ed7feaf8aa598f7f0b50be3d4dac3a652d9581c SHA256 a5dc41e4e58cf140b4e735405f98f863fb8dc49cd0ce06571539e1efad5cb2b4
-EBUILD nx-3.0.0-r1.ebuild 3341 RMD160 6c9214ad1fbf334ce331b2b4bb8d3c325a1c65d4 SHA1 3b9c8d479d7b93b68816dc4034e66a1f6be44fc7 SHA256 3117aeff076e3c931ffa3eabe273e30e3f0bf5e29e9d837843e14a39659e9103
-EBUILD nx-3.0.0.ebuild 2900 RMD160 8740586b0a62ea9ad7578cd15b557616678dba50 SHA1 83c8520f928e49fab2a0acfb157c571164f1be91 SHA256 45211d66955c5805c29edfb6d06049fd67a14a472f643b767ab5e90b6c54c5f7
 EBUILD nx-3.1.0-r1.ebuild 3298 RMD160 4d1926629260425299607e63f08e648d618b34e4 SHA1 cc42899413b4273857e3cf5706e88685f668fc30 SHA256 179276715696d99cf42661f6aa1bc6cba7d6974e0a408f7cfaba85542c5aa499
-EBUILD nx-3.1.0.ebuild 3255 RMD160 725ab5d1810d1fdcc4c798be57d8361224511f7d SHA1 751499db3f1e047dea356d46a0eb03046cb7b7a7 SHA256 4e7dfe963df68ec35dc401b091eda88104fe69fcf3b6c85e48518abb70ee927d
-MISC ChangeLog 2984 RMD160 9c011533ddd3bf2f21faba0c4ed97d8f5dd9591f SHA1 a073a8f53511905cb34748960b79f95320fb8972 SHA256 e163fd0a3ec08508aa0b2f605bc873974c474ce01ab7e1e8b98cc839aa8ed696
+MISC ChangeLog 3150 RMD160 548d94fd66af97a9c3ef8758b40725b1b1b18e4d SHA1 dbbc5a3a53ebd0a89c8fdcdca9457005581b804c SHA256 92320ff270ad6126a867f71bdf82a3d4c827b587e2a7a51485ea9acce94101a3
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
diff --git a/net-misc/nx/nx-3.0.0-r1.ebuild b/net-misc/nx/nx-3.0.0-r1.ebuild
deleted file mode 100644
index 664edebc460b..000000000000
--- a/net-misc/nx/nx-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,114 +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/nx/nx-3.0.0-r1.ebuild,v 1.2 2008/01/14 19:40:18 voyageur Exp $
-
-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-37.tar.gz"
-SRC_NXAGENT="nxagent-$PV-93.tar.gz"
-SRC_NXAUTH="nxauth-$PV-6.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-48.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-18.tar.gz"
-SRC_NXCOMPSHAD="nxcompshad-$PV-19.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-4.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 net-misc/tightvnc ) )"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${PN}-X11
-
-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 "${WORKDIR}"
-	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-
-	cd "${WORKDIR}"/nxcomp
-	epatch "${FILESDIR}"/${PN}-2.1.0-deprecated-headers.patch
-	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
-	eautoreconf
-}
-
-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 "${WORKDIR}"/nx-X11 || die "No nx-X11 directory found"
-	emake World || 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 "${WORKDIR}"/nx-X11/programs/Xserver/nxagent
-	dobin "${WORKDIR}"/nx-X11/programs/nxauth/nxauth
-	dobin "${WORKDIR}"/nxproxy/nxproxy
-
-	dolib.so "${WORKDIR}"/nx-X11/lib/X11/libX11.so*
-	dolib.so "${WORKDIR}"/nx-X11/lib/Xext/libXext.so*
-	dolib.so "${WORKDIR}"/nx-X11/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.0.0.ebuild b/net-misc/nx/nx-3.0.0.ebuild
deleted file mode 100644
index 30ea12a1a9c1..000000000000
--- a/net-misc/nx/nx-3.0.0.ebuild
+++ /dev/null
@@ -1,112 +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/nx/nx-3.0.0.ebuild,v 1.5 2008/01/14 19:40:18 voyageur Exp $
-
-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-37.tar.gz"
-SRC_NXAGENT="nxagent-$PV-85.tar.gz"
-SRC_NXAUTH="nxauth-$PV-6.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-43.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-18.tar.gz"
-SRC_NXCOMPSHAD="nxcompshad-$PV-19.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-4.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 net-misc/tightvnc ) )"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${PN}-X11
-
-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 ${WORKDIR}
-	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch
-
-	cd ${WORKDIR}/nxcomp
-	epatch ${FILESDIR}/${PN}-2.1.0-deprecated-headers.patch
-	epatch ${FILESDIR}/${PN}-2.1.0-invalid-options.patch
-	eautoreconf
-}
-
-src_compile() {
-	cd ${WORKDIR}/nxcomp || die
-	econf || die
-	emake || die
-
-	cd ${WORKDIR}/nxcompshad || die
-	econf || die
-	emake || die
-
-	cd ${WORKDIR}/nxproxy || die
-	econf || die
-	emake || die
-
-	cd ${WORKDIR}/nx-X11 || die
-	emake World || die
-
-	cd ${WORKDIR}/nxcompext || die
-	econf || die
-	emake || die
-}
-
-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
-	done
-
-	into ${NX_ROOT}
-	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent
-	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth
-	dobin ${WORKDIR}/nxproxy/nxproxy
-
-	dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so*
-	dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so*
-	dolib.so ${WORKDIR}/nx-X11/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.1.0.ebuild b/net-misc/nx/nx-3.1.0.ebuild
deleted file mode 100644
index 46b69abed4e0..000000000000
--- a/net-misc/nx/nx-3.1.0.ebuild
+++ /dev/null
@@ -1,114 +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/nx/nx-3.1.0.ebuild,v 1.2 2008/01/14 19:40:18 voyageur Exp $
-
-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-1.tar.gz"
-SRC_NXAGENT="nxagent-$PV-2.tar.gz"
-SRC_NXAUTH="nxauth-$PV-1.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-4.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 net-misc/tightvnc ) )"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${PN}-X11
-
-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 "${WORKDIR}"
-	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-
-	cd "${WORKDIR}"/nxcomp
-	epatch "${FILESDIR}"/${PN}-2.1.0-deprecated-headers.patch
-	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
-	eautoreconf
-}
-
-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"
-	emake World || 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/nxserver-freeedition/Manifest b/net-misc/nxserver-freeedition/Manifest
index 19c703a7c67e..faf69b60f793 100644
--- a/net-misc/nxserver-freeedition/Manifest
+++ b/net-misc/nxserver-freeedition/Manifest
@@ -1,17 +1,10 @@
 AUX nxserver-2.1.0-init 494 RMD160 03340e16e3d3f99635eb7886a447b35cf907a63e SHA1 fe7a4fa1d02831404d6a70ff63eef537bcd37086 SHA256 4c937f114be2a2e5bfebf6f7b96d00e841c46a9104c300e6773aae5b9d3d75bf
-AUX nxserver-3.0.0-r3-setup.patch 1860 RMD160 6fecbc922badda99e83e4b188ecbb1f46be37fa3 SHA1 b98bd4357922e0a22ab37973ab3f82f4ab886baf SHA256 3bad0422a990e2cfb66512497a10e703967c1a0f3ae8579a054c65d38d3dbc3f
 AUX nxserver-3.0.0-r4-setup.patch 2240 RMD160 00e4b500e532fbdf700ee662a50f5967a0eb31c0 SHA1 ba0ee1ba2cb198a6d06c1ee4e2414cd88cc5dfa5 SHA256 9517e84c742ca444d46bc15cf71a56c8ae5026092a2c2bcedf0cb8d23c2e15d0
-DIST nxserver-3.0.0-69.i386.tar.gz 6665215 RMD160 30e549cbbecaf99f6a3bb92f314de83111672388 SHA1 9e4b3e6e5ebdf764b17527c6130c7fd14358c816 SHA256 c461d231a190b489c42b98ce91de6d65217ab41c35bf4290286813d894eb0ccb
-DIST nxserver-3.0.0-69.x86_64.tar.gz 7714184 RMD160 0ab587a0745c9159fa90e1e61a86ace4f727e9ad SHA1 8e9a433ce11f98441d9ce8efb110fbb920d5ea92 SHA256 84f9f3d07ff4e46f6852a9a21945a1e6ba0837fdd450e9102b86e6fc0a80e59a
-DIST nxserver-3.0.0-79.i386.tar.gz 6683894 RMD160 1ea1aa93ef6a23d55dca8be4c7845d490097890a SHA1 3b46592856726e5a58e5df10f8469cc0526867a0 SHA256 161db58a5a0be991413e406db4837633d11ac2212baa289ec532fe029719a94e
-DIST nxserver-3.0.0-79.x86_64.tar.gz 7735239 RMD160 e44cd3b09d040a4c1522e9c422cf209779ee3984 SHA1 50fc87981e199b17c1202aae41bab278d49aea2e SHA256 9f79040c63c49322be1ca99a41c6894cabe2c6df39134e964fe7275c6e8957b1
 DIST nxserver-3.1.0-2.i386.tar.gz 6723064 RMD160 f70d8a5f719405c1c795f28a4be46e0dfd28db8e SHA1 fe416e0efbcb9b3acf152ec88c9db5ca0726cb32 SHA256 f06c9a9db881a496b05eba502761a5683249aaa64133401872d2853624083778
 DIST nxserver-3.1.0-2.x86_64.tar.gz 7734670 RMD160 c06423be2d84dcd89964a3df8471183bcb542b13 SHA1 4d7bead0e961569a38790fff312c05293bc58e0f SHA256 d67f60dfb6ecf9cf845498490a5f4c6bbc7884a23ac51f45a541297e87648da8
 DIST nxserver-3.1.0-4.i386.tar.gz 6730236 RMD160 e0b688cdf845db228add15b25a6f593e72851d49 SHA1 ecf0f778ffb801f7250c3483f23159ee30b4cda1 SHA256 fbb850ac4a210f80f8be14e044ff7368454fffb006e1f756326e7ce68ba6897a
 DIST nxserver-3.1.0-4.x86_64.tar.gz 7741750 RMD160 b1d324ad5243abbd2e445a8aaf08530b7405e53e SHA1 c308eacf48f9e74a858696f8cbbd6417556c5edd SHA256 eb999b96bee8c93d67451508581ae8613cc908c6303cf8357840ad2d8ce007d7
-EBUILD nxserver-freeedition-3.0.0-r3.ebuild 2415 RMD160 eabe41104c4466876b5f671abb3753266f77b232 SHA1 aead260b2e77971d45364020fa9e6c209b55032b SHA256 27fa372204418a19cc5df61ab3030cf2aadb81afcdca8254017974de2f743351
-EBUILD nxserver-freeedition-3.0.0-r4.ebuild 2434 RMD160 b37223097d4964378ecb1b5e43842ecdaeec17c8 SHA1 78ab8a4653c7e60d7736dd013d7c6322d7f22ba3 SHA256 e1b50509ac434a2186c45c8184056089d48973e08f3d31b8194e91199cd745ca
 EBUILD nxserver-freeedition-3.1.0-r1.ebuild 2427 RMD160 92edc11c9caccebade5dc4d8b78fe3735214aff1 SHA1 0d9359f77d34b6c9ede6c891883b0e532978f225 SHA256 9dfa2dd30d8cfc3efcaa37625e4613bd83369cca840accdbe82dea05b99ef4fa
 EBUILD nxserver-freeedition-3.1.0.ebuild 2426 RMD160 5ffb663b0758613893ca0a533f3b0b64c5d72a70 SHA1 6b123f7012f9f406009acb7a941df5981e99ea48 SHA256 c2b1e331fdfd8fe8243eefdf89de09a5b70a048c07f4bb1b5b8d002dc1df9b7b
-MISC ChangeLog 4100 RMD160 6022ba9c6ca544ac0c92e68d46c7ae5abd19de52 SHA1 26ae6dd97c56be697b1d530af6cc9535d00abc08 SHA256 6f1cf18741f59e3dec89ce5cb6efcce17f368775376eefaeb5b33255b2623e11
+MISC ChangeLog 4359 RMD160 1e1bf822d8d69793be4d1daef6174fdfc34df095 SHA1 3457674c074f00366f8fdd83cd3d1a62524290ed SHA256 5a61130c7ff6ed36342b98685a4d23e8e7ffbe8b1ad55152fb8604c68499f05d
 MISC metadata.xml 229 RMD160 36b4bf7d904838e36addc9c65e276eba42746844 SHA1 713c86b664acaa5ddaa5551907f76eb0ea9209d3 SHA256 445516ce54a07930b5cf708034023dddbc5fd8125be710709912ef849e623bc5