Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/
Date: Tue, 20 Mar 2018 16:50:59
Message-Id: 1521564631.e8551e4ef8211db3f6f98107c5873e55ffdf001b.asturm@gentoo
1 commit: e8551e4ef8211db3f6f98107c5873e55ffdf001b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 20 16:50:31 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 20 16:50:31 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8551e4e
7
8 media-sound/amarok: Drop USE=utils, build unconditionally
9
10 No extra dependencies, no point disabling.
11
12 Package-Manager: Portage-2.3.24, Repoman-2.3.6
13
14 media-sound/amarok/amarok-9999.ebuild | 4 ++--
15 media-sound/amarok/metadata.xml | 1 -
16 2 files changed, 2 insertions(+), 3 deletions(-)
17
18 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
19 index 87a1bba632..d573a1e07e 100644
20 --- a/media-sound/amarok/amarok-9999.ebuild
21 +++ b/media-sound/amarok/amarok-9999.ebuild
22 @@ -13,7 +13,7 @@ DESCRIPTION="Advanced audio player based on KDE frameworks"
23 HOMEPAGE="https://amarok.kde.org/"
24
25 LICENSE="GPL-2"
26 -IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast +utils wikipedia"
27 +IUSE="+embedded ffmpeg ipod lastfm mtp ofa podcast wikipedia"
28
29 if [[ ${KDE_BUILD_TYPE} == live ]]; then
30 RESTRICT="test"
31 @@ -96,6 +96,7 @@ src_configure() {
32 local mycmakeargs=(
33 -DWITH_MP3Tunes=OFF
34 -DWITH_PLAYER=ON
35 + -DWITH_UTILITIES=ON
36 -DWITH_MYSQL_EMBEDDED=$(usex embedded)
37 $(cmake-utils_use_find_package ffmpeg FFmpeg)
38 -DWITH_IPOD=$(usex ipod)
39 @@ -103,7 +104,6 @@ src_configure() {
40 $(cmake-utils_use_find_package mtp Mtp)
41 $(cmake-utils_use_find_package ofa LibOFA)
42 $(cmake-utils_use_find_package podcast Mygpo-qt5)
43 - -DWITH_UTILITIES=$(usex utils)
44 $(cmake-utils_use_find_package wikipedia Qt5WebEngine)
45 )
46
47
48 diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
49 index 8342725066..19fd686064 100644
50 --- a/media-sound/amarok/metadata.xml
51 +++ b/media-sound/amarok/metadata.xml
52 @@ -23,7 +23,6 @@
53 <flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
54 fingerprints (used by MusicBrainz)</flag>
55 <flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
56 - <flag name="utils">Build tagging and collection scanner utilities</flag>
57 <flag name="wikipedia">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag>
58 </use>
59 </pkgmetadata>