Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/
Date: Sun, 26 Apr 2020 08:59:08
Message-Id: 1587891541.a33dfbbf7cab05c898224dc9d15abe547d44ef65.zlogene@gentoo
1 commit: a33dfbbf7cab05c898224dc9d15abe547d44ef65
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 26 08:58:27 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 26 08:59:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33dfbbf
7
8 net-misc/gerbera: migrate from libav
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 net-misc/gerbera/gerbera-1.4.0.ebuild | 7 ++-----
14 net-misc/gerbera/gerbera-9999.ebuild | 7 ++-----
15 2 files changed, 4 insertions(+), 10 deletions(-)
16
17 diff --git a/net-misc/gerbera/gerbera-1.4.0.ebuild b/net-misc/gerbera/gerbera-1.4.0.ebuild
18 index 122b20de3f6..4e1290f8ff8 100644
19 --- a/net-misc/gerbera/gerbera-1.4.0.ebuild
20 +++ b/net-misc/gerbera/gerbera-1.4.0.ebuild
21 @@ -21,7 +21,7 @@ HOMEPAGE="https://gerbera.io"
22
23 LICENSE="GPL-2"
24 SLOT="0"
25 -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
26 +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
27
28 DEPEND="
29 acct-user/gerbera
30 @@ -34,10 +34,7 @@ DEPEND="
31 lastfm? ( >=media-libs/lastfmlib-0.4 )
32 exif? ( media-libs/libexif )
33 exiv2? ( media-gfx/exiv2 )
34 - ffmpeg? (
35 - libav? ( >=media-video/libav-10:0= )
36 - !libav? ( >=media-video/ffmpeg-2.2:0= )
37 - )
38 + ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
39 ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
40 curl? ( net-misc/curl net-misc/youtube-dl )
41 magic? ( sys-apps/file )
42
43 diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
44 index 122b20de3f6..11919c4298c 100644
45 --- a/net-misc/gerbera/gerbera-9999.ebuild
46 +++ b/net-misc/gerbera/gerbera-9999.ebuild
47 @@ -21,7 +21,7 @@ HOMEPAGE="https://gerbera.io"
48
49 LICENSE="GPL-2"
50 SLOT="0"
51 -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
52 +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
53
54 DEPEND="
55 acct-user/gerbera
56 @@ -34,10 +34,7 @@ DEPEND="
57 lastfm? ( >=media-libs/lastfmlib-0.4 )
58 exif? ( media-libs/libexif )
59 exiv2? ( media-gfx/exiv2 )
60 - ffmpeg? (
61 - libav? ( >=media-video/libav-10:0= )
62 - !libav? ( >=media-video/ffmpeg-2.2:0= )
63 - )
64 + ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
65 ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
66 curl? ( net-misc/curl net-misc/youtube-dl )
67 magic? ( sys-apps/file )