diff options
| -rw-r--r-- | media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild | 12 | ||||
| -rw-r--r-- | 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 be8cbb63595d..6c594ef78975 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 23f80a5191c5..c6f14a605b83 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 } |