gentoo resync : 21.06.2020

4 files changed, 7 insertions, 7 deletions

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 2aa5045d9c3e..055baf23d471 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -28,7 +28,7 @@ DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611d
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-2.4.13-r4.ebuild 5973 BLAKE2B 2243648334c7c959d874b2255bc6743b3785f30b5f2a2a2884202f97568cea342d978e6247b33d4c069903f213f9cce970e73de5f9049ec72f0fcb2c2cc883ad SHA512 a35e75145fe2ca29570a9004a8526385654b26a41143eb104f2a7be61769542eefaca6020e79bf1ef4ad37f2e07168ce0aba0e2fea29ff3bdc07daab0f36cf84
-EBUILD opencv-3.4.1-r7.ebuild 18569 BLAKE2B 296a275a5bbc44ab2a43bcd48336de85f9806b1667ae201aea7444925a681a9262c326b831beab157f9573c8a7967b22cb5f63aafeed494ad7da3906cfe109c9 SHA512 781fa7d47616b45d24f1be3b1bd6bc9c8e8770cf52b0c7356c538514ab3e461f62288617ddef1f087502afd89566a7f68263eff99317597f15ab729f24abd581
-EBUILD opencv-4.1.2-r1.ebuild 18254 BLAKE2B 531cb1baf152b065cfe10a1d074a5af323da39d367385ff09b53b9eaf3fb2a60033f37c779beec52970c3cb91ea2b30261d9a6e890f8a411687b611887a1b6b3 SHA512 6229f825c8aaafd82ae9261e3a7c4f83d26b909b7d773b81b2efa108503664fc2dc31e6975a2bbcea7520aea31ab1792b5d19b71f9f47de805a94ec9582743d2
-EBUILD opencv-4.1.2-r3.ebuild 18339 BLAKE2B c93988a8a7ebbbccc7e3394c57bf95d22ac963e9fae72a0c6d9397926a2c1f12df70ba3106041582716b0032687edeaf1b53d15fe0a4748a6483d0fe23c94e90 SHA512 42faba97bebbd0f5f5bd351c347b801bf2bbdbf02486dd14ce1efb639afbdd35ec1aca9b39a60502e4b70b269d1e2c9e4cb8f09e874fa5865bc3d15265d33703
+EBUILD opencv-3.4.1-r7.ebuild 18549 BLAKE2B 48af0cef62a6f3d672f21f97eecb34b6048a6b7cf6d3064c7166c226a645634137da33cfa91416eaec240ab82cc98d0191c5b668ff20f1cd19c6ddedc0c56aa6 SHA512 d277fae628589279850b35fc6b947b7f02137b21b87e88e80651825b9d75dc9eba0c524ffa265fa8ddc3998366f1122b383dfdfd508b77ed7967cf769a6054e3
+EBUILD opencv-4.1.2-r1.ebuild 18234 BLAKE2B cb0ad9fe36fe6b4c95ccd5fbb2234802a040d9eeff437999dd7b6b594b1d9f2d87d5d46322244a117e72fdab8a6f461173412a953bf9d8012b206efc3c10f8c5 SHA512 49baaa76d391452b611dd40dfb4b144b9c67c34f1e500397b3415f95860306532b167ab98ed9b0ed09f06b66abdcf77ce88c15957967229d0bd54363de56c0db
+EBUILD opencv-4.1.2-r3.ebuild 18318 BLAKE2B 8b7ae5933e6b6a7b7292eb112a8b2c5164726e5718dc0bb81fcb8c477f42bd31578f22516447dcf9f6649c368809f478759ee4810606d3315b2333433e001774 SHA512 730bb5c1ca8cc0d20ebf7b9720d74d950ebec413679b7dd6f4040cbff34df967417ba51169d156882f19d08fd1f9abf7d034dec8d749c7ed7c3785262f557aa3
 MISC metadata.xml 2786 BLAKE2B 1a29ddd9b75277f52d0a66cfb60fe2ad240ffdbdbf58a74038c684658405e90e858470b84fc0ff0935c972020152cfe6b6570a53ac68b71c299036e06516f469 SHA512 aa72fe71384691be664703e35c2f1342f9c90881d761b04e16357869c515fba551940b5bb624f9a7085f1ffa2e26067ac28b42fd97375d8a81a1901158b86ffc
diff --git a/media-libs/opencv/opencv-3.4.1-r7.ebuild b/media-libs/opencv/opencv-3.4.1-r7.ebuild
index 683c36a14930..76c7ada5db8c 100644
--- a/media-libs/opencv/opencv-3.4.1-r7.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r7.ebuild
@@ -99,7 +99,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
 	xine? ( media-libs/xine-lib )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	eigen? ( dev-cpp/eigen:3 )
 	java?  ( >=virtual/jdk-1.6 )
 	vaapi?  ( x11-libs/libva )"
diff --git a/media-libs/opencv/opencv-4.1.2-r1.ebuild b/media-libs/opencv/opencv-4.1.2-r1.ebuild
index ba6201ddc539..19a98b7fe06d 100644
--- a/media-libs/opencv/opencv-4.1.2-r1.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r1.ebuild
@@ -95,7 +95,7 @@ RDEPEND="
 	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
 	xine? ( media-libs/xine-lib )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	eigen? ( dev-cpp/eigen:3 )
 	java?  ( >=virtual/jdk-1.6 )
 	vaapi?  ( x11-libs/libva )"
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
index 0265b3431315..3fec493f57f6 100644
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/4.1.2" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
@@ -99,7 +99,7 @@ DEPEND="${RDEPEND}
 	vaapi? ( x11-libs/libva )"
 BDEPEND="
 	java? ( >=virtual/jdk-1.6 )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/opencv2/cvconfig.h