version bump as per bug #235353 thanks to Lasse Jansson. fixed twinke-1.2* to depend on 1.3.0 version of libzrtp

(Portage version: 2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64)

5 files changed, 82 insertions, 5 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 32488f62034d..fdb4470dda02 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.41 2008/08/05 18:08:49 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.42 2008/08/22 23:41:37 dragonheart Exp $
+
+*twinkle-1.3 (22 Aug 2008)
+
+  22 Aug 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-1.3-gcc4.3.patch, twinkle-1.2.ebuild,
+  twinkle-1.2-r1.ebuild, +twinkle-1.3.ebuild:
+  version bump as per bug #235353 thanks to Lasse Jansson. fixed twinke-1.2*
+  to depend on 1.3.0 version of libzrtp
 
   05 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
   Add USE flag description to metadata as per GLEP 56.
diff --git a/net-im/twinkle/files/twinkle-1.3-gcc4.3.patch b/net-im/twinkle/files/twinkle-1.3-gcc4.3.patch
new file mode 100644
index 000000000000..7859e85950fd
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-1.3-gcc4.3.patch
@@ -0,0 +1,10 @@
+--- twinkle-1.3/src/utils/file_utils.cpp.orig	2008-08-23 09:13:35.000000000 +1000
++++ twinkle-1.3/src/utils/file_utils.cpp	2008-08-23 09:14:14.000000000 +1000
+@@ -24,6 +24,7 @@
+ #include <vector>
+ #include <cerrno>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ using namespace std;
+ using namespace utils;
diff --git a/net-im/twinkle/twinkle-1.2-r1.ebuild b/net-im/twinkle/twinkle-1.2-r1.ebuild
index 85116a0fb446..d56b961c70d3 100644
--- a/net-im/twinkle/twinkle-1.2-r1.ebuild
+++ b/net-im/twinkle/twinkle-1.2-r1.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-r1.ebuild,v 1.2 2008/07/27 22:07:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.2-r1.ebuild,v 1.3 2008/08/22 23:41:37 dragonheart Exp $
 
 EAPI=1
 ARTS_REQUIRED="never"
@@ -23,7 +23,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-1.3.0 )
 	media-libs/alsa-lib"
 
 DEPEND="${RDEPEND}
diff --git a/net-im/twinkle/twinkle-1.2.ebuild b/net-im/twinkle/twinkle-1.2.ebuild
index 0e0b7f2cef8a..1718e0cea640 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.3 2008/07/27 22:07:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.2.ebuild,v 1.4 2008/08/22 23:41:37 dragonheart Exp $
 
 EAPI=1
 ARTS_REQUIRED="never"
@@ -23,7 +23,7 @@ RDEPEND=">=net-libs/ccrtp-1.5.0
 	dev-libs/boost
 	speex? ( media-libs/speex )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( ~net-libs/libzrtpcpp-0.9.0 )
+	zrtp? ( >=net-libs/libzrtpcpp-1.3.0 )
 	media-libs/alsa-lib"
 
 DEPEND="${RDEPEND}
diff --git a/net-im/twinkle/twinkle-1.3.ebuild b/net-im/twinkle/twinkle-1.3.ebuild
new file mode 100644
index 000000000000..4e7a7005a6a2
--- /dev/null
+++ b/net-im/twinkle/twinkle-1.3.ebuild
@@ -0,0 +1,59 @@
+# 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.3.ebuild,v 1.1 2008/08/22 23:41:37 dragonheart Exp $
+
+EAPI=1
+ARTS_REQUIRED="never"
+inherit eutils qt3 kde
+
+DESCRIPTION="a soft phone for your VOIP communcations using SIP"
+HOMEPAGE="http://www.twinklephone.com/"
+SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="arts speex ilbc zrtp kdehiddenvisibility"
+
+# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
+RDEPEND=">=net-libs/ccrtp-1.6.0
+	>=dev-cpp/commoncpp2-1.6.1
+	x11-libs/qt:3
+	media-libs/libsndfile
+	dev-libs/boost
+	speex? ( media-libs/speex )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	zrtp? ( >=net-libs/libzrtpcpp-1.3.0 )
+	media-libs/alsa-lib"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if use speex && has_version '~media-libs/speex-1.2_beta2' &&
+		! built_with_use 'media-libs/speex' 'wideband' ; then
+		eerror "You need to build media-libs/speex with USE=wideband enabled."
+		die "Speex w/o wideband-support detected."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+}
+
+src_compile() {
+	local myconf=" \
+			$(use_with ilbc) \
+			$(use_with arts) \
+			$(use_with zrtp) \
+			$(use_with speex)"
+	set-kdedir
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	dodoc THANKS
+	domenu twinkle.desktop
+}