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/cantata/
Date: Sun, 30 Sep 2018 22:01:22
Message-Id: 1538344856.fed872dce23dda1e1956952b7fc8307787309eeb.asturm@gentoo
1 commit: fed872dce23dda1e1956952b7fc8307787309eeb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 21:53:11 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 22:00:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed872dc
7
8 media-sound/cantata: Replace virtual/ffmpeg w/ USE +-libav
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.50, Repoman-2.3.11
12
13 media-sound/cantata/cantata-2.3.2.ebuild | 7 ++++---
14 1 file changed, 4 insertions(+), 3 deletions(-)
15
16 diff --git a/media-sound/cantata/cantata-2.3.2.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
17 index db85ccf2fbc..79a23ad4e10 100644
18 --- a/media-sound/cantata/cantata-2.3.2.ebuild
19 +++ b/media-sound/cantata/cantata-2.3.2.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
27 LICENSE="GPL-2"
28 SLOT="0"
29 KEYWORDS="~amd64 ~x86"
30 -IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
31 +IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
32 REQUIRED_USE="
33 ?? ( cdda cdio )
34 cdda? ( udisks || ( cddb musicbrainz ) )
35 @@ -44,7 +44,8 @@ COMMON_DEPEND="
36 replaygain? (
37 media-libs/libebur128
38 media-sound/mpg123
39 - virtual/ffmpeg
40 + libav? ( media-video/libav:= )
41 + !libav? ( media-video/ffmpeg:0= )
42 )
43 streaming? ( dev-qt/qtmultimedia:5 )
44 taglib? (