introduce compatibility for zrtp-1.1. remove old version. fix stable version to not depend on new zrtp

Package-Manager: portage-2.1.4.4

6 files changed, 121 insertions, 15 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 3bc5616a3bac..6c73fe6853e2 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.38 2008/04/01 06:37:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.39 2008/05/01 13:17:29 dragonheart Exp $
+
+*twinkle-1.2-r1 (01 May 2008)
+
+  01 May 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-1.2-zrtp.patch, twinkle-1.0.1-r1.ebuild,
+  -twinkle-1.1.ebuild, twinkle-1.2.ebuild, +twinkle-1.2-r1.ebuild:
+  introduce compatibility for zrtp-1.1. remove old version. fix stable version
+  to not depend on new zrtp
 
 *twinkle-1.2 (01 Apr 2008)
 
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index 061d33ba27c2..b9ae2abf0a41 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,11 +1,11 @@
 AUX twinkle-0.4.1-badcflags.patch 492 RMD160 136c6387c0053d0457e4be766a8bfdbaeaccc5b1 SHA1 12ec8f94c73dd25fb82ed2c556ad72a8f5a394e8 SHA256 7bcb91795fa0e9c0db4dc174151ed9b3850eeca132844330d65d8429949296d9
 AUX twinkle-1.0.1-icmp.patch 569 RMD160 c3d56c9f2221a9ed29e99b7bde9df104a6094dca SHA1 6f5ecbb700af176251c054320e2b5f878b8347e0 SHA256 f1995018874fad61d1b7a49d0c90cf9ad29e150c4947ae5c90e398e169f91cfc
+AUX twinkle-1.2-zrtp.patch 3836 RMD160 c099b5a3c3b0e037734ca3af258e21e07650dcbe SHA1 7d116ed43c37832b681f7d7cde9b924422b944bd SHA256 7db8565ec86bea58feeaedb2854e1c6fdb5eea9944697f300bdac1e7db755662
 AUX twinkle.desktop.patch 250 RMD160 788925b507d7fcfb8456bbef6dade0e9dae31c7e SHA1 510f834035f698f805514ea1bde0f5703d1736f7 SHA256 c384de5a69863d6dddbfc8f4376fb2e7ac6fa18acc3ba55676d02ef69f90f600
 DIST twinkle-1.0.1.tar.gz 1256457 RMD160 094aa44f014427ff919831e4fa02976736390a8d SHA1 d8894d803e2cc08e181cd71001a4f5e0fa9434ef SHA256 91beee47027d25c746acf92afd4cb3efbe906c005dbb929b496dd31b6b9d3b99
-DIST twinkle-1.1.tar.gz 1372495 RMD160 afd1f82a889b5313dc5b59fdf6fe8d190ff5d4ac SHA1 e2f0b1e7c0273b3197c5e4c21545d0500249240f SHA256 62df017d033670832beca97eca5eaf8ee6fe8dfe5d48ee137427745e2f09589f
 DIST twinkle-1.2.tar.gz 1445224 RMD160 d4b21f46a6e40f4e796eb4d401b8de971c3dbbe2 SHA1 e54a9d451fb109fd66349e65028cba8c8372b165 SHA256 978a220eb5b40458d52fce8e0e7ab38fc6a81adb477a9d0673bdf77bcae1b4a3
-EBUILD twinkle-1.0.1-r1.ebuild 1754 RMD160 2e0cd4e1e8a29409f819ab687d2e064f0e40a884 SHA1 2caefee357076dc4f35f3cff88d665b25abbe3ed SHA256 8bc8a5b9437f6612f3b76c8a631bb4e0fc8fb4f21dc6c101e14f1701595a896d
-EBUILD twinkle-1.1.ebuild 1716 RMD160 5b16243bfb3140b80f56df594d002c01b4c964ca SHA1 10d52dde6e38830b8db9b82f48f837b2892c4929 SHA256 97604ea0f37472f1bbfe1d5da3204477d1ca708aba911dfa9b9678bfa9b3c80c
-EBUILD twinkle-1.2.ebuild 1585 RMD160 8667fe44cb9a4391232c59c86d180c5f088c4ddf SHA1 3534b24b49e0256361a5f04cf334308d4a2dfa40 SHA256 05d9902f05af5faad0a865c7d37c5aee4711415a1ba77a316a33f36985e7975f
-MISC ChangeLog 7081 RMD160 411f7be48786214a14f907b8568a34fbb44bb5ba SHA1 8f6b2785ce7cba990f3e1d9420461317c9965387 SHA256 9fd928778c7f78a99fb4af0484c0083912f27bdebb5c676a7a0650a5467f9805
+EBUILD twinkle-1.0.1-r1.ebuild 1762 RMD160 80a868bf89ab9918bff85c010ba2ea38c6921766 SHA1 918920640888c604e4b7f19716e0a2e62cdd4180 SHA256 0f4d1056764a3694a6a407720d25dfcbc2d89b243a4e29be2f1cbf1220b89102
+EBUILD twinkle-1.2-r1.ebuild 1691 RMD160 889048127296162c2c9b315439ec36478984a1f9 SHA1 0eb3ef4b49d44224839f99d88b4a7cad124a1955 SHA256 b336815b1574e1f43e6f83d9c7c7c9436d952ad98b83ec8f9cce843c32efc3fd
+EBUILD twinkle-1.2.ebuild 1592 RMD160 001f176910c673ca4be9d4e88b91b5f10b6efec1 SHA1 7d5165b72cc01607b3fc50328770c526a792ebf5 SHA256 4fcab5c4ae753db3d500f857dfedfc2a19171e4eabf93e7f9825e8af3528910d
+MISC ChangeLog 7398 RMD160 01571c3e1e32b8c671849ad3230c52ccb4d30fa3 SHA1 1a2a56adc0895b6ccedda298e46c117ad53a9907 SHA256 7ce93250c2541c5bf7f98a8f258e75eba744d81f6785e2a9146c7a96bbfe9b5b
 MISC metadata.xml 458 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 SHA1 789cc96e32af0b71920e2df2c8ab7f45c1e9279d SHA256 9ee142b0e5854bae9e0365b52f6f0cf00a3b428c0c199ccce029108d03f42996
diff --git a/net-im/twinkle/files/twinkle-1.2-zrtp.patch b/net-im/twinkle/files/twinkle-1.2-zrtp.patch
new file mode 100644
index 000000000000..1163884b6ad2
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-1.2-zrtp.patch
@@ -0,0 +1,98 @@
+diff -ru twinkle-1.2-orig/configure.in twinkle-1.2/configure.in
+--- twinkle-1.2-orig/configure.in	2008-03-09 19:28:14.000000000 +1100
++++ twinkle-1.2/configure.in	2008-05-01 22:19:00.000000000 +1000
+@@ -256,6 +256,10 @@
+ 		AC_CHECK_HEADER(libzrtpcpp/ZrtpQueue.h, [],
+ 			[AC_MSG_ERROR([zrtp header files missing])])
+ 		AC_DEFINE(HAVE_ZRTP, 1, [Define to 1 if you have the <libzrtpcpp> library.])
++		AC_CHECK_HEADER(libzrtpcpp/ZrtpCodes.h,
++			[AC_DEFINE(HAVE_ZRTP_1_1, 1, [Define to 1 if you have the <libzrtpcpp> library version 1.1 or later.])
++			AC_DEFINE(ZRTP_NAMESPACE(x), GnuZrtpCodes::x, [namespace macro required to cause compatiblity beween zrtp 1.1 and previous versions])],
++			[AC_DEFINE(ZRTP_NAMESPACE(x), x, [namespace macro required to cause compatiblity beween zrtp 1.1 and previous versions])])
+ 		LIBS="-lzrtpcpp $LIBS"
+ 		echo "LIBS += -lzrtpcpp" >> $QT_INCL_PRO
+ 		have_zrtp="yes"
+diff -ru twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.h twinkle-1.2/src/audio/twinkle_zrtp_ui.h
+--- twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.h	2008-02-27 08:10:48.000000000 +1100
++++ twinkle-1.2/src/audio/twinkle_zrtp_ui.h	2008-05-01 22:25:01.000000000 +1000
+@@ -30,6 +30,9 @@
+ #include <iostream>
+ #include <libzrtpcpp/ZrtpQueue.h>
+ #include <libzrtpcpp/ZrtpUserCallback.h>
++#ifdef HAVE_ZRTP_1_1
++#include <libzrtpcpp/ZrtpCodes.h>
++#endif
+ #include "audio_session.h"
+ #include "userintf.h"
+ 
+@@ -44,8 +47,8 @@
+         virtual void secureOff();
+         virtual void showSAS(std::string sas); 
+         virtual void confirmGoClear();
+-        virtual void showMessage(MessageSeverity sev, std::string message);
+-        virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg);
++        virtual void showMessage(ZRTP_NAMESPACE(MessageSeverity) sev, std::string message);
++        virtual void zrtpNegotiationFailed(ZRTP_NAMESPACE(MessageSeverity) severity, std::string msg);
+         virtual void zrtpNotSuppOther();
+ 
+     private:
+--- twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.cpp	2008-02-27 08:10:50.000000000 +1100
++++ twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp	2008-05-01 22:49:54.000000000 +1000
+@@ -32,7 +32,11 @@
+ extern t_phone *phone;
+ 
+ TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) :
++#ifdef HAVE_ZRTP_1_1
++            ZrtpUserCallback((const ZrtpUserCallback&) queue), audioSession(session) 
++#else
+             ZrtpUserCallback(queue), audioSession(session) 
++#endif
+ {}
+ 
+ void TwinkleZrtpUI::secureOn(std::string cipher) {
+@@ -96,7 +100,7 @@
+ 	ui->cb_async_zrtp_confirm_go_clear(lineno);
+ }
+ 
+-void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) {
++void TwinkleZrtpUI::showMessage(ZRTP_NAMESPACE(MessageSeverity) sev, std::string message) {
+ 	t_line *line = audioSession->get_line();
+ 	int lineno = line->get_line_number();
+ 	
+@@ -106,11 +110,11 @@
+ 	msg += message;
+ 	
+ 	switch (sev) {
+-	case Info:
++	case ZRTP_NAMESPACE(Info):
+ 		log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
+ 			LOG_INFO);
+ 		break;
+-	case Warning:
++	case ZRTP_NAMESPACE(Warning):
+ 		log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
+ 			LOG_WARNING);
+ 		break;
+@@ -120,7 +124,7 @@
+ 	}
+ }
+ 
+-void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) {
++void TwinkleZrtpUI::zrtpNegotiationFailed(ZRTP_NAMESPACE(MessageSeverity) severity, std::string msg) {
+ 	t_line *line = audioSession->get_line();
+ 	int lineno = line->get_line_number();
+ 	
+@@ -130,11 +134,11 @@
+ 	m += msg;
+ 	
+ 	switch (severity) {
+-	case Info:
++	case ZRTP_NAMESPACE(Info):
+ 		log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
+ 			LOG_INFO);
+ 		break;
+-	case Warning:
++	case ZRTP_NAMESPACE(Warning):
+ 		log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
+ 			LOG_WARNING);
+ 		break;
diff --git a/net-im/twinkle/twinkle-1.0.1-r1.ebuild b/net-im/twinkle/twinkle-1.0.1-r1.ebuild
index e42f94ccf815..8197618abced 100644
--- a/net-im/twinkle/twinkle-1.0.1-r1.ebuild
+++ b/net-im/twinkle/twinkle-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.1-r1.ebuild,v 1.9 2007/12/24 09:59:13 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.1-r1.ebuild,v 1.10 2008/05/01 13:17:29 dragonheart Exp $
 
 ARTS_REQUIRED="never"
 inherit eutils qt3 kde
@@ -22,7 +22,7 @@ RDEPEND=">=net-libs/ccrtp-1.5.0
 	dev-libs/boost
 	speex? ( media-libs/speex )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( net-libs/libzrtpcpp )
+	zrtp? ( ~net-libs/libzrtpcpp-0.9.0 )
 	media-libs/alsa-lib"
 
 DEPEND="${RDEPEND}
diff --git a/net-im/twinkle/twinkle-1.1.ebuild b/net-im/twinkle/twinkle-1.2-r1.ebuild
index a28ec55ee83a..6978a33bd286 100644
--- a/net-im/twinkle/twinkle-1.1.ebuild
+++ b/net-im/twinkle/twinkle-1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.1.ebuild,v 1.4 2008/01/30 23:00:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.2-r1.ebuild,v 1.1 2008/05/01 13:17:29 dragonheart Exp $
 
 ARTS_REQUIRED="never"
-inherit eutils qt3 kde
+inherit eutils qt3 kde autotools
 
 DESCRIPTION="a soft phone for your VOIP communcations using SIP"
 HOMEPAGE="http://www.twinklephone.com/"
@@ -38,9 +38,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	epatch "${FILESDIR}"/${P}-zrtp.patch
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.1-badcflags.patch
-	epatch "${FILESDIR}"/twinkle.desktop.patch
+	eautoreconf
 }
 
 src_compile() {
diff --git a/net-im/twinkle/twinkle-1.2.ebuild b/net-im/twinkle/twinkle-1.2.ebuild
index 9f2ba4808a09..2d8c6a19375a 100644
--- a/net-im/twinkle/twinkle-1.2.ebuild
+++ b/net-im/twinkle/twinkle-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.2.ebuild,v 1.1 2008/04/01 06:37:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.2.ebuild,v 1.2 2008/05/01 13:17:29 dragonheart Exp $
 
 ARTS_REQUIRED="never"
 inherit eutils qt3 kde
@@ -22,7 +22,7 @@ RDEPEND=">=net-libs/ccrtp-1.5.0
 	dev-libs/boost
 	speex? ( media-libs/speex )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( net-libs/libzrtpcpp )
+	zrtp? ( ~net-libs/libzrtpcpp-0.9.0 )
 	media-libs/alsa-lib"
 
 DEPEND="${RDEPEND}