Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: net-voip/twinkle/
Date: Tue, 25 Aug 2020 14:51:21
Message-Id: 1598366954.6dcdc51ece63b35ed993af10f36b7825db91143e.asturm@gentoo
1 commit: 6dcdc51ece63b35ed993af10f36b7825db91143e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 24 13:08:38 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 25 14:49:14 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6dcdc51e
7
8 net-voip/twinkle: Drop IUSE=zrtp, net-libs/libzrtpcpp broken w/ openssl-1.1
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 net-voip/twinkle/metadata.xml | 3 ---
13 net-voip/twinkle/twinkle-1.4.2.ebuild | 8 +++-----
14 2 files changed, 3 insertions(+), 8 deletions(-)
15
16 diff --git a/net-voip/twinkle/metadata.xml b/net-voip/twinkle/metadata.xml
17 index 3700fd7b..f5eaa0c6 100644
18 --- a/net-voip/twinkle/metadata.xml
19 +++ b/net-voip/twinkle/metadata.xml
20 @@ -9,8 +9,5 @@ network using a SIP proxy to route your calls.
21 </longdescription>
22 <use>
23 <flag name='ilbc'>Enables use of ilbc (RFC3951) audio encoding</flag>
24 - <flag name='zrtp'>Enables use of secure rtp using the zrtp extension of GNU
25 - RTP stack developed by Phil Zimmermann
26 - </flag>
27 </use>
28 </pkgmetadata>
29
30 diff --git a/net-voip/twinkle/twinkle-1.4.2.ebuild b/net-voip/twinkle/twinkle-1.4.2.ebuild
31 index d657da0a..76bc99ff 100644
32 --- a/net-voip/twinkle/twinkle-1.4.2.ebuild
33 +++ b/net-voip/twinkle/twinkle-1.4.2.ebuild
34 @@ -1,6 +1,5 @@
35 # Copyright 1999-2013 Gentoo Foundation
36 # Distributed under the terms of the GNU General Public License v2
37 -# $Header: $
38
39 EAPI=2
40 inherit autotools eutils qt3
41 @@ -12,16 +11,15 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
42 LICENSE="GPL-2"
43 SLOT="0"
44 KEYWORDS="amd64 ~ppc ~ppc64 x86"
45 -IUSE="speex ilbc zrtp"
46 +IUSE="ilbc speex"
47
48 RDEPEND=">=net-libs/ccrtp-1.6.0
49 dev-cpp/commoncpp2
50 dev-qt/qt-meta:3
51 media-libs/libsndfile
52 dev-libs/boost
53 - speex? ( media-libs/speex )
54 ilbc? ( dev-libs/ilbc-rfc3951 )
55 - zrtp? ( >=net-libs/libzrtpcpp-1.3.0 )
56 + speex? ( media-libs/speex )
57 media-libs/alsa-lib"
58 DEPEND="${RDEPEND}
59 virtual/pkgconfig"
60 @@ -37,7 +35,7 @@ src_configure() {
61 --without-kde \
62 $(use_with ilbc) \
63 $(use_with speex) \
64 - $(use_with zrtp) \
65 + --without-zrtp \
66 --without-arts
67 }