gentoo resync : 14.05.2020

4 files changed, 9 insertions, 15 deletions

diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index 3220881b59d5..c2f04ad5e115 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -2,7 +2,7 @@ AUX ffmpeg29.patch 11613 BLAKE2B 3ec6dcdf43cfefc26ce9e0fb94f66bb33251430ac563628
 DIST harvid-0.8.0.tar.gz 116079 BLAKE2B 17e92f9100d4874604d524b31d3bfd50f2b4f1bbd4d53ab82b05e65f4ff7d43176bad2cf57e197d54d4fb1281dc863d6afae50f8b312933014b92def51538dea SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568
 DIST harvid-0.8.1.tar.gz 116277 BLAKE2B 1382625d241e63f3733817e57be4ad6cc57411aca6fbb7ba472e1b2959362fd384b1e2d1a35594656c30778fae4f54a1c89d1bb6565d006ad801e29c6d657d7d SHA512 b425eca844bb9eec3ec8caa324f783132a3e83938b258a5f8e92ce6dc47108ae491a009223b7e3c8051d965a1ff1b5e5509a804d1462641128a8524cde5ae60a
 DIST harvid-0.8.2.tar.gz 116541 BLAKE2B e3f82ad0b30fa0c1eefe84b85ba658c1897890d2b35aef355dfc029c26140ee5809a42d4e82a2ea515a277f4cc8cd24fdc032f6a42875bcddcb5bd4a77b6282a SHA512 fde352124008cd3d6230950c79a3a2b8d581803f952c7313c941226b00e80f8078053d941f2c5ead04672639a8db696f0c33482f69dab78187801d7ebce23fce
-EBUILD harvid-0.8.0.ebuild 1026 BLAKE2B 73c8bbdc97c82c37fa8a413028a6c9bb247a3906a54e17ba8eb58431206ff42f4d85fc6eb2027125a9fba2285bdbe66fe879af845e63f595229cc0a0ec63ce9f SHA512 151afcf1b30f5e074f8ed29123f67e3dbfe9904cb0b57ea7bcab8d58fbead3620affd35078555e82a472a1ed5e2eca918a88e8f2b9dd0fdcfd64941649217be3
-EBUILD harvid-0.8.1.ebuild 970 BLAKE2B e67483ce6a8960f42754818495d6e013df63591d42a00c62f653bd4a82c3f6086ae8a4676da99aff8cbd557379a58539c1cd5663ed4ed52516795a54a7c8ab56 SHA512 1ecb3b7435b828af3708f3be3646f38dd98adc4933bb8a4fd9e6309bcf9b8fbddf8213ac466df7c0b8f3d4054e7c0faf4fd9d6910b53d8a3dd71a2031ee806f6
-EBUILD harvid-0.8.2.ebuild 970 BLAKE2B 2e782b70eefd826fee8020968a0d44c2062c4e43335229c59ceef757c1cb8c2540243b3c85931bcb68ed5f0c0cfb8ac1230d7c860fb38d73d6d3aad0e51d5936 SHA512 a0d70a007258c7f13a55c9a8605e616b414acbbdc82b79647f9b8fe502c8757db7e284b80f62b4011ff01556b5b93dfa82adca3656bbf0b8c31ec0aaa2659ae8
+EBUILD harvid-0.8.0.ebuild 961 BLAKE2B e4357dc555a4dbc0a071cdb1aacae0236f6fbf4bc95c9a7f036b0dc02a707aa6c10b68fdfd1f4c6ab32f17f89870b5b1899a7919308404ea3faee37b5efaf6c5 SHA512 77429081faeccf5bf2f36ee9e28ca972256eb2b85762bef355a478c11885885b9145ab4f34ea681186abdb6872554b61f15820361d8ebbfb40809ecd489ac43f
+EBUILD harvid-0.8.1.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
+EBUILD harvid-0.8.2.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
 MISC metadata.xml 306 BLAKE2B 5c1fba580f975a8cbd2247e002f0565de5a1f406f4361e312865e9e7b6fdd406a3e128fee109fddcf37b5978e865850a7de3abbe656f50d3c1642650d8f371f2 SHA512 4fa6b478e09481b73a9c1743c79b108e115a9452c31f3a37134d9ef939f4118c27690e9e7f33fcd0fa7a558d73840b84b944e14344d1ebffc10febc16cbf2315
diff --git a/media-video/harvid/harvid-0.8.0.ebuild b/media-video/harvid/harvid-0.8.0.ebuild
index 324ebb2f22f5..45de47a567e3 100644
--- a/media-video/harvid/harvid-0.8.0.ebuild
+++ b/media-video/harvid/harvid-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,11 +12,9 @@ SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libav"
 
 RDEPEND="
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.6:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
 "
diff --git a/media-video/harvid/harvid-0.8.1.ebuild b/media-video/harvid/harvid-0.8.1.ebuild
index 56e380ac9d6e..d7829ef1ef59 100644
--- a/media-video/harvid/harvid-0.8.1.ebuild
+++ b/media-video/harvid/harvid-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,11 +12,9 @@ SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libav"
 
 RDEPEND="
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.6:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
 "
diff --git a/media-video/harvid/harvid-0.8.2.ebuild b/media-video/harvid/harvid-0.8.2.ebuild
index 8dbd4423ebc4..d7829ef1ef59 100644
--- a/media-video/harvid/harvid-0.8.2.ebuild
+++ b/media-video/harvid/harvid-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,11 +12,9 @@ SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libav"
 
 RDEPEND="
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.6:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
 "