adding missing patches and fix parallel build

Package-Manager: portage-2.1.6.7/cvs/Linux ppc

5 files changed, 119 insertions, 6 deletions

diff --git a/net-voip/gnugk/ChangeLog b/net-voip/gnugk/ChangeLog
index 13ed3640d66f..ebe450feb9f3 100644
--- a/net-voip/gnugk/ChangeLog
+++ b/net-voip/gnugk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/gnugk
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.6 2009/02/12 04:47:00 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.7 2009/04/08 17:18:48 volkmar Exp $
+
+  08 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/gnugk-2.2.7-configure.patch, +files/gnugk-2.2.7-firebird-2.1.patch,
+  gnugk-2.2.7.ebuild:
+  adding missing patches and fix parallel build
 
 *gnugk-2.2.7 (12 Feb 2009)
 
diff --git a/net-voip/gnugk/Manifest b/net-voip/gnugk/Manifest
index bfb72105e5c7..bce16a6bc7f9 100644
--- a/net-voip/gnugk/Manifest
+++ b/net-voip/gnugk/Manifest
@@ -1,8 +1,10 @@
+AUX gnugk-2.2.7-configure.patch 829 RMD160 d46e83e5cb71f208aa99c176d4f56041a2d50ec2 SHA1 2899cfdee53082c147940b5b91cd8d9569008856 SHA256 da72007bc2d61ba89eca1313888d8a1a0f76d982a44b33331a51bc61c7e8ac9e
+AUX gnugk-2.2.7-firebird-2.1.patch 2619 RMD160 be1b5db79cb77c944c519641b5905b7a4e6443f2 SHA1 6d913245f0cacb6fb5a40d2ce64f8d411b4dfe4c SHA256 cb0cad48bae59b9efb6642939d203c8fd32798271e0db61c22742966665be637
 AUX gnugk.confd 381 RMD160 4069a0b1a972a49b13e613b99659c2c784b24888 SHA1 4bff9f084bc4870368061a0dea0ce07241f7a7c2 SHA256 14f7edc893d5453446afcd46d744711ebab017f1c0caac0e25151beb347ab831
 AUX gnugk.rc6 522 RMD160 cb202253b9d5a97879ed4cbe44d678c688ac6433 SHA1 93913dafd8bf1456c72f3a5e2aee300281f7daa0 SHA256 d2fef2854aeef665f3f84eb62411ac5e5e3a0581dfd873ca61f2942b67443db9
 DIST gnugk-2.2.5.tar.gz 1126814 RMD160 dcddaeea50bfa388ddceaf4651161a5e8fdaa83b SHA1 f52890d83767fe1c06e1d893ada1791d96b98448 SHA256 f7ad113b1979bd0b2a15eff3b3e28e47c62026552d2c926767ad8a8aff44af81
 DIST gnugk-2.2.7.tar.gz 1160654 RMD160 b59183c067124b931eb4a79debbadb4fbe053154 SHA1 edf4548702a053ea042db91ff3085853c10ad426 SHA256 4cdace4970977c69d0cdf88841f025eb0e96578bfe9b3ecc45b33ccb6efb2073
 EBUILD gnugk-2.2.5.ebuild 1133 RMD160 f78f768e119c785fa22c38a28f325c92ffc527ee SHA1 51cd8509f0b942e6503a1bc7b207e38e53a95d5e SHA256 2b786fa301e2be434360a8ba899e303228ae1a995906efdc7bc39b03ddc22f7d
-EBUILD gnugk-2.2.7.ebuild 3066 RMD160 91d4fc8f6c6e0856c71a7777ea9e95e99846b203 SHA1 5a62a91dde547dbf54e84df9ff731e7918e3f9a1 SHA256 7f5e43710e46f6c47991f85fcd932fb5d153f4b7cf86750d356767b7b0d81009
-MISC ChangeLog 2381 RMD160 26ef15b34301e3106967e23b9580b6cfd7b7e2fc SHA1 c13b51977eaf97b054fb7f4c4a2134591f27da85 SHA256 4e9542d205d38144f3cb750c536e2517dd2897ab0bffef0826739d8ce6a4bd55
+EBUILD gnugk-2.2.7.ebuild 3144 RMD160 5dc0e1ae5fd20fbf47d9be98f23e5d17aa836d0e SHA1 7a3a5b5963d0d3ac42c7a69c44c0ef3475e2e07c SHA256 5a94b5b6c175c490639fa70fdd5481a7237047fd106de2971def96752118859c
+MISC ChangeLog 2579 RMD160 94a2dfb7d52d051ceb010c277a2363979c58fc39 SHA1 deca8755906e101152b277d72858e8b7655296ac SHA256 83942d387051d36913e6411511732341976b18671db2d16dfa8d3cc19285cd4d
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
diff --git a/net-voip/gnugk/files/gnugk-2.2.7-configure.patch b/net-voip/gnugk/files/gnugk-2.2.7-configure.patch
new file mode 100644
index 000000000000..d4a589719b36
--- /dev/null
+++ b/net-voip/gnugk/files/gnugk-2.2.7-configure.patch
@@ -0,0 +1,26 @@
+--- 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
new file mode 100644
index 000000000000..9696c12c5bd6
--- /dev/null
+++ b/net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch
@@ -0,0 +1,79 @@
+--- 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/gnugk-2.2.7.ebuild b/net-voip/gnugk/gnugk-2.2.7.ebuild
index c259daba46cb..46af604d7c7a 100644
--- a/net-voip/gnugk/gnugk-2.2.7.ebuild
+++ b/net-voip/gnugk/gnugk-2.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/gnugk-2.2.7.ebuild,v 1.1 2009/02/12 04:47:00 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/gnugk-2.2.7.ebuild,v 1.2 2009/04/08 17:18:49 volkmar Exp $
 
 EAPI="2"
 
@@ -60,8 +60,9 @@ src_compile() {
 	# `make debugdepend debugshared` and `make debug` failed (so no debug)
 	# `make optdepend optnoshared` also failed (so no static)
 
-	# fails with -j2
-	emake -j1 optdepend optshared || die "emake failed"
+	# splitting emake calls fixes parallel build issue
+	emake optdepend || die "emake optdepend failed"
+	emake optshared || die "emake optshared failed"
 
 	# build tool addpasswd
 	emake addpasswd || die "emake addpasswd failed"