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

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64

6 files changed, 88 insertions, 18 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/Manifest b/net-im/twinkle/Manifest
index dd4021e6d6e2..6d7d8da52c53 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-1.3-gcc4.3.patch 305 RMD160 b8b4bbd97cc1659bced6e758b61b01e72da46e6f SHA1 c7028292feaef46363e1a35f97656b42c4d62fb6 SHA256 27c597eaa1159fb93dc56c39f1ddcdaf441a1aae116aea4d6ceb5ccd4c1f9bc2
 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.2.tar.gz 1445224 RMD160 d4b21f46a6e40f4e796eb4d401b8de971c3dbbe2 SHA1 e54a9d451fb109fd66349e65028cba8c8372b165 SHA256 978a220eb5b40458d52fce8e0e7ab38fc6a81adb477a9d0673bdf77bcae1b4a3
+DIST twinkle-1.3.tar.gz 1502029 RMD160 61b4cc4c0b5982929de18aad07e84170775330c4 SHA1 994b455c2df7d5cb1a8776421c424de10e892c71 SHA256 a96faf96312186cf42a6a41fbf939a974287be04e671fd4eac816b28cfbbd513
 EBUILD twinkle-1.0.1-r1.ebuild 1753 RMD160 da820bce962fc6b862a3fa059d7ee97a8a4cb7a3 SHA1 181c742cc6a27319f45821bb9b846b1edf0c7c9b SHA256 69146ff8234349b94ce01386dce4f677c8ac97963b34809bc6f5a19280406956
-EBUILD twinkle-1.2-r1.ebuild 1682 RMD160 41a3cea892c0f7ed37d974e25d3de0049792f616 SHA1 f7669ce84f13dce49c025dde444c83b083c13c0f SHA256 1a7b7eb2a4521308bff09fd2ea80b7c60e99d8496885e96e1594407ea18dbf73
-EBUILD twinkle-1.2.ebuild 1583 RMD160 10f49ec4cbadb33fd39ae0a73a35c1fca439e62f SHA1 881ee66ab56f68e9555bba937b17b4ebcf102d60 SHA256 11fc736d5d2da56460d54605937226bfcf31293293f835f45b4672f78c5671a4
-MISC ChangeLog 7690 RMD160 6769571bfb8b8cb686052e72244e0b7e7460eddb SHA1 3a8dfb3f126ade714d0fd4f14a2b8258a4f52a6e SHA256 4f6fb1390bae184f6cb9c1c91dccd25cfcd40e8d09766c693efee06aa2071924
+EBUILD twinkle-1.2-r1.ebuild 1696 RMD160 cba01c86e9673c8e5243b43c4f4b0d08f70dc014 SHA1 64c01ad95ec1b00d240d795cda4f42d9d1eca2e4 SHA256 b6e0dcc98cae874da4446b2230b5542a86d697d50398dbc332fcf905cca4c7fe
+EBUILD twinkle-1.2.ebuild 1590 RMD160 6f25c90fb4f1ff489857aab0a98d432d682514cf SHA1 ea69d6e9a471b1f69caef90b5fd024cdcc1ebb4f SHA256 436da5d1cdac3d089ace2cd1b817d054714ac1980705a9d11e1deb0ee15e1528
+EBUILD twinkle-1.3.ebuild 1473 RMD160 08cc349964bdeab4f56ac43109bc2d331045efab SHA1 c9ed9fd46a2a7d4fc1fff0db4ec563538610fc86 SHA256 476d7507d7e61277a46f3d2a1dcdfc238de056e6388cadc27b412c2ad1b2128b
+MISC ChangeLog 7990 RMD160 8905073328326137021e843524f3f6b937711626 SHA1 e4e21fe148b1da9ef2fb6381a8521016243c82e4 SHA256 aa4487c08d644471dcf1986fd8a9f4da8bf87418a54115d84a1754f0e2af5975
 MISC metadata.xml 669 RMD160 3cafb4dca8f6e7e14568c5565ae604a3b997a8e4 SHA1 903267899c47c5b80eac0e07a18cf73723fef533 SHA256 e0f82424abfd4c18cfe89191c41d3e7531bb620cd78ffc1aeafcb7b7a4f853a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiYmtEACgkQF6yMcaBxwHlifACeK1YEyf4SBUvIAFkJMMwH7Fg/
-Vu4AnAhFLb2xwVAldCN18K+1hSygepLY
-=gwGn
------END PGP SIGNATURE-----
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
+}