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

(Portage version: 2.1.4.4)

5 files changed, 116 insertions, 10 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/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}