version bump to 2.2.8 see bug 258518

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

4 files changed, 201 insertions, 2 deletions

diff --git a/net-voip/gnugk/ChangeLog b/net-voip/gnugk/ChangeLog
index ebe450feb9f3..7185dbf07c03 100644
--- a/net-voip/gnugk/ChangeLog
+++ b/net-voip/gnugk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2009/04/08 17:18:48 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/gnugk/ChangeLog,v 1.8 2009/04/08 17:30:18 volkmar Exp $
+
+*gnugk-2.2.8 (08 Apr 2009)
+
+  08 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/gnugk-2.2.8-firebird-2.1.patch, +gnugk-2.2.8.ebuild:
+  version bump to 2.2.8 see bug 258518
 
   08 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
   +files/gnugk-2.2.7-configure.patch, +files/gnugk-2.2.7-firebird-2.1.patch,
diff --git a/net-voip/gnugk/Manifest b/net-voip/gnugk/Manifest
index bce16a6bc7f9..2d0846818a99 100644
--- a/net-voip/gnugk/Manifest
+++ b/net-voip/gnugk/Manifest
@@ -1,10 +1,13 @@
 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-2.2.8-firebird-2.1.patch 2472 RMD160 2164a51578f012e939ad485de361a2a9bc7b2c09 SHA1 c2d150fa09963713f9584caafa674c0ef0c968e9 SHA256 912fa58d28d6773c7bd5779079c45445083406362a819950e553b86ba0b02394
 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
+DIST gnugk-2.2.8.tar.gz 1282055 RMD160 a305090c7228a35cc4210111eb71a4a1e6e2cf57 SHA1 e21fbbec2818045c7ec47ea0b78af2a6c0bc0396 SHA256 7b1fbc33bdde8c8aa5f427011a3b5acc7804a7c47070c3873365712bdcfe23e3
 EBUILD gnugk-2.2.5.ebuild 1133 RMD160 f78f768e119c785fa22c38a28f325c92ffc527ee SHA1 51cd8509f0b942e6503a1bc7b207e38e53a95d5e SHA256 2b786fa301e2be434360a8ba899e303228ae1a995906efdc7bc39b03ddc22f7d
 EBUILD gnugk-2.2.7.ebuild 3144 RMD160 5dc0e1ae5fd20fbf47d9be98f23e5d17aa836d0e SHA1 7a3a5b5963d0d3ac42c7a69c44c0ef3475e2e07c SHA256 5a94b5b6c175c490639fa70fdd5481a7237047fd106de2971def96752118859c
-MISC ChangeLog 2579 RMD160 94a2dfb7d52d051ceb010c277a2363979c58fc39 SHA1 deca8755906e101152b277d72858e8b7655296ac SHA256 83942d387051d36913e6411511732341976b18671db2d16dfa8d3cc19285cd4d
+EBUILD gnugk-2.2.8.ebuild 3238 RMD160 95ce99ef49e5e8894815d3a0e29312c6f532aceb SHA1 4a3ef1d0b7737c0c3871590244036412175d7065 SHA256 a6ba4b8b65406d0430039c1d4eb2fc855a162e9997731b3a308937a59b254457
+MISC ChangeLog 2760 RMD160 0cecf15cf719dc35988f0f54880fc60f908b76a1 SHA1 7131a3d8b889d0ce86ef8948973705f75d497561 SHA256 c9b9a1a8256e70dd337ce618a3da64b489bda236119b3727a2ae71f6ec774690
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
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
new file mode 100644
index 000000000000..2ba55f7ea135
--- /dev/null
+++ b/net-voip/gnugk/files/gnugk-2.2.8-firebird-2.1.patch
@@ -0,0 +1,74 @@
+--- 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/gnugk-2.2.8.ebuild b/net-voip/gnugk/gnugk-2.2.8.ebuild
new file mode 100644
index 000000000000..8eb718a4bbb7
--- /dev/null
+++ b/net-voip/gnugk/gnugk-2.2.8.ebuild
@@ -0,0 +1,116 @@
+# 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.8.ebuild,v 1.1 2009/04/08 17:30:18 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="GNU H.323 gatekeeper"
+HOMEPAGE="http://www.gnugk.org/"
+SRC_URI="mirror://sourceforge/openh323gk/${P}.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 mysql odbc postgres radius sqlite linguas_en linguas_es linguas_fr"
+
+# TODO: when h323plus will be in portage tree, add it as || dep with openh323
+RDEPEND=">=dev-libs/pwlib-1.7.5.2
+	>=net-libs/openh323-1.14.2
+	dev-libs/openssl
+	firebird? ( dev-db/firebird )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( virtual/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/linuxdoc-tools )"
+
+pkg_setup() {
+	if use doc && ! use linguas_en && ! use linguas_es && ! use linguas_fr; then
+		elog "No linguas specified."
+		elog "English documentation will be installed."
+	fi
+}
+
+src_prepare() {
+	# fix build with firebird 2.1
+	# upstream has been contacted, watch if fixed in next releases
+	use firebird && epatch "${FILESDIR}"/${P}-firebird-2.1.patch
+}
+
+src_configure() {
+	# --with-large-fdset=4096 is added because of bug #128102
+	# and it is recommanded in the online manual
+	econf \
+		$(use_enable firebird) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable odbc unixodbc) \
+		$(use_enable radius) \
+		$(use_enable sqlite) \
+		--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 || die "emake optdepend failed"
+	emake optshared || die "emake optshared failed"
+
+	# build tool addpasswd
+	emake addpasswd || die "emake addpasswd failed"
+
+	if use doc; then
+		cd docs/manual
+
+		if use linguas_en || ( ! use linguas_es && ! use linguas_fr ); then
+			emake html || die "emake en doc failed"
+		fi
+
+		if use linguas_es; then
+			emake html-es || die "emake es doc failed"
+		fi
+
+		if use linguas_fr; then
+			emake html-fr || die "emake fr doc failed"
+		fi
+		cd ../..
+	fi
+}
+
+src_install() {
+	dosbin obj_*_*_*/${PN} || die "dosbin failed"
+	dosbin obj_*_*_*/addpasswd || die "dosbin failed"
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins etc/* || die "doins etc/* failed"
+
+	dodoc changes.txt readme.txt p2pnat_license.txt || die "dodoc failed"
+
+	if use doc; then
+		dodoc docs/*.txt docs/*.pdf || die "dodoc failed"
+
+		if use linguas_en || ( ! use linguas_es && ! use linguas_fr ); then
+			dohtml docs/manual/manual*.html || die "dohtml failed"
+		fi
+		if use linguas_fr; then
+			dohtml docs/manual/fr/manual-fr*.html || die "dohtml failed"
+		fi
+		if use linguas_es; then
+			dohtml docs/manual/es/manual-es*.html || die "dohtml failed"
+		fi
+	fi
+
+	doman docs/${PN}.1 || die "doman failed"
+
+	newinitd "${FILESDIR}"/${PN}.rc6 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}