Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/tomahawk/
Date: Wed, 03 Oct 2018 22:58:41
Message-Id: 1538607446.e31cccca3e43a6e753e23a42e2beb103e878f557.asturm@gentoo
1 commit: e31cccca3e43a6e753e23a42e2beb103e878f557
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 3 22:57:26 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 3 22:57:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31cccca
7
8 media-sound/tomahawk: Drop USE hatchet
9
10 Closes: https://bugs.gentoo.org/663318
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.50, Repoman-2.3.11
13
14 media-sound/tomahawk/metadata.xml | 1 -
15 media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild | 7 +++----
16 2 files changed, 3 insertions(+), 5 deletions(-)
17
18 diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
19 index a36075aeec6..3bc448c2a0a 100644
20 --- a/media-sound/tomahawk/metadata.xml
21 +++ b/media-sound/tomahawk/metadata.xml
22 @@ -10,7 +10,6 @@
23 <name>Gentoo KDE Project</name>
24 </maintainer>
25 <use>
26 - <flag name="hatchet">Enable support for the synchronisation through Hatchet</flag>
27 <flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
28 </use>
29 </pkgmetadata>
30
31 diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
32 index 78600519cd5..3c553a30e8c 100644
33 --- a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
34 +++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
35 @@ -1,4 +1,4 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 +# Copyright 1999-2018 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI=6
41 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
42 LICENSE="GPL-3 BSD"
43 SLOT="0"
44 KEYWORDS="~amd64 ~x86"
45 -IUSE="+hatchet telepathy xmpp"
46 +IUSE="telepathy xmpp"
47
48 CDEPEND="
49 $(add_frameworks_dep attica)
50 @@ -37,7 +37,6 @@ CDEPEND="
51 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
52 >=net-libs/gnutls-3.2:=
53 x11-libs/libX11
54 - hatchet? ( dev-cpp/websocketpp )
55 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
56 xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
57 "
58 @@ -57,7 +56,7 @@ src_configure() {
59 -DBUILD_TOOLS=OFF
60 -DBUILD_WITH_QT4=OFF
61 -DWITH_KDE4=OFF
62 - -DBUILD_HATCHET=$(usex hatchet)
63 + -DBUILD_HATCHET=OFF
64 -DWITH_TelepathyQt=$(usex telepathy)
65 -DWITH_Jreen=$(usex xmpp)
66 )