gentoo resync : 27.10.2021

21 files changed, 602 insertions, 441 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0d3f56e34265..9d9883dceb40 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 4eb58b562ba7..65fed314502d 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,6 @@
+AUX codec2-1.0.1-static-rx_filter_coh.patch 688 BLAKE2B 9e80bfeacd28591128c863b81b41b447866b6f1c0c2c20905459c623e4dcf428efbf28fabf4a53470f74e739b55281761a0162112c076ee0c959d2e067b8c0c7 SHA512 abbd495022db2d695708f552a63274cab769f14d787092ca55f9f7f710d3d225e662d510d982553f77d14c59c35be1d82853e7b339bd55c8defb36abe3411e36
 DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3
 DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6
 EBUILD codec2-1.0.0.ebuild 713 BLAKE2B 2709cf1ee94f8f3341e054dfe6f0564a9223a64e9cc0896e3b4b32dcf7c86f7a2aac7c75669714da87db9e629ac23cb46b852296f7702911d470b8f7fa5141f4 SHA512 c4a8f31bc89f740d5d14e2fb63936b1a4c9bb15c9ef4aa56d36c9523ef4346ac0ef80848174600d9e7e6d5c745e6665f82ca4b9249f0b07f11d2929de0fe78a7
-EBUILD codec2-1.0.1.ebuild 719 BLAKE2B 4916b9c96aae9b647bb1035900de6c8b336fd7107d51b7d970d2b6d29cbb680962b80efc58bf6c5e4e723ae707ef5c1dc926f3305fc345441b061358c13693f8 SHA512 92d7dbcbe6632f5b64209b5aa208df6cebf5e0d2cd17dbb40e531bfaa404605fdd91a956ac3d2982f1401f385bd31b05c5709aff662260dbb3d03da05a29a336
+EBUILD codec2-1.0.1.ebuild 787 BLAKE2B ba3eca99d3876b66afe98b460a13bfb7fceb9cdc69aa36eda7d3ca0ab7b329b6ead75181d1b4768e29745a161164d6c497a4efd075598d41a8ec91297d1d08ce SHA512 5117b1ce15fe8436a16677133ce3c17c98f40b1634ff47cd18659b8f0edf48268b4dad287c4dd53e0e83897e952ce7f6983c44e6cc3619232f11ec11e965b2ed
 MISC metadata.xml 326 BLAKE2B a7fc8408d6f6b58ad9d7019e858c703fd65ba38072dfefa381a5d00b500fe5d0ba024c2a3ed2d37e8e11da71f53bbfbeb80ead070935b9e83929d75d3a7852af SHA512 73c8e213262ac05ced95080d9e97a1e2abfdb2ad9e436ededda82de01feea321c3d499c8c2e8b3725a81b434e9efc4b12b321d738ab966d104e3344f4e29206b
diff --git a/media-libs/codec2/codec2-1.0.1.ebuild b/media-libs/codec2/codec2-1.0.1.ebuild
index 43e5b77c8f43..616aed089b40 100644
--- a/media-libs/codec2/codec2-1.0.1.ebuild
+++ b/media-libs/codec2/codec2-1.0.1.ebuild
@@ -17,6 +17,10 @@ IUSE="examples test"
 # Not yet passing, but infrastructure added to run
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch"
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DUNITTEST=$(usex test)
diff --git a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
new file mode 100644
index 000000000000..9290ea9b2cfa
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cohpsk.c b/src/cohpsk.c
+index f4f8dcdc..0b0ead9c 100644
+--- a/src/cohpsk.c
++++ b/src/cohpsk.c
+@@ -809,7 +809,7 @@ typedef float float4 __attribute__ ((vector_size (16)));
+ 
+ \*---------------------------------------------------------------------------*/
+ 
+-inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
++static inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
+ {
+     int c,i,j,k,l;
+     int n=COHPSK_M/P;
diff --git a/media-libs/ladspa-sdk/Manifest b/media-libs/ladspa-sdk/Manifest
index 606625306a17..efb11ffda47c 100644
--- a/media-libs/ladspa-sdk/Manifest
+++ b/media-libs/ladspa-sdk/Manifest
@@ -1,7 +1,4 @@
-AUX ladspa-sdk-1.15-properbuild.patch 3933 BLAKE2B bbddaddd99c24db14306443b82106c17a096aee2ec684b717c8fccb76dd028e62f0ac8a575777450a0037cc154ea6e1515a6e732dd9822ddff39980afeb0c154 SHA512 bc276c02b9f23643616372477d5b2e9d186977ae1f3aef3a984162d46c362df06dd6e0b8a3156f1eb7e37dc66cbb4db8768cebcd0879ba6b36ab0245db2dbb9b
 AUX ladspa-sdk-1.17-properbuild.patch 3984 BLAKE2B 12a65c1118a070a4f408cf4ec9ffaf8331fd7beb9625503a5bbcad2ab937508333e64b8ba0418fd8db0bcbfe03bf29befbbbd290ad9af2b890f5ee1ee9c20061 SHA512 05c40e4a60716a0f3a2ce98fe268179cdb37dbeac59bc85314155484bacc469691fb7db397e40ba0f078ec38be7ec9f1c4d36ebe561869491c8b7710c74e6ed1
-DIST ladspa_sdk_1.15.tgz 71179 BLAKE2B 7a201fd968433241fda190874d51b835f425c8f35270dc8fac9acf4e9e1546fa20d48f85e894b9eb263dd5d84c2b407481d168e18256dfe2cdd026fe0c805a65 SHA512 a521622e23d988284244003e4ccfc3b42f6ddc7944cb00e7949b87e09d7f39a0cbb64b6d8b5a5af0a5ccf7179f88815416a88f02d3912957167e54b74accfc65
 DIST ladspa_sdk_1.17.tgz 71052 BLAKE2B cfb80e8ced314d5cc62fcb7f0b82e58f572503f2a732b2bb8a58343e8f69e417c0b0a2919bbb40629567fb331bf60a7f0c6f186db47e5b2651725b039526cdbb SHA512 37f94aa52b5a2f8709528989dea289eb01342f3bcb9e85d0f4829ddd9d90b2934a113db11100f09375a50f6612122b78156fec916f2c78a22406253d5cb394c7
-EBUILD ladspa-sdk-1.15-r1.ebuild 1218 BLAKE2B 4975611ec6f2d6f8f53645bc2354c9c5bd456343a27846875529cd0e6811fe7193bf89e9df0a4045a4a2a2335ee0301f09ddffe9d35af6f1a6caecb96c3307cd SHA512 4d77ec73526b2e9e67e1f78671155787ad3f6c70b362b1d4dcb6bab2f1528fdc03803185cd61968bd1bf9f7a872e3f5af6d7a75e4469a361f29b200062132dfc
-EBUILD ladspa-sdk-1.17.ebuild 1255 BLAKE2B 1c7ba763494785af7d07216ab5a40bf2d4242e4f64c46ae7d7eb1fd332d01df4d1b97918e876a08062c029a36d028306e5d7380e1c59e13914f6ed484f00a0ea SHA512 247dca4458b89d1443a73c13239e086bb4daac8b42072255faa63f8633b360381a67b9786a2322a90c33bcaef8de06dede248544f51f20bdf475f5607e4dc4c0
+EBUILD ladspa-sdk-1.17-r1.ebuild 1233 BLAKE2B 3d1ac905d5cb8f732f2064618d4d03643192f79a4037557cbdbf82a2e691f6cb233c744511e9acd11896b99f94caf2a070eb14e841d85e7a59d1887c66a514ac SHA512 c391fcbb8293a0f143fd38fafd5b547e8f1a3f522421196bef011e2d91734d0e075e72df7adefe213e3c4b921ef0d1bceb2285ef335d635f5dd914d72fc166ca
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch b/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
deleted file mode 100644
index 709ec7c8456a..000000000000
--- a/media-libs/ladspa-sdk/files/ladspa-sdk-1.15-properbuild.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index c339524..2166624 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -13,12 +13,12 @@ INSTALL_BINARY_DIR	=	/usr/bin/
- # GENERAL
- #
- 
-+CFLAGS		=	-Wall -Werror -O3
-+CXXFLAGS	=	-Wall -Werror -O3
-+
- INCLUDES	=	-I.
--LIBRARIES	=	-ldl -lm
--CFLAGS		=	$(INCLUDES) -Wall -Werror -O2 -fPIC 		\
--			-DDEFAULT_LADSPA_PATH=$(INSTALL_PLUGINS_DIR)
--BINFLAGS	=	-fPIE -pie
--CXXFLAGS	=	$(CFLAGS)
-+DYNAMIC_LD_LIBS =	-ldl
-+LIBRARIES	=	$(DYNAMIC_LD_LIBS) -lm
- PLUGINS		=	../plugins/amp.so				\
- 			../plugins/delay.so				\
- 			../plugins/filter.so				\
-@@ -28,34 +28,25 @@ PROGRAMS	=	../bin/analyseplugin				\
- 			../bin/applyplugin 				\
- 			../bin/listplugins
- CC		=	cc
--CPP		=	c++
-+CXX		=	c++
-+MKDIR_P		=	mkdirhier
- 
- ###############################################################################
- #
- # RULES TO BUILD PLUGINS FROM C OR C++ CODE
- #
- 
-+../plugins/filter.so:	plugins/filter.c ladspa.h gcc_exports.map
-+	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/filter.o -c plugins/filter.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/filter.so plugins/filter.o -nostartfiles -shared -lm
-+
- ../plugins/%.so:	plugins/%.c ladspa.h gcc_exports.map
--	$(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
--	$(CC)	-o ../plugins/$*.so					\
--		plugins/$*.o						\
--		-shared							\
--		$(CFLAGS)						\
--		-fvisibility=hidden					\
--		-fvisibility-inlines-hidden				\
--		-s							\
--		-Wl,--version-script=gcc_exports.map			
-+	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -nostartfiles -shared
- 
- ../plugins/%.so:	plugins/%.cpp ladspa.h gcc_exports.map
--	$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
--	$(CPP)	-o ../plugins/$*.so					\
--		plugins/$*.o						\
--		-shared							\
--		$(CXXFLAGS)						\
--		-fvisibility=hidden					\
--		-fvisibility-inlines-hidden				\
--		-s							\
--		-Wl,--version-script=gcc_exports.map			
-+	$(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp
-+	$(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared
- 
- ###############################################################################
- #
-@@ -66,7 +57,7 @@ test:	/tmp/test.wav ../snd/noise.wav always
- 	@echo ---------------------------------------------
- 	@echo First listen to the white noise input signal:
- 	@echo ---------------------------------------------
--	-sndfile-play ../snd/noise.wav
-+	@echo -sndfile-play ../snd/noise.wav
- 	@echo -------------------------
- 	@echo Compare to plugin output.
- 	@echo -------------------------
-@@ -75,12 +66,12 @@ test:	/tmp/test.wav ../snd/noise.wav always
- 	@echo Test complete.
- 
- install:	targets
--	-mkdir -p $(INSTALL_PLUGINS_DIR)
--	-mkdir -p $(INSTALL_INCLUDE_DIR)
--	-mkdir -p $(INSTALL_BINARY_DIR)
--	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
--	cp ladspa.h $(INSTALL_INCLUDE_DIR)
--	cp ../bin/* $(INSTALL_BINARY_DIR)
-+	-$(MKDIR_P) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
-+	-$(MKDIR_P) $(DESTDIR)$(INSTALL_INCLUDE_DIR)
-+	-$(MKDIR_P) $(DESTDIR)$(INSTALL_BINARY_DIR)
-+	cp ../plugins/* $(DESTDIR)$(INSTALL_PLUGINS_DIR)
-+	cp ladspa.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)
-+	cp ../bin/* $(DESTDIR)$(INSTALL_BINARY_DIR)
- 
- /tmp/test.wav:	targets ../snd/noise.wav
- 	../bin/listplugins
-@@ -106,19 +97,19 @@ targets:	$(PLUGINS) $(PROGRAMS)
- #
- 
- ../bin/applyplugin:	applyplugin.o load.o default.o
--	$(CC) $(CFLAGS) $(BINFLAGS)					\
-+	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
- 		-o ../bin/applyplugin					\
- 		applyplugin.o load.o default.o				\
- 		$(LIBRARIES)
- 
- ../bin/analyseplugin:	analyseplugin.o load.o default.o
--	$(CC) $(CFLAGS) $(BINFLAGS)					\
-+	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
- 		-o ../bin/analyseplugin 				\
- 		analyseplugin.o load.o default.o			\
- 		$(LIBRARIES)
- 
- ../bin/listplugins:	listplugins.o search.o
--	$(CC) $(CFLAGS) $(BINFLAGS)					\
-+	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)					\
- 		-o ../bin/listplugins	 				\
- 		listplugins.o search.o					\
- 		$(LIBRARIES)
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.17-r1.ebuild
index acdd022d0734..014dffe64739 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.15-r1.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.17-r1.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=7
 
-inherit multilib toolchain-funcs portability flag-o-matic multilib-minimal
+inherit toolchain-funcs portability multilib-minimal
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}_${PV}
 
 DESCRIPTION="The Linux Audio Developer's Simple Plugin API"
-HOMEPAGE="http://www.ladspa.org/"
-SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
+HOMEPAGE="https://www.ladspa.org/"
+SRC_URI="https://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
+RDEPEND="media-libs/libsndfile[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
deleted file mode 100644
index 401c28e7dea1..000000000000
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs portability multilib-minimal
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="The Linux Audio Developer's Simple Plugin API"
-HOMEPAGE="http://www.ladspa.org/"
-SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-CDEPEND="media-libs/libsndfile"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	>=sys-apps/sed-4
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-properbuild.patch"
-)
-
-HTML_DOCS="doc/*.html"
-
-src_prepare() {
-	default
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	cd src
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-		DYNAMIC_LD_LIBS="$(dlopen_lib)" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		targets
-}
-
-multilib_src_test() {
-	cd src
-	emake test
-}
-
-multilib_src_install() {
-	cd src
-	emake INSTALL_PLUGINS_DIR="/usr/$(get_libdir)/ladspa" \
-		DESTDIR="${ED}" \
-		MKDIR_P="mkdir -p" \
-		install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Needed for apps like rezound
-	dodir /etc/env.d
-	echo "LADSPA_PATH=${EPREFIX}/usr/$(get_libdir)/ladspa" > "${ED}/etc/env.d/60ladspa"
-}
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index afc7de079831..87514f59fc53 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,6 +1,6 @@
 DIST libmtp-1.1.18.tar.gz 832463 BLAKE2B 136033e9700fcce6d5092f8f5f896ce40b2ef659d638bd2e432fb7522c1c4e7e930171198ada5c67c0f5dc7c94ed36ec7d2ac8f4faa3bb335d4a8abb032ae2ef SHA512 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
 EBUILD libmtp-1.1.18.ebuild 1607 BLAKE2B 9d275d6310114815fb4ce70d8dd66b22f2b407c9c87f7cc5182b8e1ec6b118e0b74b00cb19baba62c343628d9e915e410600da349116917074577404931ee911 SHA512 d6cc193aaca037be02340f185ea6b01e98399299a9a0710b033144f2489063f9856ccf7b7b122cf3cd4a5214d7dddc09e9d7c1be5699483f9f31531538c7683a
-EBUILD libmtp-1.1.19.ebuild 1612 BLAKE2B a6fb9432674f56058cd66b6f9280917e7315be1013fe1eb634e404cc3ab7dbef5924ef6ac8b08104972377eb382377437a9a81264b0df531a1416b544a1b57ef SHA512 0f213e76c08578a01ca1446b4b741a51132c075bf26d3e98b087164b3a4065ccfab9cdd4e23151797ba92f1a2565fdd0b99b64c2ed5e2082600b66d52758b2e3
+EBUILD libmtp-1.1.19.ebuild 1610 BLAKE2B 1bfe9ca9529d75106b2b141c7a4e22c89cfd7d2d291450710eb7e14a8af641eac1a7dde2cdbc5313ea3a03f3706dc321c32a2eeb4c3bf746f7e78fc1ed89f46a SHA512 3602c10bcc2934aedae5533a66f3afe7df04f0a8790edba25c11a6de6b4f36e3e2b7c8b6d06574505c28570a066b1ef29decb43c0056a0b7e20964920fa6258e
 EBUILD libmtp-9999.ebuild 1594 BLAKE2B b539573f2e7c95d5d3622515e7f37baec057ee64be4468129484382b33e70d9b66028a5460ff2920b15fc3a2016b6c6def1d83223855448d3071493fd0eac439 SHA512 402e201946ce11315c5d366f03835a969f2b7b91e7c35f8eaf2920042b19abe104c097e1521454f31b37884c9af244829e4e9f6e765775f0dc4b7eb38cc884a1
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.19.ebuild b/media-libs/libmtp/libmtp-1.1.19.ebuild
index 6a4e3f9455ec..ce44f968a49b 100644
--- a/media-libs/libmtp/libmtp-1.1.19.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.19.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 3d30a36f9ee7..7730bf3f5c79 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,3 @@
-DIST libsidplayfp-2.2.2.tar.gz 794119 BLAKE2B eb0fd39e8bffdce45d081f5dab9074db9642e74f9bd06a5f17453254bb1ab4f0348a9b49e43a00a0f5cbff57fe3ddd1408cbf048bd228784fd5b1ac19700f944 SHA512 46882c5edd20a5b00ee5b46b0b6c65c0987c33406532f0b1f1750b0f8faf2968ee45e68ee65e6ca9cc39123273b08e139a8614ba9878d14099388e647e3bad1b
 DIST libsidplayfp-2.3.0.tar.gz 794863 BLAKE2B 5727cdaf155711f8fe582cfa49d868be89fcf7e9f58cb7b8d83fefecbb04830a04957f8f176527928da26cb47c7508d534c1b35607cc713610ddcd920b760049 SHA512 2141bc9768353fadbb8c6f4ba6904388048d4d1432424b87fe60162135059d5c9312f7bf01c67a75eda8b4697d801bc2020f88b696794311eef88864ae65d974
-EBUILD libsidplayfp-2.2.2.ebuild 672 BLAKE2B 876f2522a085c81373bc6b92462523b10b5f7a1e31f1685ba4f7d28eadc54df685b131c7c2dd9a0cdf1536aa188f05c03c74d79b54007593678cd8bc8108e5ea SHA512 065c651fb8242df4f9d7d050fa8f74a5457ae35080535ca1ca0f399f013c72ca4bc3dcf1b30190bddaa2e43f1865bf703c3f26728edce4333c2867005b4804d0
-EBUILD libsidplayfp-2.3.0.ebuild 674 BLAKE2B 25a34a5a8039a3874789b69dbdd54d79512e86a99b7a8e968739084b33c325fec6ef16d033b17662bedfba990b624db23e5385b66be796458174f3187b677863 SHA512 39c4e36c7d1a4aea65993b8e0f04a1f533ffd3d0f9829b7f2e0511016e2d0f3991ee376a30a361fd95b391c6c51cd57671991b4b705429106185e122475802d8
+EBUILD libsidplayfp-2.3.0.ebuild 672 BLAKE2B 876f2522a085c81373bc6b92462523b10b5f7a1e31f1685ba4f7d28eadc54df685b131c7c2dd9a0cdf1536aa188f05c03c74d79b54007593678cd8bc8108e5ea SHA512 065c651fb8242df4f9d7d050fa8f74a5457ae35080535ca1ca0f399f013c72ca4bc3dcf1b30190bddaa2e43f1865bf703c3f26728edce4333c2867005b4804d0
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild
deleted file mode 100644
index c7f632d763da..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-2.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 ~hppa ~riscv x86"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	# fix automagic. warning: modifying .ac triggers maintainer mode.
-	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
index 59fb066277dc..c7f632d763da 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
deleted file mode 100644
index 772a614744b8..000000000000
--- a/media-libs/libyami/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libyami-1.3.2.tar.gz 820517 BLAKE2B 189ef95bcd504422550f6df38433d042a45e2a1c36b30b1b5445ce69076c95f4d1b60e12e09ff4b11245e3fcdc70a4fa5e0879e3976c4891ca98fa00d79360c1 SHA512 25300d589119b5f5211b5a2445b408dbb35aea83bf18bc3d3b42d6b29151495f5118cf0f32bcc8c3756ac58fccb16932e78c8b6e7b29daffcc9ee08a3e0b5b54
-EBUILD libyami-1.3.2.ebuild 2364 BLAKE2B 244b524a391fa95c11612e3608d89519b17da55cc6cb529ae1b74fb997c1a0a9bb07d208b74b22bba16d1f553feb7d0e696576a0584fdf2b5c0629e329951c38 SHA512 c770356969f42966976cd7977e6a583a22ea16770175aabd2bf5e80ac2ef69a2a2248a2ca1eb6cb77c5bd1226aa8f6d4d8faffb1d1e3304be65d94b4e34fbde0
-EBUILD libyami-9999.ebuild 2364 BLAKE2B 244b524a391fa95c11612e3608d89519b17da55cc6cb529ae1b74fb997c1a0a9bb07d208b74b22bba16d1f553feb7d0e696576a0584fdf2b5c0629e329951c38 SHA512 c770356969f42966976cd7977e6a583a22ea16770175aabd2bf5e80ac2ef69a2a2248a2ca1eb6cb77c5bd1226aa8f6d4d8faffb1d1e3304be65d94b4e34fbde0
-MISC metadata.xml 565 BLAKE2B 7bc4b3bc56ebad3643ed2478d8ee062a6bbb308c72173a5a4f56ccc720c9d2779897fcdf2fbf059680317f73b6a29a758f4f1f10e03f06e1a0aa5ae4b0d0aa6b SHA512 cf8d0bd8f10ed2faef3ee94e09ba91940f89f94f27fc5b16f48b274edbc98f22266815fc46636032d7cc277442b54b9962fce578273b93a70cbb5c722914a404
diff --git a/media-libs/libyami/libyami-1.3.2.ebuild b/media-libs/libyami/libyami-1.3.2.ebuild
deleted file mode 100644
index b521ead3f995..000000000000
--- a/media-libs/libyami/libyami-1.3.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=git-r3
-	EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/01org/libyami/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug egl dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
-	v4l? (
-		>=virtual/opengl-7[${MULTILIB_USEDEP}]
-		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
-	)
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
-	sed -i -e 's/-Werror//' configure.ac || die
-	sed -e 's#$(top_srcdir)/gtestsrc/libgtest.la#-lgtest#' -i */Makefile.unittest || die
-	sed -e 's#-I$(top_srcdir)/gtestsrc/gtest/include##' -i */Makefile.unittest || die
-	sed -e 's/gtestsrc//' -i Makefile.am || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface"
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable v4l v4l2) \
-		$(use_enable v4l v4l2-ops) \
-		$(use_enable X x11) \
-		$(use_enable dmabuf) \
-		$(use_enable md5) \
-		$(use_enable wayland) \
-		$(use_enable test tests) \
-		$(multilib_native_use_enable doc docs) \
-		--enable-h265dec \
-		--enable-vc1dec \
-		--enable-h264dec \
-		--enable-jpegdec \
-		--enable-mpeg2dec \
-		--enable-vp8dec \
-		--enable-vp9dec \
-		--enable-h265enc \
-		--enable-h264enc \
-		--enable-jpegenc \
-		--enable-vp8enc \
-		--enable-vp9enc
-}
-
-multilib_src_compile() {
-	emake
-	multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
-	multilib-minimal_src_install
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-9999.ebuild
deleted file mode 100644
index b521ead3f995..000000000000
--- a/media-libs/libyami/libyami-9999.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=git-r3
-	EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/01org/libyami/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug egl dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
-	v4l? (
-		>=virtual/opengl-7[${MULTILIB_USEDEP}]
-		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
-	)
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
-	sed -i -e 's/-Werror//' configure.ac || die
-	sed -e 's#$(top_srcdir)/gtestsrc/libgtest.la#-lgtest#' -i */Makefile.unittest || die
-	sed -e 's#-I$(top_srcdir)/gtestsrc/gtest/include##' -i */Makefile.unittest || die
-	sed -e 's/gtestsrc//' -i Makefile.am || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface"
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable v4l v4l2) \
-		$(use_enable v4l v4l2-ops) \
-		$(use_enable X x11) \
-		$(use_enable dmabuf) \
-		$(use_enable md5) \
-		$(use_enable wayland) \
-		$(use_enable test tests) \
-		$(multilib_native_use_enable doc docs) \
-		--enable-h265dec \
-		--enable-vc1dec \
-		--enable-h264dec \
-		--enable-jpegdec \
-		--enable-mpeg2dec \
-		--enable-vp8dec \
-		--enable-vp9dec \
-		--enable-h265enc \
-		--enable-h264enc \
-		--enable-jpegenc \
-		--enable-vp8enc \
-		--enable-vp9enc
-}
-
-multilib_src_compile() {
-	emake
-	multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
-	multilib-minimal_src_install
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
deleted file mode 100644
index eef0bdb8e3f5..000000000000
--- a/media-libs/libyami/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="egl">Enable EGL support.</flag>
-		<flag name="v4l">Add support for V4L2 hardware codecs.</flag>
-		<flag name="md5">Add support for generating md5 sums for each frame.</flag>
-		<flag name="dmabuf">Enable dma_buf buffer sharing.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">01org/libyami</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b2a4c5f2b7e8..fa6864b33232 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -16,4 +16,5 @@ DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f7
 EBUILD opencv-4.5.0-r1.ebuild 20519 BLAKE2B d49c3660825ac597bbdb2d8262b9c024c734931140533de7fabab3d561cd0bbaa4c832af41e9063c2eab76729febdce7598307ff694004fd71127ee0f4560c60 SHA512 4612b55bbfc160b42b97d684bc8053e6f499bd460a8a7c5c6ab30e092597e47c5433f7c02176ad80a8c6045568de5b5336bd862dd6e4c3c74b8957bc42642fcf
 EBUILD opencv-4.5.1-r1.ebuild 20606 BLAKE2B d1bdbff23f18fe325f0912704939383e9c03d278e33b5606eebf78049c374a6c2f64d4e8f28b169ac8f191d78115238fb2ac9772080dbbff09330188928b72fe SHA512 fb4cae4db0090c83d6a06eaf2761a639d5c87b1020b88e9795afc49a914fbf1a69bb62f1604a0681a9a13816983b22679523ac80d6f502b66e10555de318e1ae
 EBUILD opencv-4.5.2-r1.ebuild 20659 BLAKE2B c73885f3d135edff3cbe27f8e48aa880b6bb3c922599eea1158e822dcb38f4f060fdce01afea7ab25f6dbea0a8dce6509d6894905a86c21fbb2829d3a62832ee SHA512 e0d3dbd8a68f74874a6e545eb6ba047740ab844d8bef718271a3d7cab33d7fb7a2fa3b1b8fa926c667c76aaf8c5b5fdcf7127dbbce19be82cc3d96d3087b7980
+EBUILD opencv-4.5.2-r2.ebuild 20665 BLAKE2B 9c05f9b65ca10ec1e2b648539710db260858dd8c401a250d42e7544e585daec036b3046e57b6a9011a49014840ca631ed62f9e4cd699bb17e533665e071ec70d SHA512 1d6a4efafce8a18beb12a41c9b3b266cd2ad86361f40eb3ae014e9d2f7643e26a3682c025075c975a32f11bd74ec86f0b42ad03355e66b50ff3a17027a1513bf
 MISC metadata.xml 3186 BLAKE2B 0293399368d675e350992184bcaad2de17e68aae0ea3fa15bb885ac975f14f0350efc5a00a17737be22cf8b5c0808b3853c77b66ff43294f443305ee188aaa06 SHA512 6d3ee73a3b78581b3e4f12287578cae84afa8747d2432fa436860c265ae92f1072cb83a1b41a2f80ed9141f4c097224df6280c78970d7d68e1c9baa92d383395
diff --git a/media-libs/opencv/opencv-4.5.2-r2.ebuild b/media-libs/opencv/opencv-4.5.2-r2.ebuild
new file mode 100644
index 000000000000..1ed22e7ebad3
--- /dev/null
+++ b/media-libs/opencv/opencv-4.5.2-r2.ebuild
@@ -0,0 +1,570 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+CMAKE_ECLASS=cmake
+inherit java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
+	download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz )
+	contrib? (
+		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
+		contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+		contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
+	)"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+
+# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_neon:NEON
+	cpu_flags_arm_vfpv3:VFPV3
+)
+PPC_CPU_FEATURES=(
+	cpu_flags_ppc_vsx:VSX
+	cpu_flags_ppc_vsx3:VSX3
+)
+X86_CPU_FEATURES_RAW=(
+	avx:AVX
+	avx2:AVX2
+	avx512f:AVX_512F
+	f16c:FP16
+	fma3:FMA3
+	popcnt:POPCNT
+	sse:SSE
+	sse2:SSE2
+	sse3:SSE3
+	ssse3:SSSE3
+	sse4_1:SSE4_1
+	sse4_2:SSE4_2
+)
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it Wwithout the user knowing, which defeats the
+# purpose of the opengl use flag.
+# cuda needs contrib, bug #701712
+REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_f16c )
+	cpu_flags_x86_f16c? ( cpu_flags_x86_avx )
+	cuda? ( contrib
+		tesseract? ( opencl ) )
+	dnnsamples? ( examples )
+	gflags? ( contrib )
+	glog? ( contrib )
+	contribcvv? ( contrib qt5 )
+	contribdnn? ( contrib )
+	contribfreetype? ( contrib )
+	contribhdf? ( contrib )
+	contribovis? ( contrib )
+	contribsfm? ( contrib eigen gflags glog )
+	contribxfeatures2d? ( contrib download )
+	examples? ( contribdnn )
+	java? ( python )
+	opengl? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tesseract? ( contrib )
+	?? ( gtk3 qt5 )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	contribhdf? ( sci-libs/hdf5:= )
+	contribfreetype? (
+		media-libs/freetype:2[${MULTILIB_USEDEP}]
+		media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
+	)
+	contribovis? ( dev-games/ogre:0/1.12 )
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	gdal? ( sci-libs/gdal:= )
+	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
+	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+	gtk3? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		media-libs/libdc1394:=[${MULTILIB_USEDEP}]
+		sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	)
+	java? ( >=virtual/jre-1.8:* )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}]
+	)
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5=
+		dev-qt/qttest:5=
+		dev-qt/qtconcurrent:5=
+		opengl? ( dev-qt/qtopengl:5= )
+	)
+	tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] )
+	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xine? ( media-libs/xine-lib )"
+# bug #747949 for eigen (eigen-3.3.8 was broken upstream)
+DEPEND="${RDEPEND}
+	eigen? (
+		|| (
+			>=dev-cpp/eigen-3.3.8-r1:3
+			<dev-cpp/eigen-3.3.8:3
+		)
+	)
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# [opencv4]
+	/usr/include/opencv4/opencv2/cvconfig.h
+	/usr/include/opencv4/opencv2/opencv_modules.hpp
+	# [cudev]
+	/usr/include/opencv4/opencv2/cudaarithm.hpp
+	/usr/include/opencv4/opencv2/cudabgsegm.hpp
+	/usr/include/opencv4/opencv2/cudacodec.hpp
+	/usr/include/opencv4/opencv2/cudafeatures2d.hpp
+	/usr/include/opencv4/opencv2/cudafilters.hpp
+	/usr/include/opencv4/opencv2/cudaimgproc.hpp
+	/usr/include/opencv4/opencv2/cudalegacy.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCV.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp
+	/usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp
+	/usr/include/opencv4/opencv2/cudaobjdetect.hpp
+	/usr/include/opencv4/opencv2/cudaoptflow.hpp
+	/usr/include/opencv4/opencv2/cudastereo.hpp
+	/usr/include/opencv4/opencv2/cudawarping.hpp
+	/usr/include/opencv4/opencv2/cudev/block/block.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp
+	/usr/include/opencv4/opencv2/cudev/block/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/block/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp
+	/usr/include/opencv4/opencv2/cudev/common.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/color.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/expr.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/reduction.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp
+	/usr/include/opencv4/opencv2/cudev/expr/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/functional.hpp
+	/usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/histogram.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/integral.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/grid/transpose.hpp
+	/usr/include/opencv4/opencv2/cudev.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp
+	/usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp
+	/usr/include/opencv4/opencv2/cudev/util/atomic.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/limits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp
+	/usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp
+	/usr/include/opencv4/opencv2/cudev/util/tuple.hpp
+	/usr/include/opencv4/opencv2/cudev/util/type_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_math.hpp
+	/usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/reduce.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/scan.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp
+	/usr/include/opencv4/opencv2/cudev/warp/warp.hpp
+	# [contrib_cvv]
+	/usr/include/opencv4/opencv2/cvv/call_meta_data.hpp
+	/usr/include/opencv4/opencv2/cvv/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/debug_mode.hpp
+	/usr/include/opencv4/opencv2/cvv/dmatch.hpp
+	/usr/include/opencv4/opencv2/cvv/filter.hpp
+	/usr/include/opencv4/opencv2/cvv/final_show.hpp
+	/usr/include/opencv4/opencv2/cvv.hpp
+	/usr/include/opencv4/opencv2/cvv/show_image.hpp
+	# [contrib_hdf]
+	/usr/include/opencv4/opencv2/hdf/hdf5.hpp
+	/usr/include/opencv4/opencv2/hdf.hpp
+	# [contrib_ovis]
+	/usr/include/opencv4/opencv2/ovis.hpp
+	# [vtk]
+	/usr/include/opencv4/opencv2/viz.hpp
+	/usr/include/opencv4/opencv2/viz/types.hpp
+	/usr/include/opencv4/opencv2/viz/viz3d.hpp
+	/usr/include/opencv4/opencv2/viz/vizcore.hpp
+	/usr/include/opencv4/opencv2/viz/widget_accessor.hpp
+	/usr/include/opencv4/opencv2/viz/widgets.hpp
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-disable-download.patch
+	"${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
+	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
+	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
+	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled stuff
+	rm -r 3rdparty || die "Removing 3rd party components failed"
+	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+		-i CMakeLists.txt cmake/*cmake || die
+
+	if use dnnsamples; then
+		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
+	fi
+
+	if use contrib; then
+		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+		if use contribxfeatures2d; then
+			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+		fi
+	fi
+
+	if use download; then
+		mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die
+	fi
+
+	java-pkg-opt-2_src_prepare
+
+	# this really belongs in src_prepare() too
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+}
+
+multilib_src_configure() {
+	# please dont sort here, order is the same as in CMakeLists.txt
+	GLOBALCMAKEARGS=(
+	# Optional 3rd party components
+	# ===================================================
+		-DENABLE_DOWNLOAD=$(usex download)
+		-DWITH_QUIRC=OFF # Do not have dependencies
+		-DWITH_1394=$(usex ieee1394)
+	#	-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_VTK=$(multilib_native_usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF # Video windows support
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
+		-DWITH_GTK=$(usex gtk3)
+		-DWITH_GTK_2_X=OFF # only want gtk3 nowadays
+		-DWITH_IPP=OFF
+		# Jasper was removed from tree because of security problems.
+		# Upstream were/are making progress. We use openjpeg instead.
+		# bug 734284
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENJPEG=$(usex jpeg2k)
+		-DWITH_WEBP=$(usex webp)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENVX=OFF
+		-DWITH_OPENNI=OFF	# Not packaged
+		-DWITH_OPENNI2=OFF	# Not packaged
+		-DWITH_PNG=$(usex png)
+		-DWITH_GDCM=OFF
+		-DWITH_PVAPI=OFF
+		-DWITH_GIGEAPI=OFF
+		-DWITH_ARAVIS=OFF
+		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
+		-DWITH_WIN32UI=OFF		# Windows only
+	#	-DWITH_QUICKTIME=OFF
+	#	-DWITH_QTKIT=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF		# Not packaged
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+	#	-DWITH_DSHOW=ON			# direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF	# Windows only
+		-DWITH_XINE=$(multilib_native_usex xine)
+		-DWITH_CLP=OFF
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCL_SVM=OFF
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=OFF
+		-DWITH_VA=$(usex vaapi)
+		-DWITH_VA_INTEL=$(usex vaapi)
+		-DWITH_GDAL=$(multilib_native_usex gdal)
+		-DWITH_GPHOTO2=$(usex gphoto2)
+		-DWITH_LAPACK=$(multilib_native_usex lapack)
+		-DWITH_ITT=OFF # 3dparty libs itt_notify
+	# ===================================================
+	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+	# ===================================================
+		-DWITH_CUDA=$(multilib_native_usex cuda)
+		-DWITH_CUBLAS=$(multilib_native_usex cuda)
+		-DWITH_CUFFT=$(multilib_native_usex cuda)
+		-DWITH_NVCUVID=OFF
+	#	-DWITH_NVCUVID=$(usex cuda)
+		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
+	# ===================================================
+	# OpenCV build components
+	# ===================================================
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_opencv_apps=$(usex opencvapps ON OFF)
+		-DBUILD_DOCS=OFF # Doesn't install anyways.
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(multilib_native_usex testprograms)
+		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
+	#	-DBUILD_WITH_STATIC_CRT=OFF
+		-DBUILD_WITH_DYNAMIC_IPP=OFF
+		-DBUILD_FAT_JAVA_LIB=OFF
+	#	-DBUILD_ANDROID_SERVICE=OFF
+		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
+		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
+	# ===================================================
+	# OpenCV installation options
+	# ===================================================
+		-DINSTALL_CREATE_DISTRIB=OFF
+		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
+		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
+		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
+	#	-DINSTALL_ANDROID_EXAMPLES=OFF
+		-DINSTALL_TO_MANGLED_PATHS=OFF
+		-DOPENCV_GENERATE_PKGCONFIG=ON
+		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
+		# to set its destination libdir
+		-DLIB_SUFFIX=
+	# ===================================================
+	# OpenCV build options
+	# ===================================================
+		-DENABLE_CCACHE=OFF
+		# bug 733796, but PCH is a risky game in CMake anyway
+		-DENABLE_PRECOMPILED_HEADERS=OFF
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+
+		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
+		-DENABLE_NOISY_WARNINGS=OFF
+		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
+		-DENABLE_IMPL_COLLECTION=OFF
+		-DENABLE_INSTRUMENTATION=OFF
+		-DGENERATE_ABI_DESCRIPTOR=OFF
+		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+		-DENABLE_LTO=$(usex lto)
+	# ===================================================
+	# things we want to be hard off or not yet figured out
+	# ===================================================
+		-DBUILD_PACKAGE=OFF
+	# ===================================================
+	# Not building protobuf but update files bug #631418
+	# ===================================================
+		-DBUILD_PROTOBUF=OFF
+		-DPROTOBUF_UPDATE_FILES=ON
+	# ===================================================
+	# things we want to be hard enabled not worth useflag
+	# ===================================================
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+		-DBUILD_opencv_features2d=$(usex features2d ON OFF)
+	)
+
+	# ==================================================
+	# cpu flags, should solve 633900
+	#===================================================
+	local CPU_BASELINE=""
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163
+			use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};"
+		fi
+	done
+
+	GLOBALCMAKEARGS+=(
+		-DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
+		-DCPU_BASELINE=${CPU_BASELINE}
+		-DCPU_DISPATCH=
+	)
+
+	# ===================================================
+	# OpenCV Contrib Modules
+	# ===================================================
+	if use contrib; then
+		GLOBALCMAKEARGS+=(
+			-DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
+			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
+			-DBUILD_opencv_dnns_easily_fooled=OFF
+			-DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
+			-DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
+			-DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
+			-DBUILD_opencv_sfm=$(usex contribsfm ON OFF)
+			-DBUILD_opencv_freetype=$(usex contribfreetype ON OFF)
+			-DBUILD_opencv_ovis=$(usex contribovis ON OFF)
+		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
+	fi
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		${GLOBALCMAKEARGS[@]}
+		-DPYTHON_EXECUTABLE=OFF
+		-DINSTALL_PYTHON_EXAMPLES=OFF
+		-DBUILD_opencv_python2=OFF
+		-DBUILD_opencv_python3=OFF
+	)
+
+	cmake_src_configure
+
+	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
+	# TODO patch ocv_download to copy files into destination dirs
+	if use contribdnn; then
+		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
+	fi
+
+}
+
+python_module_compile() {
+	local BUILD_DIR="${orig_BUILD_DIR}"
+	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+	# Set all python variables to load the correct Gentoo paths
+	mycmakeargs+=(
+		# python_setup alters PATH and sets this as wrapper
+		# to the correct interpreter we are building for
+		-DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON}
+		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+	)
+
+	# Regenerate cache file. Can't use rebuild_cache as it won't
+	# have the Gentoo specific options.
+	rm CMakeCache.txt || die "rm failed"
+	cmake_src_configure
+	cmake_src_compile
+	cmake_src_install
+
+	# Remove compiled binary so new version compiles
+	# Avoid conflicts with new module builds as build system doesn't
+	# really support it.
+	rm -r modules/python3 || die "rm failed"
+
+	python_optimize "${ED}"/$(python_get_sitedir)
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# Build and install the python modules for all targets
+	if multilib_is_native_abi && use python; then
+		local orig_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl python_module_compile
+	fi
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 03d11c31a6a3..0ee012d0f309 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -11,5 +11,5 @@ DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b1
 EBUILD openexr-2.5.6.ebuild 1743 BLAKE2B 8b2158c878589a878da14d945ff955e3b98b17c6da06470ac15965797a7f8096fb721f7ccbc2984394b0e4b341c0c5efe2c552453c702c095e725d997061eb98 SHA512 6bc52d858d7be2e73061572575658ca224e9bf696beff4e7015da3edca8b1da231e690b32cf152af4c046223d61bd9815da7e009f649bd658fafdc52618798b2
 EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
 EBUILD openexr-3.1.1.ebuild 2215 BLAKE2B a3916bf03903c147682f8e99d7e16c9dd7118293c07fe1fa8afb1da8290beb53a94cd26dd7d197f4c861b1e80615491ee138f115ec793ee64f8581fb6e057606 SHA512 d55549195644ae45c1eea31248973f43cc0b0166adedd40af303e24782f65523aee0f7974ff10617cd584915512eaf3d8add5718afe1b838c67aff403b43a709
-EBUILD openexr-3.1.2.ebuild 2110 BLAKE2B 69de4064b65a7a7588ad374fed0c65c903493c3986d56ed6c300949a3c50df333ef84e497aee650c6d9b4744445f85fd1748d2558aac3493e11c13dd542fd0b3 SHA512 f8e4ce99226ccab661f8e26f81026ada221655ef2744338b27b984096c442f4d792a90c71b10f391c8e497b45c2a94a4d063ab55da869972d70655e9c24b6822
+EBUILD openexr-3.1.2.ebuild 2109 BLAKE2B c747225d4a90cbdd26d4799506a9d6a641a9eb99e8be956c2b323398d251eb29b82f1111aaf46458390e73f7ab549432e7a49a119d13c40c0603de67adbaffba SHA512 5185f7a216f0ad2a4d09419e209bcfe701a3b8fe0fb3245f6371e46c12d55a5699e2f1e289c79826e79380696d69d57e65dfb911b4a8f311820f9f5cda495265
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild
index 7b41f0eca9df..4fc2e3979ab4 100644
--- a/media-libs/openexr/openexr-3.1.2.ebuild
+++ b/media-libs/openexr/openexr-3.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 
 LICENSE="BSD"
 SLOT="3/30" # based on SONAME
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
 RESTRICT="!test? ( test )"