Correct SRC_URI to cope with Berlios disappearing act, closes bug #537780 by Jeroen Roovers. Patch to address c-ares API change, as per Werner Meisner & Rick "Zero-Chaos" Farina in bug #396679.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

4 files changed, 60 insertions, 4 deletions

diff --git a/net-misc/sipsak/ChangeLog b/net-misc/sipsak/ChangeLog
index 8a1b143e9030..6b8fc8f863e3 100644
--- a/net-misc/sipsak/ChangeLog
+++ b/net-misc/sipsak/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/sipsak
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/ChangeLog,v 1.20 2013/10/27 09:52:14 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/ChangeLog,v 1.21 2015/01/27 14:22:57 chainsaw Exp $
+
+*sipsak-0.9.6_p1-r1 (27 Jan 2015)
+
+  27 Jan 2015; Tony Vroon <chainsaw@gentoo.org> +sipsak-0.9.6_p1-r1.ebuild,
+  +files/0.9.6_p1-callback.patch:
+  Correct SRC_URI to cope with Berlios disappearing act, closes bug #537780 by
+  Jeroen Roovers. Patch to address c-ares API change, as per Werner Meisner &
+  Rick "Zero-Chaos" Farina in bug #396679.
 
   27 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Voip herd is removed: http://article.gmane.org/gmane.linux.gentoo.devel/88434
diff --git a/net-misc/sipsak/files/0.9.6_p1-callback.patch b/net-misc/sipsak/files/0.9.6_p1-callback.patch
new file mode 100644
index 000000000000..37dc486d3174
--- /dev/null
+++ b/net-misc/sipsak/files/0.9.6_p1-callback.patch
@@ -0,0 +1,12 @@
+diff -uNr sipsak-0.9.6.ORIG/helper.c sipsak-0.9.6/helper.c
+--- sipsak-0.9.6.ORIG/helper.c	2015-01-27 14:14:12.208729426 +0000
++++ sipsak-0.9.6/helper.c	2015-01-27 14:14:55.406728851 +0000
+@@ -250,7 +250,7 @@
+ 	return aptr;
+ }
+ 
+-static void cares_callback(void *arg, int status, unsigned char *abuf, int alen) {
++static void cares_callback(void *arg, int status, int timeouts, unsigned char *abuf, int alen) {
+ 	int i;
+ 	unsigned int ancount, nscount, arcount;
+ 	const unsigned char *aptr;
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
new file mode 100644
index 000000000000..4fdd13fd21f2
--- /dev/null
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild,v 1.1 2015/01/27 14:22:57 chainsaw Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="small command line tool for testing SIP applications and devices"
+HOMEPAGE="http://sourceforge.net/projects/sipsak.berlios/"
+SRC_URI="mirror://sourceforge/sipsak.berlios/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="gnutls"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+	net-dns/c-ares"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/_p1}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-callback.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable gnutls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1.ebuild
index a2fb69c732a0..e7b7c757c068 100644
--- a/net-misc/sipsak/sipsak-0.9.6_p1.ebuild
+++ b/net-misc/sipsak/sipsak-0.9.6_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/sipsak-0.9.6_p1.ebuild,v 1.8 2010/10/28 12:33:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/sipsak-0.9.6_p1.ebuild,v 1.9 2015/01/27 14:22:57 chainsaw Exp $
 
 EAPI=2