Drop old version, clean leftover files

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

6 files changed, 8 insertions, 320 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/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*
-}