gentoo resync : 14.05.2020

4 files changed, 10 insertions, 26 deletions

diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 4756b48f1db5..d07eab70d833 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -3,7 +3,7 @@ AUX vdr2jpeg-0.1.9-ffmpeg1.patch 8787 BLAKE2B 0ade0368504c397be765446cf88a078fa6
 AUX vdr2jpeg-0.1.9-libav9.patch 2072 BLAKE2B f9ace5a099c3030234524065aceefe3f5f72d65d3e62763a53d1c02057e4ad23737b454afcc6362159729d255c92843d78629b302cff4c823a844bc96440fb80 SHA512 d8122499f7f5db79f359bd38801fcc3b72b9ddce1305a854260d40d6f55e2162fb1a23b2a8acd3902c3a93aab1ee66bce418fcd6f5ad72363d98c4bf5f68400a
 DIST vdr2jpeg-0.1.9.tgz 31160 BLAKE2B 6f84e82167f45b8fe3c2a00e72ed5ad660b7a895e1c33110ce47e1cbb2d6f5fc979454761e693f1793f1fae0c1f1694af77a0f47b4483bb6359840ffcc88e6e9 SHA512 e2309fd08591d5efa08246c2ecde70811036ea293e21f7e5ae989af5acef5e795216cbc31455d2f0b65de575a876863efe55ddf4397ab4eadf3d67a627579d99
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
-EBUILD vdr2jpeg-0.1.9-r1.ebuild 915 BLAKE2B b480b02f7d33f693c59941a3d5774142a3b2babc253b36e9dc13608db4403e0afecc576a66e1ba267193f50ea9b7bea5dbc2eacb36c421ad4f40de884d23fa62 SHA512 5091eee9033acef859bf3e94ba8dd28b7b27f18d1261c7819c9261f4fe603c86feb674ca09195bdd9397a8a8f6a5f88794709b0da3ba36a877ac4e4842b13fa0
-EBUILD vdr2jpeg-0.2.0-r1.ebuild 884 BLAKE2B fbc1dcee9ab6a470449cc097846c2c0e48f5335c4b6e83575d67d687446a5cb0fc5c2bffbc222938ea54e30d6a28236a6280c5dd0864679687ce34f6ac2abd9e SHA512 7fb77e524306cbcaa9601f356d2cf6818407e99f23402dfab3f5e937fd5c0565714cc32262d851bb5ae2ac5c8b9fcb85e370c17b2697425added8c8c5ddc06f0
-EBUILD vdr2jpeg-0.2.0.ebuild 896 BLAKE2B 76e2844841070922de6582eb022cc283834a4659c00ef0534b02d391b78c66e93419bcd80982cafa656ea7a74bec3bc3c90136d40a0b430c41a2acf85ab37dfc SHA512 a14256d860e8da83960099cb1e3fae3c9f4e60673922343af2a28e4e969fd04b4797497168ca630b34e0d12130b0bfc66ce5b2300120e93acfd2c1d67638ddd1
+EBUILD vdr2jpeg-0.1.9-r2.ebuild 916 BLAKE2B eb61f6015259445e215f7f18b9095b4684ae4cf74eb42d0aaad773ff1538bba426e38a078f2a4453e01e0dd5e9520acb321a2e86cedbfd94d506ac9b0510c55e SHA512 45a256d52fd3ed4f2ff28bee3e425e6c3cfd578a6d555774814b28ebbd6e50bd3c86df09923243eb4e703153a5973d0b70a64d37be95917188c963e5163d19f4
+EBUILD vdr2jpeg-0.2.0-r1.ebuild 737 BLAKE2B 60c1dcbb7fbe62e3bc3341f50246a1b8c8bd07b6a128764486d762d0d82d890113aa0734b5a1402675ecd92498d905fdd51a97d4294e497eae7974492f936be9 SHA512 85c17e3fc1579bd6a5101517d55057ae235027ac465598104293d5c2d14fcd5cb560ee6b9526aeebf05338a5937bcfb7296d3aa55926c4a8a880cb8275650f0b
+EBUILD vdr2jpeg-0.2.0.ebuild 746 BLAKE2B 75735a74aa5919f60c0c6a0f96819171804924b4bf9fda3960b91917eb318adf5ed0e0eecf5e96e38307ef5d739128728e4dcc288e0c279787978ae9fca88582 SHA512 7926d51958586a15fca14872298dab5d97e46c3c7d4fbf82a81fb018bc5a027863337288a10f0534c6c93fb74f97d342c77ab8f6c95c69dca0c95499f119ad33
 MISC metadata.xml 372 BLAKE2B 09d9b98f1ba8033a7ec2df65cc2358ce180dc647bd986587f696fc951fd69e2e9dbb5521dc61d93432f3ea5aec677c21b6388ee1de443538beb02747241aebc8 SHA512 b8b077cff248569cff49f30519346cd85efa88e5d19adca6fd13fc2ee49966630b4d6fb161845a301a18ff2f94da763c68d2c37237fdbe68aa63c452a612e5de
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
index 12ba97470925..1966f4a0dae8 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.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
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="virtual/ffmpeg"
+RDEPEND="media-video/ffmpeg"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
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
 }