Correct SRC_URI to cope with Berlios disappearing act, closes bug #537780 by Jeroen...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

diff --git a/net-misc/sipsak/ChangeLog b/net-misc/sipsak/ChangeLog
index 8a1b143e9030b7ecca87af2f4adce7f4067265c6..6b8fc8f863e37e9c938fe95a930e644c4a93ba85 100644 (file)
--- 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/Manifest b/net-misc/sipsak/Manifest
index fe3cc755921f42e2a0344cbef9ab202850181fcb..28e749f81d06ee2766aa35c0ff42eaf7d623fef1 100644 (file)
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST sipsak-0.9.6-1.tar.gz 158776 SHA256 5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9
-EBUILD sipsak-0.9.6_p1.ebuild 753 SHA256 400fc32d1c53179807638d2cbdf9d9d26df3fa05946c8fe09acdd5c6fa352a84 SHA512 ee3c1adf65f8080739bfd847b61bffca1113556d81db24752f2c84714ced5f85fe3388b0305076f538be15460b26f9235354cacc5a76734e8a411c3320f6dfc3 WHIRLPOOL b3ebbb3caaf77afbc7d3c87f39db089e3663be06fc716adb5d1cea63230af429f42bd592793d20a6f8cf30f94df2d59247d81b6dd1d5143da7e7eb13a0076344
-MISC ChangeLog 2645 SHA256 9390872757399003130195a93764783f793494eec2e1f721ef3ca1d5622b6424 SHA512 2e56214b1e4209174a0e80b50a76b917de70dbdc880438ae3ae2bb4084a9a10b755704ce7d8ae75bcda1fbaa70a4628d9125226786a00f1585da1e66cc082f84 WHIRLPOOL 0fc4ab821da4531dc2f1733165225f5fca7c0bc5399c07639cd77f31d1605129137848ed16194c7e82c1b1cb5864d44479ad22ca8f55f1b1f83a5202494fd8be
+AUX 0.9.6_p1-callback.patch 490 SHA256 0ef5adc2bae0b45a3bfafab645625f1071094329ba0d1a3504d13534cec8ae8b SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a WHIRLPOOL 12c41fb6b1fa5f7413ff607a7c4d34280737e71054169c2c900d891c4872d5bab5b610dd00f0b3e5fc2dc2090e7f5b52680bb906c6d3d5a74411602f3c022754
+DIST sipsak-0.9.6-1.tar.gz 158776 SHA256 5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9 SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe WHIRLPOOL 40c5f38c429703c0d3063c2c1bee8f0195b3fb0e1377b29350ef1b566c55960679292f245720d77203948111df8e3914b9cb82d4c6f4a74581d29f0403c02cb6
+EBUILD sipsak-0.9.6_p1-r1.ebuild 847 SHA256 3ed26e3ecf4c4c5c9d8701f9e661cede454dcb6bd9e4b979ce5fc99a0e80896d SHA512 e07165789391a7a4e28fc8671c9d49818af4c6475f3ee2e751ad7196e4d10bea37f9f545e9d68b54185421c5515bf440cf3ea222bdeb33e24166ae5025603de8 WHIRLPOOL badecf9875fbd74de9c2fd1072287e921a41c4acf265f8bc2a4a781faf7e0a95fb9442206c680f2fdc2f52df5ea442e5e6d084eaebec5599783c77989f76906d
+EBUILD sipsak-0.9.6_p1.ebuild 752 SHA256 c29ddec167860995cfb99e9b84e46d749d655c5b537c2c43025873c99cabdbaa SHA512 d4c6d2f6e48ab5c83ee54f175eed9887792c3c45b212a9c578d321379f820e3c30daab9720d6c9bc3a9841112e8e28857f7a90cb0ead87f53e85f80b7dbf2ec0 WHIRLPOOL 357cb83e0e5cbe82a7b4d55e09cc1cfb56c3d7d770714f902ac00422f11c88046b00ac1cc4e2cf7e8796d7a1286aa2c1c8114fcfa347ff3ec95608c89a8a98b0
+MISC ChangeLog 2994 SHA256 47f3eee28a9fbcd4931ff94dfe8c662860db43913b7b9c71f86035bc02954987 SHA512 bce3fd57a086aa816c19a6a5e6c9c641747b1b07ffd78f48c7e57fd37f9d25d9f897fd9627453bc333eb92e74330e46124bcc31aba55fe4d5707b6ffa1a96b24 WHIRLPOOL bafc4fdc53b1cd2a68e0bd93fd740408abcb378740af1f21ed742c8b4a937c56d92f63c2a97ffba277c8ec1b870c823859d22faf7fceb3d548d128e24ebee1af
 MISC metadata.xml 199 SHA256 0221d723d795a0c2a87a73390ac40f0ea3d6344440e8164e0cac6575ac5ee664 SHA512 6e66cdb81069d40938e73a3df001fddb1f3ea31912cc779b1f7a6150143be56e4c541339cd6a2b4f77ae19531abcf6d44cb8d9105078332074e40cc188f8bd1c WHIRLPOOL d159c3e98e2fb60490bfbb8d31e755234cb95855cb6155748ea906ff3638435cbd4bf5ba2d3e8f8c947d1346be072429f6f24c0cc66a9a44bd1f7a6ba0edd0ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJs4lAACgkQCaWpQKGI+9TuMACff8Ux1o+HokbylN9W+ROOs1bo
-WesAnA7B6f/lZns8CHbrPudOBfhj4rhs
-=7cmk
+iEYEAREIAAYFAlTHn1cACgkQp5vW4rUFj5rOCACfeM+FxE9cA11ibbSQ9Wgzw8bv
+gjgAoKMFuZKpWE2hQWHQALgyT9zSGTeO
+=pvNZ
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..37dc486
--- /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 (file)
index 0000000..4fdd13f
--- /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 a2fb69c732a0a97f50f7393c5312cb634b22ecfa..e7b7c757c068fe4b2b0b7f66ed9cfd59f0989fa8 100644 (file)
--- 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