[gentoo-commits] repo/gentoo:master commit in: media-video/vdr2jpeg/

[David Seifert]

commit:     1f620485c61a07dad19457e8863af1deb265a8a0
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 12:25:36 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 12:25:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f620485

media-video/vdr2jpeg: Remove media-video/libav

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild | 12 ++----------
 media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild    | 14 +++-----------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild 
b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild
index be8cbb63595..6c594ef7897 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild
@@ -14,12 +14,8 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libav"
 
-RDEPEND="
-       libav? ( media-video/libav )
-       !libav? ( media-video/ffmpeg:0 )
-"
+RDEPEND="media-video/ffmpeg:0"
 DEPEND="${RDEPEND}"
 
 BDEPEND="virtual/pkgconfig"
@@ -35,11 +31,7 @@ src_prepare() {
 }
 
 src_install() {
-       if use libav; then
-               emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/avconv
-       else
-               emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
-       fi
+       emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
 
        einstalldocs
 }

diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild 
b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
index 23f80a5191c..c6f14a605b8 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,12 +17,8 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libav"
 
-RDEPEND="
-       libav? ( media-video/libav )
-       !libav? ( media-video/ffmpeg:0 )
-"
+RDEPEND="media-video/ffmpeg:0"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
 "
@@ -35,11 +31,7 @@ src_prepare() {
 }
 
 src_install() {
-       if use libav; then
-               emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/avconv
-       else
-               emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
-       fi
+       emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
 
        dodoc README LIESMICH
 }