gentoo resync : 10.02.2020

4 files changed, 9 insertions, 9 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 60f91e472148..0cd69ad67c19 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,7 +4,7 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13113 BLAKE2B 74c803645380d5ebdd9a38368e1ea12c6ef30999efcb53303d92e2acdd73ae92b1df473369a5adc3ea465d6c96169bdf87d60104f769ff4a6570fc34667c36ce SHA512 b82d345e198838297d5001ea80191adf694abe151b4bfa6c58d31b0b9cf2794458d341efbe5bf3e97d6a710df65eb05fb22ef79a6b084ec01699eacb6affe95f
-EBUILD vlc-3.0.9999.ebuild 13118 BLAKE2B 3c6f37e7bf28f15ba51a461270657900b11689bf42b2360cc62b13e8d16eccafb1cb02b3cf7f21fc443f9e6d7a9e24af494c5f10a509230fc56b85b9044c35c3 SHA512 ce64b488341416225f9dc3c24b7dcfb2a6e60d734e517a839c2807be10471c06dabc9841e55fb2f9a1b423798805969818d1ed21b14ff5a0c5e764c7638ce1f9
-EBUILD vlc-9999.ebuild 13057 BLAKE2B 357665845d812917c6e6833839a96aca5fb837041fa9b21d8d32293bf7185072a234c8e831cce3150a8d07edda3c25186856da200661d7731a2249d2fa55839d SHA512 6f13e5f234dc210281b411df857dcdab56806ab8613fa07857276354f1552506329379f02a38e7f98ef074ad5811740180beefb5e3d860a7b866b89c033df530
+EBUILD vlc-3.0.8.ebuild 13116 BLAKE2B bae61a9cfc2da25c4865451413718db7bf0ee19ab33f54e267ad6ba8e6397b04f0f095a8373cd42a8b6f172d79a9dc6de9d29be23d9ab19c61fd109a92d7db59 SHA512 cb22519b6872790fff32b3461b4240f7da539953215f2dc2f61f716913a11d3f7f2c3201f08bab7a79b477b43d5fbb691f50f243ec516657596bf109090cecb4
+EBUILD vlc-3.0.9999.ebuild 13121 BLAKE2B 65ba26a978b35ccb8f8c81d0d7d7af138ad2a4f74edac8da093449f85acbe84995cdd9c18f57060b12085d657c748e68d4371e4dbe7ea5c51ce5873fa806b99f SHA512 fa7c99805959f3dca296d4d3d4af9e0de379e3eca3566fc6d6e30e20f6df94c6899b26de38c456c860e9406a1236ac5ceb9e94b2225e8ee69626b27602ee6124
+EBUILD vlc-9999.ebuild 13060 BLAKE2B 0838c7fb13d400f997870b0781823163d399a7e834d85f2e686b4887a14c2cc6ea84d1c3a3a638bc23bf8bc37abfaf1d843820c914df747836939321fb4abdb8 SHA512 f82bba1e42ff0b0804fcc12e3d6e451671782adb08fdd85c076bfcffbadf3ba9aceef172fb798c1c25dfc629771018c33d9e6d885b818dcb6adffb77817516b0
 MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 91eb7fe2f527..1365a0718a5e 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 8fad44625193..9e019812fe14 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 6f1c27b496de..116dc942964c 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )