Remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

7 files changed, 8 insertions, 852 deletions

diff --git a/net-voip/gnugk/ChangeLog b/net-voip/gnugk/ChangeLog
index 76a2464fc686..78c64f09a692 100644
--- a/net-voip/gnugk/ChangeLog
+++ b/net-voip/gnugk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/gnugk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.14 2013/12/15 12:23:19 moult Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.15 2014/06/26 14:07:24 kensington Exp $
+
+  26 Jun 2014; Michael Palimaka <kensington@gentoo.org>
+  -files/gnugk-2.2.7-configure.patch, -files/gnugk-2.2.7-firebird-2.1.patch,
+  -files/gnugk-2.2.8-firebird-2.1.patch, -files/gnugk-3.2.2-ptrace.patch,
+  -gnugk-3.2.2.ebuild, -gnugk-3.3.4.ebuild:
+  Remove old.
 
   15 Dec 2013; Dion Moult <moult@gentoo.org> -gnugk-2.2.7.ebuild,
   -gnugk-2.2.8.ebuild:
diff --git a/net-voip/gnugk/files/gnugk-2.2.7-configure.patch b/net-voip/gnugk/files/gnugk-2.2.7-configure.patch
deleted file mode 100644
index d4a589719b36..000000000000
--- a/net-voip/gnugk/files/gnugk-2.2.7-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.old	2009-02-10 17:14:47.000000000 -0500
-+++ configure	2009-02-10 17:14:18.000000000 -0500
-@@ -3979,11 +3979,6 @@
- fi
- 
- 
--if test "x$pgsql" != "xno" -o "x$mysql" != "xno"; then
--	SOURCES="$SOURCES sqlauth.cxx sqlacct.cxx gksql.cxx"
--	HEADERS="$HEADERS sqlacct.h gksql.h"
--fi
--
- # Check whether --enable-firebird or --disable-firebird was given.
- if test "${enable_firebird+set}" = set; then
-   enableval="$enable_firebird"
-@@ -4242,6 +4237,11 @@
- fi
- 
- 
-+if test "x$pgsql" != "xno" -o "x$mysql" != "xno" -o "x$firebird" != "xno"; then
-+	SOURCES="$SOURCES sqlauth.cxx sqlacct.cxx gksql.cxx"
-+	HEADERS="$HEADERS sqlacct.h gksql.h"
-+fi
-+
- 
- GNUGK_MAJOR_VERSION=`cat version.h | grep "define GNUGK_MAJOR_VERSION" | cut -f4 -d' '`
- GNUGK_MINOR_VERSION=`cat version.h | grep "define GNUGK_MINOR_VERSION" | cut -f4 -d' '`
diff --git a/net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch b/net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch
deleted file mode 100644
index 9696c12c5bd6..000000000000
--- a/net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- gksql_firebird.cxx.old	2009-02-10 21:43:26.000000000 +0100
-+++ gksql_firebird.cxx	2009-02-10 21:58:06.000000000 +0100
-@@ -342,11 +342,11 @@
- 	if (status[0] == 1 && status[1] != 0) {
- 		m_numRows = m_sqlRow;
- 		if (retval != 100) {
--			long errcode = isc_sqlcode(status);
-+			ISC_STATUS errcode = isc_sqlcode(status);
- 			char errormsg[512];
- 			if (errcode == -999) {
- 				errcode = status[1];
--				long *pvector = status;
-+				ISC_STATUS *pvector = status;
- 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 			} else {
- 				strcpy(errormsg, "SQL:");
-@@ -392,7 +392,7 @@
- 			char errormsg[512];
- 			if (errcode == -999) {
- 				errcode = status[1];
--				long *pvector = status;
-+				ISC_STATUS *pvector = status;
- 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 			} else {
- 				strcpy(errormsg, "SQL:");
-@@ -472,7 +472,7 @@
- 	
- 	isc_attach_database(status, 0, const_cast<char*>(dbname.c_str()), &conn, dpb_offset, &(dpb[0]));
- 	if (status[0] == 1 && status[1] != 0) {
--		long *pvector = status;
-+		ISC_STATUS *pvector = status;
- 		char errormsg[512];
- 		errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		PTRACE(2, GetName() << "\tFirebird connection to " << m_username << '@' << dbname 
-@@ -505,7 +505,7 @@
- 	
- 	isc_start_transaction(status, &tr, 1, &conn, 0, NULL);
- 	if (status[0] == 1 && status[1] != 0) {
--		long *pvector = status;
-+		ISC_STATUS *pvector = status;
- 		char errormsg[512];
- 		errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		return new GkIBSQLResult(status[1], errormsg);
-@@ -516,7 +516,7 @@
- 		long errorcode = isc_sqlcode(status);
- 		if (errorcode == -999) {
- 			errorcode = status[1];
--			long *pvector = status;
-+			ISC_STATUS *pvector = status;
- 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		} else {
- 			strcpy(errormsg, "SQL:");
-@@ -536,7 +536,7 @@
- 		long errorcode = isc_sqlcode(status);
- 		if (errorcode == -999) {
- 			errorcode = status[1];
--			long *pvector = status;
-+			ISC_STATUS *pvector = status;
- 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		} else {
- 			strcpy(errormsg, "SQL:");
-@@ -558,7 +558,7 @@
- 			long errorcode = isc_sqlcode(status);
- 			if (errorcode == -999) {
- 				errorcode = status[1];
--				long *pvector = status;
-+				ISC_STATUS *pvector = status;
- 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 			} else {
- 				strcpy(errormsg, "SQL:");
-@@ -575,7 +575,7 @@
- 		long errorcode = isc_sqlcode(status);
- 		if (errorcode == -999) {
- 			errorcode = status[1];
--			long *pvector = status;
-+			ISC_STATUS *pvector = status;
- 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		} else {
- 			strcpy(errormsg, "SQL:");
diff --git a/net-voip/gnugk/files/gnugk-2.2.8-firebird-2.1.patch b/net-voip/gnugk/files/gnugk-2.2.8-firebird-2.1.patch
deleted file mode 100644
index 2ba55f7ea135..000000000000
--- a/net-voip/gnugk/files/gnugk-2.2.8-firebird-2.1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- gksql_firebird.cxx.old	2009-02-11 01:31:53.000000000 +0100
-+++ gksql_firebird.cxx	2009-02-11 01:31:59.000000000 +0100
-@@ -370,7 +370,7 @@
- 			char errormsg[512];
- 			if (errcode == -999) {
- 				errcode = status[1];
--				long *pvector = status;
-+				ISC_STATUS *pvector = status;
- 				// TODO: replace all isc_interprete() with fb_interpret()
- 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 			} else {
-@@ -417,7 +417,7 @@
- 			char errormsg[512];
- 			if (errcode == -999) {
- 				errcode = status[1];
--				long *pvector = status;
-+				ISC_STATUS *pvector = status;
- 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 			} else {
- 				strcpy(errormsg, "SQL:");
-@@ -497,7 +497,7 @@
- 	
- 	isc_attach_database(status, 0, const_cast<char*>(dbname.c_str()), &conn, dpb_offset, &(dpb[0]));
- 	if (status[0] == 1 && status[1] != 0) {
--		long *pvector = status;
-+		ISC_STATUS *pvector = status;
- 		char errormsg[512];
- 		errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		PTRACE(2, GetName() << "\tFirebird connection to " << m_username << '@' << dbname 
-@@ -530,7 +530,7 @@
- 	
- 	isc_start_transaction(status, &tr, 1, &conn, 0, NULL);
- 	if (status[0] == 1 && status[1] != 0) {
--		long *pvector = status;
-+		ISC_STATUS *pvector = status;
- 		char errormsg[512];
- 		errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		return new GkIBSQLResult(status[1], errormsg);
-@@ -541,7 +541,7 @@
- 		long errorcode = isc_sqlcode(status);
- 		if (errorcode == -999) {
- 			errorcode = status[1];
--			long *pvector = status;
-+			ISC_STATUS *pvector = status;
- 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		} else {
- 			strcpy(errormsg, "SQL:");
-@@ -562,7 +562,7 @@
- 		long errorcode = isc_sqlcode(status);
- 		if (errorcode == -999) {
- 			errorcode = status[1];
--			long *pvector = status;
-+			ISC_STATUS *pvector = status;
- 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		} else {
- 			strcpy(errormsg, "SQL:");
-@@ -585,7 +585,7 @@
- 			long errorcode = isc_sqlcode(status);
- 			if (errorcode == -999) {
- 				errorcode = status[1];
--				long *pvector = status;
-+				ISC_STATUS *pvector = status;
- 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 			} else {
- 				strcpy(errormsg, "SQL:");
-@@ -603,7 +603,7 @@
- 		long errorcode = isc_sqlcode(status);
- 		if (errorcode == -999) {
- 			errorcode = status[1];
--			long *pvector = status;
-+			ISC_STATUS *pvector = status;
- 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
- 		} else {
- 			strcpy(errormsg, "SQL:");
diff --git a/net-voip/gnugk/files/gnugk-3.2.2-ptrace.patch b/net-voip/gnugk/files/gnugk-3.2.2-ptrace.patch
deleted file mode 100644
index 897f99f007f8..000000000000
--- a/net-voip/gnugk/files/gnugk-3.2.2-ptrace.patch
+++ /dev/null
@@ -1,421 +0,0 @@
-diff -ur a/capctrl.cxx b/capctrl.cxx
---- a/capctrl.cxx	2011-11-28 13:33:41.000000000 +0100
-+++ b/capctrl.cxx	2013-03-06 02:53:41.038731734 +0100
-@@ -255,6 +255,7 @@
- 	m_cliCallVolumes = cliCallVolumes;
- 
- 	PTRACE(5, "CAPCTRL\t" << ipRules << " IP rules loaded");
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
- 		strm << "Per IP call volume rules:" << endl;
-@@ -264,8 +265,10 @@
- 		}
- 		PTrace::End(strm);
- 	}
-+#endif
- 
- 	PTRACE(5, "CAPCTRL\t" << h323IdRules << " H.323 ID rules loaded");
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
- 		strm << "Per H.323 ID call volume rules:" << endl;
-@@ -275,8 +278,10 @@
- 		}
- 		PTrace::End(strm);
- 	}
-+#endif
- 
- 	PTRACE(5, "CAPCTRL\t" << cliRules << " CLI rules loaded");
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
- 		strm << "Per CLI call volume rules:" << endl;
-@@ -286,6 +291,7 @@
- 		}
- 		PTrace::End(strm);
- 	}
-+#endif
- }
- 
- PString CapacityControl::PrintRules()
-diff -ur a/clirw.cxx b/clirw.cxx
---- a/clirw.cxx	2012-05-07 16:18:04.000000000 +0200
-+++ b/clirw.cxx	2013-03-06 02:53:41.038731734 +0100
-@@ -456,6 +456,7 @@
- 	}
- 	
- 	PTRACE(5, "CLIRW\t" << inboundRules << " inbound rules loaded");
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
- 		strm << "Inbound CLI rewrite rules:" << endl;
-@@ -466,8 +467,10 @@
- 		}
- 		PTrace::End(strm);
- 	}
-+#endif
- 
- 	PTRACE(5, "CLIRW\t" << outboundRules << " outbound rules loaded");
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
- 		strm << "Outbound CLI rewrite rules:" << endl;
-@@ -480,6 +483,7 @@
- 			}
- 		PTrace::End(strm);
- 	}
-+#endif
- 
- 	m_processSourceAddress = Toolkit::AsBool(
- 		cfg->GetString(CLIRewriteSection, ProcessSourceAddress, "1")
-diff -ur a/gkacct.cxx b/gkacct.cxx
---- a/gkacct.cxx	2012-12-10 20:32:52.000000000 +0100
-+++ b/gkacct.cxx	2013-03-06 02:53:41.038731734 +0100
-@@ -919,6 +919,7 @@
- 		switch (status)
- 		{
- 		case GkAcctLogger::Ok:
-+#if PTRACING
- 			if (PTrace::CanTrace(3)) {
- 				ostream& strm = PTrace::Begin(3,__FILE__,__LINE__);
- 				strm << "GKACCT\t" << logger->GetName() << " logged event " << evt;
-@@ -926,9 +927,11 @@
- 					strm << " for call no. " << call->GetCallNumber();
- 				PTrace::End(strm);
- 			}
-+#endif
- 			break;
- 			
- 		default:
-+#if PTRACING
- 			if (PTrace::CanTrace(3)) {
- 				ostream& strm = PTrace::Begin(3, __FILE__, __LINE__);
- 				strm << "GKACCT\t" << logger->GetName() << " failed to log event " << evt;
-@@ -937,6 +940,7 @@
- 					strm << " for call no. " << call->GetCallNumber();
- 				PTrace::End(strm);
- 			}
-+#endif
- 			// required and sufficient rules always determine 
- 			// status of the request
- 			if (logger->GetControlFlag() == GkAcctLogger::Required
-@@ -954,7 +958,8 @@
- 	// a last rule determine status of the the request
- 	if (finalResult && status != GkAcctLogger::Ok)
- 		finalResult = false;
--		
-+
-+#if PTRACING		
- 	if (PTrace::CanTrace(2)) {
- 		ostream& strm = PTrace::Begin(2, __FILE__, __LINE__);
- 		strm << "GKACCT\t" << (finalResult ? "Successfully logged event " 
-@@ -965,6 +970,7 @@
- 		if (!finalResult)
- 			SNMP_TRAP(7, SNMPError, Accounting, "Failed to log event " + evt);
- 	}
-+#endif
- 	return finalResult;
- }
- 
-@@ -987,6 +993,7 @@
- 		switch (status)
- 		{
- 		case GkAcctLogger::Ok:
-+#if PTRACING
- 			if (PTrace::CanTrace(3)) {
- 				ostream& strm = PTrace::Begin(3,__FILE__,__LINE__);
- 				strm << "GKACCT\t" << logger->GetName() << " logged event " << evt;
-@@ -994,9 +1001,11 @@
- 					strm << " for endpoint " << ep->GetEndpointIdentifier().GetValue();
- 				PTrace::End(strm);
- 			}
-+#endif
- 			break;
- 			
- 		default:
-+#if PTRACING
- 			if (PTrace::CanTrace(3)) {
- 				ostream& strm = PTrace::Begin(3, __FILE__, __LINE__);
- 				strm << "GKACCT\t" << logger->GetName() << " failed to log event " << evt;
-@@ -1005,6 +1014,7 @@
- 				PTrace::End(strm);
- 				SNMP_TRAP(7, SNMPError, Accounting, logger->GetName() + " failed to log event " + PString(evt));
- 			}
-+#endif
- 			// required and sufficient rules always determine 
- 			// status of the request
- 			if (logger->GetControlFlag() == GkAcctLogger::Required
-@@ -1023,6 +1033,7 @@
- 	if (finalResult && status != GkAcctLogger::Ok)
- 		finalResult = false;
- 		
-+#if PTRACING
- 	if (PTrace::CanTrace(2)) {
- 		ostream& strm = PTrace::Begin(2, __FILE__, __LINE__);
- 		strm << "GKACCT\t" << (finalResult ? "Successfully logged event " 
-@@ -1033,6 +1044,7 @@
- 		if (!finalResult)
- 			SNMP_TRAP(7, SNMPError, Accounting, "Failed to log event " + evt);
- 	}
-+#endif
- 	return finalResult;
- }
- 
-diff -ur a/gkauth.cxx b/gkauth.cxx
---- a/gkauth.cxx	2012-12-03 10:29:52.000000000 +0100
-+++ b/gkauth.cxx	2013-03-06 02:53:38.494731795 +0100
-@@ -834,6 +834,7 @@
- 	}
- 
- 	if (mechanisms.GetSize() > 0 && algorithmOIDs.GetSize() > 0) {
-+#if PTRACING
- 		if (PTrace::CanTrace(4)) {
- 			ostream& strm = PTrace::Begin(4,__FILE__,__LINE__);
- 			strm <<"GkAuth\tH.235 capabilities selected for GCF:\n";
-@@ -845,6 +846,7 @@
- 				strm << "\t\t" << algorithmOIDs[i] << '\n';
- 			PTrace::End(strm);
- 		}
-+#endif
- #ifdef OpenH323Factory
- 	}
- #else
-diff -ur a/gk.cxx b/gk.cxx
---- a/gk.cxx	2013-01-04 13:20:20.000000000 +0100
-+++ b/gk.cxx	2013-03-06 02:53:38.494731795 +0100
-@@ -1076,9 +1076,11 @@
- bool Gatekeeper::InitLogging(const PArgList & args)
- {
- 	// Syslog is the default when compiled as service, but we don't want that
-+#if PTRACING
- 	PTrace::ClearOptions(PTrace::SystemLogStream);
- 	PTrace::SetOptions(PTrace::DateAndTime | PTrace::TraceLevel | PTrace::FileAndLine);
- 	PTrace::SetLevel(args.GetOptionCount('t'));
-+#endif
- 	if (args.HasOption('o')) {
- 		if (!SetLogFilename(args.GetOptionString('o'))) {
- 			cerr << "Warning: could not open the log file \""
-@@ -1563,7 +1565,9 @@
- 		EnableLogFileRotation(false);
- 	}
- 
-+#if PTRACING
- 	PTrace::SetStream(&cerr);
-+#endif
- 
- #ifndef hasDeletingSetStream
- 	delete m_logFile;
-@@ -1578,7 +1582,9 @@
- 		return false;
- 	}
- 	m_logFile->SetPosition(0, PFile::End);
-+#if PTRACING
- 	PTrace::SetStream(m_logFile);
-+#endif
- 	return true;
- }
- 
-@@ -1588,7 +1594,9 @@
- 
- 	if (m_logFile) {
- 		PTRACEX(1, "GK\tLogging closed (log file rotation)");
-+#if PTRACING
- 		PTrace::SetStream(&cerr); // redirect to cerr
-+#endif
- #ifndef hasDeletingSetStream
- 		delete m_logFile;
- #endif
-@@ -1625,7 +1633,9 @@
- 	}
- 
- 	m_logFile->SetPosition(0, PFile::End);
-+#if PTRACING
- 	PTrace::SetStream(m_logFile);
-+#endif
- 	PTRACEX(1, "GK\tLogging restarted\n" + Toolkit::GKVersion());
- 	return true;
- }
-@@ -1636,7 +1646,9 @@
- 
- 	if (m_logFile) {
- 		PTRACEX(1, "GK\tLogging closed (reopen log file)");
-+#if PTRACING
- 		PTrace::SetStream(&cerr); // redirect to cerr
-+#endif
- #ifndef hasDeletingSetStream
- 		delete m_logFile;
- #endif
-@@ -1665,7 +1677,9 @@
- 		}
- 	}
- 	m_logFile->SetPosition(0, PFile::End);
-+#if PTRACING
- 	PTrace::SetStream(m_logFile);
-+#endif
- 	PTRACEX(1, "GK\tLogging restarted\n" + Toolkit::GKVersion());
- 	return true;
- }
-@@ -1677,7 +1691,9 @@
- 	if (m_logFile) {
- 		PTRACEX(1, "GK\tLogging closed");
- 	}
-+#if PTRACING
- 	PTrace::SetStream(&cerr);
-+#endif
- #ifndef hasDeletingSetStream
- 	delete m_logFile;
- #endif
-diff -ur a/GkStatus.cxx b/GkStatus.cxx
---- a/GkStatus.cxx	2012-12-18 16:16:18.000000000 +0100
-+++ b/GkStatus.cxx	2013-03-06 02:53:38.494731795 +0100
-@@ -1314,6 +1314,7 @@
- 			);
- 	} else {
- 		if (args[1] *= "trc") {
-+#if PTRACING
- 			if(args.GetSize() >= 3) {
- 				if((args[2] == "-") && (PTrace::GetLevel() > 0)) 
- 					PTrace::SetLevel(PTrace::GetLevel()-1);
-@@ -1322,6 +1323,7 @@
- 				else PTrace::SetLevel(args[2].AsInteger());
- 			}
- 			WriteString(PString(PString::Printf, "Trace Level is now %d\r\n", PTrace::GetLevel()));
-+#endif
- 		} else if (args[1] *= "cfg") {
- 			if (args.GetSize()>=4)
- 				WriteString(GkConfig()->GetString(args[2],args[3],"") + "\r\n;\r\n");
-diff -ur a/ipauth.cxx b/ipauth.cxx
---- a/ipauth.cxx	2011-11-28 13:33:41.000000000 +0100
-+++ b/ipauth.cxx	2013-03-06 02:53:41.038731734 +0100
-@@ -226,6 +226,7 @@
- 	
- 	PTRACE(5, GetName() << "\t" << m_authList.size() << " entries loaded");
- 
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
- 		strm << GetName() << " entries:\n";
-@@ -238,6 +239,7 @@
- 		}
- 		PTrace::End(strm);
- 	}
-+#endif
- 
- 	if (dynamicCfg) {
- 		delete cfg;
-diff -ur a/RasSrv.cxx b/RasSrv.cxx
---- a/RasSrv.cxx	2012-12-28 16:21:55.000000000 +0100
-+++ b/RasSrv.cxx	2013-03-06 02:53:38.494731795 +0100
-@@ -244,6 +244,7 @@
- 		delete msg;
- 		return NULL;
- 	}
-+#if PTRACING
- 	if ((msg->GetTag() != H225_RasMessage::e_serviceControlIndication && msg->GetTag() != H225_RasMessage::e_serviceControlResponse)
- 		||  PTrace::CanTrace(5)) {
- 	if (PTrace::CanTrace(3))
-@@ -251,17 +252,20 @@
- 	else
- 		PTRACE(2, "RAS\tReceived " << msg->GetTagName() << " from " << AsString(msg->m_peerAddr, msg->m_peerPort));
- 	}
-+#endif
- 	msg->m_localAddr = GetLocalAddr(msg->m_peerAddr);
- 	return msg;
- }
- 
- bool RasListener::SendRas(const H225_RasMessage & rasobj, const Address & addr, WORD pt)
- {
-+#if PTRACING
- 	if ( ((rasobj.GetTag() != H225_RasMessage::e_serviceControlIndication && rasobj.GetTag() != H225_RasMessage::e_serviceControlResponse) && PTrace::CanTrace(3))
- 		|| PTrace::CanTrace(5))
- 		PTRACE(3, "RAS\tSend to " << AsString(addr, pt) << '\n' << setprecision(2) << rasobj);
- 	else
- 		PTRACE(2, "RAS\tSend " << RasName[rasobj.GetTag()] << " to " << AsString(addr, pt));
-+#endif
- 
- 	PPER_Stream wtstrm;
- 	rasobj.Encode(wtstrm);
-diff -ur a/RasTbl.cxx b/RasTbl.cxx
---- a/RasTbl.cxx	2013-01-04 13:20:20.000000000 +0100
-+++ b/RasTbl.cxx	2013-03-06 02:53:38.498731794 +0100
-@@ -1870,6 +1870,7 @@
- 		endpoints->push_back(routes.front().m_destEndpoint.operator->());
- 	}
- 
-+#if PTRACING
- 	if (PTrace::CanTrace(4)) {
- 		ostream &strm = PTrace::Begin(4, __FILE__, __LINE__);
- 		strm << "RASTBL\tPrefix match for gateways: ";
-@@ -1880,6 +1881,7 @@
- 		}
- 		PTrace::End(strm);
- 	}
-+#endif
- 
- 	return true;
- }
-diff -ur a/Routing.cxx b/Routing.cxx
---- a/Routing.cxx	2012-12-28 21:35:42.000000000 +0100
-+++ b/Routing.cxx	2013-03-06 02:53:38.498731794 +0100
-@@ -1452,6 +1452,7 @@
- 	PTRACE(5, "ROUTING\t" << m_name << " policy loaded with " << m_prefixes.size()
- 		<< " prefix entries");
- 
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		ostream &strm = PTrace::Begin(6, __FILE__, __LINE__);
- 		strm << "ROUTING\t" << m_name << " policy prefixes:" << endl;
-@@ -1461,6 +1462,7 @@
- 				<< m_prefixes[i].m_maxLength << endl;
- 		PTrace::End(strm);
- 	}
-+#endif
- }
- 
- bool NumberAnalysisPolicy::OnRequest(AdmissionRequest & request)
-diff -ur a/Toolkit.cxx b/Toolkit.cxx
---- a/Toolkit.cxx	2013-01-10 10:23:01.000000000 +0100
-+++ b/Toolkit.cxx	2013-03-06 02:53:38.498731794 +0100
-@@ -960,6 +960,7 @@
- 		return;
- 	}
- 
-+#if PTRACING
- 	if (PTrace::CanTrace(3) && (m_GWRewrite.GetSize() < 100)) {
- 		for (PINDEX i = 0; i < m_GWRewrite.GetSize(); ++i) {
- 			// In
-@@ -973,6 +974,7 @@
- 			}
- 		}
- 	}
-+#endif
- 	PTRACE(2, "GK\tLoaded " << m_GWRewrite.GetSize() << " GW entries with rewrite info");
- }
- 
-@@ -1581,7 +1583,9 @@
- 	// read the gatekeeper name from the config file, because it might be used as a key into the SQL config
- 	m_GKName = Config()->GetString("Name", "OpenH323GK");
- 
-+#if PTRACING
- 	PTrace::SetLevel(GkConfig()->GetInteger("TraceLevel", PTrace::GetLevel()));
-+#endif
- 
- 	// set the max size of an array in an ASN encoded message (eg. max length of alias list)
- 	PINDEX maxArraySize = GkConfig()->GetInteger("MaxASNArraySize", 0);
-diff -ur a/yasocket.cxx b/yasocket.cxx
---- a/yasocket.cxx	2012-12-10 20:32:52.000000000 +0100
-+++ b/yasocket.cxx	2013-03-06 02:53:38.498731794 +0100
-@@ -1018,10 +1018,12 @@
- 		return false;
- 	}
- 	ConfigReloadMutex.StartRead();
-+#if PTRACING
- 	if (PTrace::CanTrace(6)) {
- 		PString msg(PString::Printf, "\t%u sockets selected from %u, total %u/%u", slist.GetSize(), ss, m_socksize, m_rmsize);
- 		PTRACE(6, GetName() << msg);
- 	}
-+#endif
- 	return true;
- }
- 
diff --git a/net-voip/gnugk/gnugk-3.2.2.ebuild b/net-voip/gnugk/gnugk-3.2.2.ebuild
deleted file mode 100644
index 1e599a44047d..000000000000
--- a/net-voip/gnugk/gnugk-3.2.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/gnugk-3.2.2.ebuild,v 1.1 2013/03/06 02:09:40 chithanh Exp $
-
-EAPI="5"
-
-inherit eutils versionator
-
-MY_P1=${PN}-$(replace_version_separator 2 -)
-MY_P2=${PN}-$(get_version_component_range 1-2)
-
-DESCRIPTION="GNU H.323 gatekeeper"
-HOMEPAGE="http://www.gnugk.org/"
-SRC_URI="mirror://sourceforge/openh323gk/${MY_P1}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dev-db/firebird isn't keyworded for ppc but firebird IUSE is masked for ppc
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc firebird lua mysql odbc postgres radius snmp sqlite ssh linguas_en linguas_es linguas_fr"
-REQUIRED_USE="doc? (
-	|| ( linguas_en linguas_es linguas_fr )
-	)
-"
-
-RDEPEND="net-libs/ptlib:=
-	net-libs/h323plus:=
-	dev-libs/openssl
-	firebird? ( dev-db/firebird )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	snmp? ( net-analyzer/net-snmp )
-	ssh? ( net-libs/libssh )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/linuxdoc-tools )"
-
-S=${WORKDIR}/${MY_P2}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.2-ptrace.patch
-	epatch "${FILESDIR}"/${PN}-3.2.2-h323plus-buildopts.patch
-	epatch "${FILESDIR}"/${PN}-3.2.2-lua.cxx-toolkit_h.patch
-}
-
-# TODO: investigate possible ebuild conversion to use cmake
-src_configure() {
-	# --with-large-fdset=4096 is added because of bug #128102
-	# and it is recommended in the online manual
-	econf \
-		$(use_enable firebird) \
-		$(use_enable lua) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable odbc unixodbc) \
-		$(use_enable radius) \
-		$(use_enable snmp netsnmp) \
-		$(use_enable sqlite) \
-		$(use_enable ssh libssh) \
-		--with-large-fdset=4096
-}
-
-src_compile() {
-	# PASN_NOPRINT should be set for -debug but it's buggy
-	# better to prevent issues and keep default settings
-	# `make debugdepend debugshared` and `make debug` failed (so no debug)
-	# `make optdepend optnoshared` also failed (so no static)
-
-	# splitting emake calls fixes parallel build issue
-	emake optdepend
-	emake \
-		PT_LIBDIR="$(ptlib-config --libdir)" \
-		OH323_LIBDIR="${EPREFIX}"/usr/lib \
-		optshared
-	# build tool addpasswd
-	emake -C addpasswd PTLIBDIR="$(ptlib-config --ptlibdir)"
-
-	if use doc; then
-		cd docs/manual
-
-		if use linguas_en; then
-			emake html
-		fi
-
-		if use linguas_es; then
-			emake html-es
-		fi
-
-		if use linguas_fr; then
-			emake html-fr
-		fi
-		cd ../..
-	fi
-}
-
-src_install() {
-	dosbin obj_*_*_*/${PN}
-	dosbin addpasswd/obj_*_*_*/addpasswd
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins etc/*
-
-	dodoc changes.txt readme.txt
-	dodoc docs/*.txt docs/*.pdf
-
-	if use doc; then
-		if use linguas_en; then
-			dohtml docs/manual/manual*.html
-		fi
-		if use linguas_fr; then
-			dohtml docs/manual/fr/manual-fr*.html
-		fi
-		if use linguas_es; then
-			dohtml docs/manual/es/manual-es*.html
-		fi
-	fi
-
-	doman docs/${PN}.1 docs/addpasswd.1
-
-	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-voip/gnugk/gnugk-3.3.4.ebuild b/net-voip/gnugk/gnugk-3.3.4.ebuild
deleted file mode 100644
index 961cce05cd4f..000000000000
--- a/net-voip/gnugk/gnugk-3.3.4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/gnugk-3.3.4.ebuild,v 1.1 2013/07/11 23:19:23 chithanh Exp $
-
-EAPI="5"
-
-inherit eutils versionator
-
-MY_P1=${PN}-$(replace_version_separator 2 -)
-MY_P2=${PN}-$(get_version_component_range 1-2)
-
-DESCRIPTION="GNU H.323 gatekeeper"
-HOMEPAGE="http://www.gnugk.org/"
-SRC_URI="mirror://sourceforge/openh323gk/${MY_P1}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# dev-db/firebird isn't keyworded for ppc but firebird IUSE is masked for ppc
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc firebird lua mysql odbc postgres radius snmp sqlite ssh linguas_en linguas_es linguas_fr"
-REQUIRED_USE="doc? (
-	|| ( linguas_en linguas_es linguas_fr )
-	)
-"
-
-RDEPEND="net-libs/ptlib:=
-	net-libs/h323plus:=
-	dev-libs/openssl
-	firebird? ( dev-db/firebird )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	snmp? ( net-analyzer/net-snmp )
-	ssh? ( net-libs/libssh )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/linuxdoc-tools )"
-
-S=${WORKDIR}/${MY_P2}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.2-ptrace.patch
-	epatch "${FILESDIR}"/${PN}-3.2.2-h323plus-buildopts.patch
-	epatch "${FILESDIR}"/${PN}-3.2.2-lua.cxx-toolkit_h.patch
-}
-
-# TODO: investigate possible ebuild conversion to use cmake
-src_configure() {
-	# --with-large-fdset=4096 is added because of bug #128102
-	# and it is recommended in the online manual
-	econf \
-		$(use_enable firebird) \
-		$(use_enable lua) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable odbc unixodbc) \
-		$(use_enable radius) \
-		$(use_enable snmp netsnmp) \
-		$(use_enable sqlite) \
-		$(use_enable ssh libssh) \
-		--with-large-fdset=4096
-}
-
-src_compile() {
-	# PASN_NOPRINT should be set for -debug but it's buggy
-	# better to prevent issues and keep default settings
-	# `make debugdepend debugshared` and `make debug` failed (so no debug)
-	# `make optdepend optnoshared` also failed (so no static)
-
-	# splitting emake calls fixes parallel build issue
-	emake optdepend
-	emake \
-		PT_LIBDIR="$(ptlib-config --libdir)" \
-		OH323_LIBDIR="${EPREFIX}"/usr/lib \
-		optshared
-	# build tool addpasswd
-	emake -C addpasswd PTLIBDIR="$(ptlib-config --ptlibdir)"
-
-	if use doc; then
-		cd docs/manual
-
-		if use linguas_en; then
-			emake html
-		fi
-
-		if use linguas_es; then
-			emake html-es
-		fi
-
-		if use linguas_fr; then
-			emake html-fr
-		fi
-		cd ../..
-	fi
-}
-
-src_install() {
-	dosbin obj_*_*_*/${PN}
-	dosbin addpasswd/obj_*_*_*/addpasswd
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins etc/*
-
-	dodoc changes.txt readme.txt
-	dodoc docs/*.txt docs/*.pdf
-
-	if use doc; then
-		if use linguas_en; then
-			dohtml docs/manual/manual*.html
-		fi
-		if use linguas_fr; then
-			dohtml docs/manual/fr/manual-fr*.html
-		fi
-		if use linguas_es; then
-			dohtml docs/manual/es/manual-es*.html
-		fi
-	fi
-
-	doman docs/${PN}.1 docs/addpasswd.1
-
-	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}