Drop old version, clean leftover files

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

7 files changed, 13 insertions, 337 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 051d3d8f5e96..d30f59281f6f 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.64 2011/11/04 15:52:52 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.65 2012/04/23 09:59:28 voyageur Exp $
+
+  23 Apr 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/nx-2.1.0-deprecated-headers.patch,
+  -files/nx-2.1.0-invalid-options.patch, -files/nx-3.1.0-gcc-4.3.patch,
+  -files/nx-3.3.0-nxcomp-glibc2.10.patch, -nx-3.4.0-r3.ebuild:
+  Drop old version, clean leftover files
 
 *nx-3.5.0-r2 (04 Nov 2011)
 
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 99b032571f79..e083eb19cd86 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -3,37 +3,25 @@ Hash: SHA256
 
 AUX 1.5.0/nx-x11-1.5.0-tmp-exec.patch 349 RMD160 083862e5563962764e9d78f50a37576bac9913cc SHA1 97402172c1039e4f86b977f27a4571a8a77d1c6b SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971
 AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e80cea SHA1 f3febd574eb07c244a6fc91323631f99fad5fa34 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e
-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
 AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 RMD160 1d71a4b9b1e1499b032bf8e32523881554eb278e SHA1 5e5417d4a2fd5f0e3d5c447876f3c8e912c78a34 SHA256 7674e887e1be1134110e2219a96b413efa2b32d9be50de77d15b9dcbad8a4d76
 AUX nx-3.3.0-cflags.patch 1322 RMD160 04228677d9e948843d7ad44c9663dbb96159bdac SHA1 41c873be0ce50ddb4fc6d965213c7bbd61647328 SHA256 88e9506a5809e1357c29b4f0ec1777b69335e35e90a22ab14f98fd616d67fc6e
-AUX nx-3.3.0-nxcomp-glibc2.10.patch 455 RMD160 dbb8ff05d042ec8a565f55dae51ddc51d8ed0854 SHA1 3c5522c749764fc42e549c87930790cac60fd01e SHA256 3d9938912d565962e7f00b4dfc1549b6a71de5335c97206658d4088a7122508d
 AUX nx-3.5.0-libpng15.patch 835 RMD160 7c6685ee2e2ad4d5ac69052123bc1403d149388f SHA1 e72fccc7b55d0bd16d155e7c225b21034aa604ab SHA256 04333308521101d7ed751d98c45ed4e34ca6e1f940a2e5914ad1c10b9d7a83db
-DIST nx-X11-3.4.0-3.tar.gz 20245244 RMD160 98f0a39ce7dd0ba2ddfe6f1e7db0c8a2384b78e4 SHA1 74dbc9cfea6d93361e362298421cdac82f5d910d SHA256 7819ffb49859277ae5003574b683410c6ff03e80dfb523da7c32dbf70774a903
 DIST nx-X11-3.5.0-2.tar.gz 20345475 RMD160 85ca4499c46fce1bebbf7b96101dd764d1ba7f35 SHA1 cf85890dad11cb9edc382d7e540fdc866fe82e04 SHA256 11a48ea553c31da9f04a1dfa0a190efa7eed3b6bd4280a22ddbd602a754cbe22
-DIST nxagent-3.4.0-11.tar.gz 1558371 RMD160 cf9eacae4fcd76cd4dee895ec47d1c3867c99201 SHA1 25d0090c99df7513b0979773c22fe75084404683 SHA256 0fc1a4b0888a51047d9771031668ab1e8d7a02aa0d733597e8a820098b924026
 DIST nxagent-3.5.0-5.tar.gz 1515411 RMD160 092a8f79416a6426fd7f982e8698086658917446 SHA1 e7b013e7c349fb8a69046f2eaa7f325b4fd96be8 SHA256 74ebd64d350002433e93a4a13dddbbee416547e6a33048a044272bf4412ad864
 DIST nxagent-3.5.0-7.tar.gz 1521470 RMD160 ac83227100a1b8d88b9bf29ab5fd13a4c6b3d66c SHA1 85d1ec4e36ed9899ae964fa532b958c4f514b037 SHA256 5dc8f1125f1c225a676e44817dc44b2460dfa3f6d8f8df047dc835ba24545ff2
-DIST nxauth-3.4.0-1.tar.gz 30613 RMD160 ccae2bd5983905666e50e67697f4e19c3a72ffbb SHA1 3d367e0e11baeca8028a73473deace0aec998cd0 SHA256 49b20af35ccd16f5871e409f959a692d4dca3d65ea6d5f7007daa81adebb400b
 DIST nxauth-3.5.0-1.tar.gz 30671 RMD160 497e602744a2421da294aad5cc3122e8c8e00047 SHA1 d876bb0e8df7978f3142c92cf804f5b6f486f0c7 SHA256 93d730075c486dba7c8fdd41e1465f0712237cb9580d195f65784ce203ce3257
-DIST nxcomp-3.4.0-1.tar.gz 534482 RMD160 1ed59164ca73e2c52d560bf15d3a350a512716ce SHA1 6ebc7451896293df2b6fb488567d70d686ece9ee SHA256 db439fde378776997775294b01933e28c1ecd3670ace8b4cf7d831177006d73a
 DIST nxcomp-3.5.0-2.tar.gz 532999 RMD160 b537b40aedcc0eca6cfac14da8ff702857e04c28 SHA1 4028078d3318c2287b13b1c81f2ce1ccb69273ad SHA256 30a51228509a083b4196e86596a6efb85b2e75e703f5d842158c9a27abb6ebc6
-DIST nxcompext-3.4.0-1.tar.gz 90215 RMD160 99205a950af62641a04faf234431f7411b06320f SHA1 2a594c6cdb837a2de20079db0702daa2ba1c288f SHA256 75be77fe0cdc3aca21afd0b72590d600b131b849b8e65926c237c3d87dd1160e
 DIST nxcompext-3.5.0-1.tar.gz 91725 RMD160 69a8ed8e0f3ddd2ef57c3a2898f4bcc0e90adb76 SHA1 91a26af67e455d68822737934a08c9990674408f SHA256 abc94c5465ea72f2aa282680b06ca840d70edb8b4d9e512b69acc0dbaa7f8af1
-DIST nxcompshad-3.4.0-3.tar.gz 77220 RMD160 861366ef776aa71fcfdba25ae21e8ece135ad8fc SHA1 93df71868b7eb74cb9fae9f4f8b9630e51f8191a SHA256 8c5a67ea156afb0fb2a50adbb89b8b26b6f0860cf3f53c45eb53f59ec4deaa98
 DIST nxcompshad-3.5.0-2.tar.gz 77293 RMD160 5bfb7b929cf6a809dd279254df37f83721aa2f1f SHA1 9866dce14f001934360190d1ff03ee5ee4908cd5 SHA256 555174018acd10b53f8db1e812e43f589ec1e531e5e1d79d967850fda8215d95
-DIST nxproxy-3.4.0-2.tar.gz 80209 RMD160 137fc074cb7690fa87db17ab048f3435adecd6cb SHA1 7d359c3e50708c4e774b126cc1e646c5f6ed3c3a SHA256 ecf740db00f2a223f520809f6cf5623d05eb2709e2ea8eadfb9a97b906fabfa6
 DIST nxproxy-3.5.0-1.tar.gz 80194 RMD160 82d0e132c94ff259485ac166fa4ac380bb9371f5 SHA1 b2ca6cc1bfe1cf667f2fcd77b8fe958d1712748c SHA256 8aa59727dfcd914d73447992120e100c20d17df5aeb42c4ac6712e13d56bbb1e
-EBUILD nx-3.4.0-r3.ebuild 4039 RMD160 6e9d8cf5bcad6d6328b55388585d4e9cb89f427f SHA1 8332d2b1f4e170ce3120ab4fdb5c525f86727c74 SHA256 855171e4d6642811afb11f9e97901edd143855b82c03839d354c68128629b71c
 EBUILD nx-3.5.0-r1.ebuild 3374 RMD160 860dfd57b12a4ec6cf70ea88e1d006025b008377 SHA1 ce6d1196f1b4abcfa0b5066356997a6a67be764d SHA256 79b28bb4c5c61a8bc079ae73c9f98fea973596d553da18c28ac166a2d67a5036
 EBUILD nx-3.5.0-r2.ebuild 3374 RMD160 83748e6cab159aa6d375eb17cfeeca30ede952a3 SHA1 89aac89f15e9c33698dadaaf45af0c1ad25025de SHA256 922b2406d5ca48b11ee055ccaea4a1b0124255e3a5b03d186c241c55794f1922
-MISC ChangeLog 9681 RMD160 c278e93be6dc9ab1cfb4f8393450564ae82550a3 SHA1 08a50134c5f86f81656f3faa6d129a3431ef9c66 SHA256 9e47d1eaebcad5a86815e1e7e94a5723c638d2203ee345f3c3dfcc0d1f52df32
+MISC ChangeLog 9957 RMD160 15d2d1e0c010d0c8e2f0394f1b954137a7d6efca SHA1 4169fa381a1095ef468f96bb6ba28b77e45a3ac9 SHA256 7d62a0185dfca36e1dfde45947f328de469ce52351f82fa76220be3248e5910e
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk60Cl8ACgkQFYEBGcdFJfJtcQD/Q3mRxLLMXcnv9GatTMo61W9O
-dbJyWqJ8h9yOSVEQV/QA+wTHuFDIwC041vkZRdYoqV1trdojYMy3NHpAu+z39WVv
-=lSYy
+iF4EAREIAAYFAk+VKAwACgkQFYEBGcdFJfLjeQD+OIUlOvzO8BoOB4/r98iIE2z1
+VIJsHIggUkoBnhesUIMA/Rd8QMmdXrLLNCzxOHlygbArECgDl7GpfMqih5zeBBJx
+=kr7J
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch b/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch
deleted file mode 100644
index c9741d5ca53e..000000000000
--- a/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -urN BlockCacheSet.cpp BlockCacheSet.cpp
---- BlockCacheSet.cpp	2006-11-05 13:22:45.963189321 +0000
-+++ BlockCacheSet.cpp	2006-11-05 13:23:25.000000000 +0000
-@@ -15,7 +15,9 @@
- /*                                                                        */
- /**************************************************************************/
- 
--#include <iostream.h>
-+using namespace std;
-+
-+#include <iostream>
- #include "BlockCacheSet.h"
- 
- 
-diff -urN Loop.cpp Loop.cpp
---- Loop.cpp	2006-11-05 13:22:45.854205948 +0000
-+++ Loop.cpp	2006-11-05 13:23:25.000000000 +0000
-@@ -15,6 +15,8 @@
- /*                                                                        */
- /**************************************************************************/
- 
-+using namespace std;
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -29,7 +31,7 @@
- #include <dirent.h>
- #include <pwd.h>
- 
--#include <fstream.h>
-+#include <fstream>
- #include <fcntl.h>
- 
- #include <sys/types.h>
-diff -urN Message.cpp Message.cpp
---- Message.cpp	2006-11-05 13:22:45.963189321 +0000
-+++ Message.cpp	2006-11-05 13:23:25.000000000 +0000
-@@ -15,8 +15,10 @@
- /*                                                                        */
- /**************************************************************************/
- 
-+using namespace std;
-+
- #include <stdio.h>
--#include <fstream.h>
-+#include <fstream>
- #include <unistd.h>
- #include <string.h>
- 
-diff -urN Misc.cpp Misc.cpp
---- Misc.cpp	2006-11-05 13:22:45.701229285 +0000
-+++ Misc.cpp	2006-11-05 13:23:25.000000000 +0000
-@@ -15,7 +15,9 @@
- /*                                                                        */
- /**************************************************************************/
- 
--#include <iostream.h>
-+using namespace std;
-+
-+#include <iostream>
- #include <stdio.h>
- #include <ctype.h>
- #include <stdlib.h>
-diff -urN Misc.h Misc.h
---- Misc.h	2006-11-05 13:22:45.643238132 +0000
-+++ Misc.h	2006-11-05 13:23:25.000000000 +0000
-@@ -18,8 +18,10 @@
- #ifndef Misc_H
- #define Misc_H
- 
--#include <iostream.h>
--#include <fstream.h>
-+using namespace std;
-+
-+#include <iostream>
-+#include <fstream>
- 
- #include <errno.h>
- #include <string.h>
-diff -urN Proxy.cpp Proxy.cpp
---- Proxy.cpp	2006-11-05 13:22:45.856205642 +0000
-+++ Proxy.cpp	2006-11-05 13:23:25.000000000 +0000
-@@ -15,10 +15,12 @@
- /*                                                                        */
- /**************************************************************************/
- 
-+using namespace std;
-+
- #include <stdio.h>
- #include <unistd.h>
- #include <stdlib.h>
--#include <fstream.h>
-+#include <fstream>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-diff -urN Split.cpp Split.cpp
---- Split.cpp	2006-11-05 13:22:45.797214643 +0000
-+++ Split.cpp	2006-11-05 13:23:25.000000000 +0000
-@@ -15,7 +15,9 @@
- /*                                                                        */
- /**************************************************************************/
- 
--#include <fstream.h>
-+using namespace std;
-+
-+#include <fstream>
- #include <unistd.h>
- #include <string.h>
- #include <sys/stat.h>
diff --git a/net-misc/nx/files/nx-2.1.0-invalid-options.patch b/net-misc/nx/files/nx-2.1.0-invalid-options.patch
deleted file mode 100644
index 17e4f43a0b6e..000000000000
--- a/net-misc/nx/files/nx-2.1.0-invalid-options.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.in	2006-11-04 19:37:56.000000000 +0000
-+++ configure.in	2006-11-04 19:38:23.000000000 +0000
-@@ -52,35 +52,6 @@
- AC_PROG_CC
- AC_LANG_CPLUSPLUS
- 
--dnl Check whether option -Wno-deprecated
--dnl is needed by GCC compiler.
--
--AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
--gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
--case "${gcc_version}" in
--     gcc*)
--        AC_MSG_RESULT([yes])
--        CXXFLAGS="$CXXFLAGS -Wno-deprecated"
--        ;;
--
--     *)
--        AC_MSG_RESULT([no])
--        ;;
--esac
--
--AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and -Wnested-externs])
--gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
--case "${gcc_version}" in
--     gcc*)
--        AC_MSG_RESULT([no])
--        ;;
--
--     *)
--        AC_MSG_RESULT([yes])
--        CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
--        ;;
--esac
--
- dnl Check for BSD compatible install.
- 
- AC_PROG_INSTALL
diff --git a/net-misc/nx/files/nx-3.1.0-gcc-4.3.patch b/net-misc/nx/files/nx-3.1.0-gcc-4.3.patch
deleted file mode 100644
index 112c697e104b..000000000000
--- a/net-misc/nx/files/nx-3.1.0-gcc-4.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- nxcompshad/Misc.h
-+++ nxcompshad/Misc.h
-@@ -18,10 +18,10 @@
- #ifndef Misc_H
- #define Misc_H
- 
--#include <iostream.h>
-+#include <iostream>
- 
--#include <errno.h>
--#include <string.h>
-+#include <cerrno>
-+#include <cstring>
- 
- //
- // Error handling macros.
-@@ -35,6 +35,6 @@
- // Log file.
- //
- 
--extern ostream *logofs;
-+extern std::ostream *logofs;
- 
- #endif /* Misc_H */
diff --git a/net-misc/nx/files/nx-3.3.0-nxcomp-glibc2.10.patch b/net-misc/nx/files/nx-3.3.0-nxcomp-glibc2.10.patch
deleted file mode 100644
index 12267c71e003..000000000000
--- a/net-misc/nx/files/nx-3.3.0-nxcomp-glibc2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Loop.cpp.orig	2009-07-06 12:38:10.000000000 +0200
-+++ Loop.cpp	2009-07-06 12:38:14.000000000 +0200
-@@ -10979,7 +10979,7 @@
-                                       packMethod == PACK_LOSSLESS ||
-                                           packMethod == PACK_ADAPTIVE)
-   {
--    char *dash = rindex(opt, '-');
-+    const char *dash = rindex(opt, '-');
- 
-     if (dash != NULL && strlen(dash) == 2 &&
-             *(dash + 1) >= '0' && *(dash + 1) <= '9')
diff --git a/net-misc/nx/nx-3.4.0-r3.ebuild b/net-misc/nx/nx-3.4.0-r3.ebuild
deleted file mode 100644
index 45207a27b6b3..000000000000
--- a/net-misc/nx/nx-3.4.0-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.4.0-r3.ebuild,v 1.7 2011/10/26 18:34:04 ssuominen 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-11.tar.gz"
-SRC_NXAUTH="nxauth-$PV-1.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-1.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-1.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 ~ppc 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/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg"
-
-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
-	epatch "${FILESDIR}"/${PN}-3.5.0-libpng15.patch
-	# GCC 4.4 + glibc 2.10
-	epatch "${FILESDIR}"/${PN}-3.3.0-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}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-}
-
-src_configure() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	econf || die "nxcomp econf failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-	econf || die "nxcompshad econf failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	econf || die "nxproxy econf failed"
-
-	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
-	econf || die "nxcompext econf failed"
-}
-
-src_compile() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	emake || die "nxcomp emake failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-	emake || die "nxcompshad emake failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	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"
-	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*
-}