gentoo resync : 07.10.2018

23 files changed, 519 insertions, 64 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index cf8a4e0878c6..b5205b42cf48 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest
index 6d5676f2114f..893360f01962 100644
--- a/media-video/blinkensim/Manifest
+++ b/media-video/blinkensim/Manifest
@@ -1,3 +1,3 @@
 DIST blinkensim-2.7.tar.gz 88416 BLAKE2B a1ac70795f1eeb70ef3d4ff4a961a76c591071aaf4278a7a046d317b7c5a7dd2a19595ed0db659735f97143e1dffba3c53edd00521a8b450dbeb17b31d174c0f SHA512 35be6f0d871ede4ed3de1bb2a18e53e8a508a08001d795369cf222122dd9596ac48314d1c386905360be0a46b1fefffa763bdb9874eaaa6e1ed713a48a6fefd4
-EBUILD blinkensim-2.7-r1.ebuild 645 BLAKE2B da4626ab561f75f8532b3d319a5ae77d1c5338b16732b619eb0ec3d5e3b208e2103fd2853fb4a38fd72da724fb17784975d18f9703c2490ee83b9efa6a34e5f8 SHA512 5a478f2e90fc894ca4b12e902b92e76190632a38e4c4c37d4e832bd68c7199a0c6da1e4a581b87b3fe48ac7ef17836c6c498576558a64ccb8faf84601d7f2f21
+EBUILD blinkensim-2.7-r1.ebuild 634 BLAKE2B 21a535a066fc123411567dc7329e4a7b9f6d86bf9adc28efce6333a75571e41fa6601fa3df8c1e1aa833ab3f4d789aca83f84e81ddce4ef666260c9e4b6e2170 SHA512 49dec858034fe4c1d46312d375ea84f3bf5e24375eabfadcf753983950c0fcc0d0e016728c3bc68c69d5ac254b0bf537100875a7e20b736485d16bc23d3043c8
 MISC metadata.xml 360 BLAKE2B f7cfcf7e66ea5a7ae30864099416f896879b5fa28422420e6e597e6c0fe190a8ecda1518c1cc277a13444099f08eb31f27835b07194d8984e7dd04a8df3a4375 SHA512 b8538f19756f7bf5248e4d60916093cb4aba5d06947dfcc152168941d43acedc6079e0c0aee3da4089a06a6956f74320f874b4cf50d50ae8d7476f2838901782
diff --git a/media-video/blinkensim/blinkensim-2.7-r1.ebuild b/media-video/blinkensim/blinkensim-2.7-r1.ebuild
index ab3ed37579a8..a5d76d7a4b6f 100644
--- a/media-video/blinkensim/blinkensim-2.7-r1.ebuild
+++ b/media-video/blinkensim/blinkensim-2.7-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 DESCRIPTION="Graphical Blinkenlights simulator with networking support"
 
-HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/blinkenthemes/Manifest b/media-video/blinkenthemes/Manifest
index 5d35cd9573b7..87361d97eca3 100644
--- a/media-video/blinkenthemes/Manifest
+++ b/media-video/blinkenthemes/Manifest
@@ -1,3 +1,4 @@
 DIST blinkenthemes-0.10.tar.gz 4059605 BLAKE2B fe56ec9522cbcaa78c45e92461d462739d28bdb96aa9d82ce58b79410e779169ade4d9f8f1c2ca2a333a827edbd2c650301db86a3313bb82fb01597148dc23f4 SHA512 e7bcc2b41046f78750d32ec2f3b37e6f2e16b4bc35a40bc09a8a9ba0a63e54192796cd69491c0517e0ac612d496f0d04ef79a5508da61a2090943bfc94938cf1
-EBUILD blinkenthemes-0.10.ebuild 549 BLAKE2B f521acfa6b82fe7455d7f2c7b7d63e5b607d989cb7b9629667f8538e99bb9ec16174dde2c02aba2adcc2502ccefee369d16fca47f19f3bc35e93e83d90153caf SHA512 8f2dc8b248b9e0d89675f1918d2b4d5bb5903cf650c7cf8987bde4c00b8a874d486dc4e79b9ba9041486f6f81e8f3fee1e398886062e669aed6031c5f714d55b
+EBUILD blinkenthemes-0.10-r1.ebuild 363 BLAKE2B 087836952cbbce61b000a2b556cb31fb143638edc1ca59583b0ad48181252d7c97eeef914dcc1570e063c9b53ca6d771174c927b03cbb2a7c8f9a78260abf1a1 SHA512 092a9c3ed74a441c7afc284565124a65bd63bc0c94c4a7bc8bc3fc1e783fe4bca2cdbf5edc1be065b79bf5afc6b13c98dbf0fc194fa00a3dbf0bdd17bdb6dbf2
+EBUILD blinkenthemes-0.10.ebuild 538 BLAKE2B 4affa1e04bfa0cc909c018052301743122ab4a5fbbaf9c2d9c371f6f206214ef4109c92742b61b5529575130c56174e97dd6332f5ab2591944ac70f815078718 SHA512 0d9dc4d889ffeb2c8143808c2e30a713f7a8d802dd9576e426e021d9610142414febf1ffaab3a8a38206cd0361dc3245a26c5db7b9b2ff6e4cf087acac59fcd4
 MISC metadata.xml 667 BLAKE2B 7505bd3a3b7203d57d974f9edb438ed42617233a590044f983161622f4107eb8cb340c350fd750a128145f1374f89f03bff6e10cec2b6056a30297df8f9ca902 SHA512 11c102eb6ccdb806940c82ca69345ac9acfa113002e5b7ce14426a1107d0a678d8bb444c2f7fda9d25f4b78a35fe022d970471b344e19d0b806ec7bfb454a021
diff --git a/media-video/blinkenthemes/blinkenthemes-0.10-r1.ebuild b/media-video/blinkenthemes/blinkenthemes-0.10-r1.ebuild
new file mode 100644
index 000000000000..9fbddc48b41a
--- /dev/null
+++ b/media-video/blinkenthemes/blinkenthemes-0.10-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Themes for blinkensim"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/blib"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-video/blinkenthemes/blinkenthemes-0.10.ebuild b/media-video/blinkenthemes/blinkenthemes-0.10.ebuild
index d518284a6c44..2521e9e94a29 100644
--- a/media-video/blinkenthemes/blinkenthemes-0.10.ebuild
+++ b/media-video/blinkenthemes/blinkenthemes-0.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
 DESCRIPTION="Themes for blinkensim"
-HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
-SRC_URI="http://www.blinkenlights.de/dist/blinkenthemes-0.10.tar.gz"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/blinkenthemes-0.10.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/blinkentools/Manifest b/media-video/blinkentools/Manifest
index 23b703f262ec..df8fc8128328 100644
--- a/media-video/blinkentools/Manifest
+++ b/media-video/blinkentools/Manifest
@@ -1,3 +1,4 @@
 DIST blinkentools-2.9.tar.gz 560904 BLAKE2B 86068a9ea2321bb0688ca44a7fed406a38b73d01813d0d39c5ca6e84f690539eb864cafaf1a8e554e298c674d67cbc4f4b892d9393187a0452e381b517043a08 SHA512 ba6fed446bfa757979469ed2894cb7b6a7fa4c1296a3074d75b6ac6c9f17e69d4ae172d1d54bb62d7f05cc20e9e7ca1a6eca5a83f2cfb7e86f7f9070bc2da2dc
-EBUILD blinkentools-2.9.ebuild 580 BLAKE2B 94cf164a8d4eb085c49a086d09f79c688275b8669a0cf92ea84b253fc9408cda14022cf0f80bba98cc82e7e0f3123cb12bd774179b7a4b6955d62f15eaab21a9 SHA512 404e5096b1b30c7e21abe0339856b254c21817de8ab20d8919c237c0a9e82b4e9952d3cae89da9f5852c3aa408f643414120651c99e598579221530c50018a8c
+EBUILD blinkentools-2.9-r1.ebuild 445 BLAKE2B ce230484198e2beaf70ca57888db37f06d4c98141cf99d7ac35c1fab6ae7a708e46f19d732dd68ea16e1dabd8207c7cc5a7165402a7b77a3f8d3677890a619fb SHA512 7dc6ce79c7a65ff718a4f5276488e33343087508d9ec421010a91c187690542d4b883c963e4d288934c0e2772b0cc5ea4ab2d51f79dd491c5735db34d751d295
+EBUILD blinkentools-2.9.ebuild 569 BLAKE2B 37b65f99fe848fe037d8b067a89dcbb696aaa0c7f1f9fa60c602aca1b6778816d0e0ee04c3d916fdf28082c05c05cb3415f3fb3d7f73b527cb6b0d6586447c89 SHA512 f99eefcd415668d4864c9244ae3b0bb3446e48475b18ccb1ae796bcc46739fbd7f300002b8fd99648dd04ad4108fbaa92854fb11059cadd8f856c46fd77e0c43
 MISC metadata.xml 510 BLAKE2B a70382b0ab3630981bb062a9abc97216dc1abd65614af6ca0f4be42360a66bfca9289f242f9e2b693ecb28aaffe20a65ab2c1350905aa1d90dde554398c47acf SHA512 39f50dda7c89cfbab1b4d29ed81c9e832ff41222d4bd219ad574b59d65a11b882e60feffef9a890769f7e234f992d507daac00b394c09c3e3311a2644f91ad8f
diff --git a/media-video/blinkentools/blinkentools-2.9-r1.ebuild b/media-video/blinkentools/blinkentools-2.9-r1.ebuild
new file mode 100644
index 000000000000..684b0baea498
--- /dev/null
+++ b/media-video/blinkentools/blinkentools-2.9-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Provides a set of commandline utilities related to Blinkenlights"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/blib
+	media-libs/libmng"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-video/blinkentools/blinkentools-2.9.ebuild b/media-video/blinkentools/blinkentools-2.9.ebuild
index 28ec8114d50f..81f422d42d60 100644
--- a/media-video/blinkentools/blinkentools-2.9.ebuild
+++ b/media-video/blinkentools/blinkentools-2.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
 DESCRIPTION="blinkentools is a set of commandline utilities related to Blinkenlights"
-HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+HOMEPAGE="http://blinkenlights.net/project/developer-tools"
+SRC_URI="http://blinkenlights.de/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 10b94f17e656..3df5f62d2bc3 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -6,11 +6,13 @@ DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae8
 DIST fate-9.tar.xz 467671500 BLAKE2B df4ef8187f257c91b7b6c3c25c2f204c2d4a476cc73cca199ec1c8af2c4641cbb3a314e39ab38f6d8b68c5fe0b91ff1b4b592dec6b518d544806eaeaca003608 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202
 DIST libav-11.8.tar.xz 4865796 BLAKE2B fb0e8f129edee0423252f334b12485d514f9fdfb3d916877d83141e0985ec4efb4de0f5b65d6e3e6d94b835f317a52116b849eec99d023ebb109bdbc2b7a8c5c SHA512 26f9a6bb7312acc08b6785c260220ada3ca2a8db0d0f2bd4621b47082c275fbdb7978457cb423693ba9a61dc4570b05d0dceb5861ff0bcce859c349a6a8f49be
 DIST libav-12.2.tar.xz 5268804 BLAKE2B e25b3dfe1026b9e69c89cbec2090070088a7004dc03e8cc23da2da03824a627c733c16c67e5fc65ec9f19942d93405d5ba6926de83cae04c497597f55220f004 SHA512 4b37cfb18a6cf6f12eddb5175b1751c093f3a495ae1d1b588884c60157cb260479b1d8fa3a6e3e08c00d7a26422b1e78a750eb35cf7bc763c01790f3567cba03
+DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162
 DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
 DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a
 EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037
 EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90
-EBUILD libav-12.2.ebuild 11367 BLAKE2B 44f05754c5fa9cb2e93ef69804cd04426caced01fa12ab8d51aa0a98d277c5b1c1c5aa551816888a87188934c4155979830d1cd742940cfd877da15499d94e68 SHA512 d52ef20dc17f0cf14f12b8bed6eee953a17b4530b5339d50419a5a17d87b19854cbab224ccd2c0a3e225ed89ed119a70d50cfbe10cd620077f323158bcd1fbf9
+EBUILD libav-12.2.ebuild 11366 BLAKE2B c1f4de539f14e7f9ec9ff590ae245cfa49af199352e39b7f564a50ffa8e378bc6a573003fc9dfe494e7f4981bcf78c9be7baf02d7f9aa4b8c04bfbbbf8581428 SHA512 f90ff7d2052af3332ee626b1bbf73782ee1f1f8f257f342308a775ce35ca7c4d4a30bc445df2b9e7111b33dde8e2c6d577446a3c1bb7a5a509be68b457d63349
+EBUILD libav-12.3.ebuild 11363 BLAKE2B fa78329f11b0dc38fbdd583a3a2319da58c8e4366425fc524363d6cf19a3e07c7d107dd4da0bedb7bca1cc3450f447362fcf726f38cf92e6fb8d9a5fd3c00145 SHA512 65ab897ceb7a20cafd9f5e9b202195f24a5dbd7a4e87f7822594058fb4b0bfbea3553ebf4b5f8a99d4ea3597ac2664cdbbf803b2e82442234623cf968bee8f79
 EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54
 EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a
 EBUILD libav-9999.ebuild 10849 BLAKE2B 1cccc4d2a8e55b9bc0f14d838689a253d52db1e741fe22f8b00bf2d90ab1460b0598e7c1fe9773ed7650af8d20942601698ae86e465272054ec8f5bb28b22936 SHA512 0c41cc11dd22ab4a7afe412e78e07d693a57dfbc97667a4bbe12eb294406f524d287a226ac7911ed3b6a329bf9a5b1b20d08f96d9cdb614fa947c9ef19f10035
diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
index 588da2ba1e60..d3414e7ba817 100644
--- a/media-video/libav/libav-12.2.ebuild
+++ b/media-video/libav/libav-12.2.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
 SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
 	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
 	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
new file mode 100644
index 000000000000..610966c54b89
--- /dev/null
+++ b/media-video/libav/libav-12.3.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video"
+HOMEPAGE="https://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
+else # Official release
+	SRC_URI="https://libav.org/releases/${P}.tar.xz"
+	FATE_VER=${PV%%_*}
+	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
+fi
+
+# 9999 does not have fate-*.tar.xz
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/12"
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
+	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
+	+network nvidia openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 xvid +zlib"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
+for i in ${X86_CPU_FEATURES} ; do
+	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
+done
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	nvidia? ( media-video/nvidia-video-codec )
+	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		)
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && default_src_unpack
+}
+
+src_prepare() {
+	eapply_user
+
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	# 9999 does not have fate-*.tar.xz
+	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
+
+	myconf+=(
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	)
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=( --disable-${i} )
+	done
+	use bzip2 || myconf+=( --disable-bzlib )
+	use sdl || myconf+=( --disable-avplay )
+
+	if use ssl; then
+		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
+			|| myconf+=( --enable-gnutls )
+	fi
+
+	use custom-cflags && myconf+=( --disable-optimizations )
+	use cpudetection && myconf+=( --enable-runtime-cpudetect )
+
+	use vdpau || myconf+=( --disable-vdpau )
+
+	use vaapi && myconf+=( --enable-vaapi )
+
+	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
+	NVIDIA_LIBS="-L/opt/cuda/lib64"
+	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
+						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=( --enable-nonfree )
+		use mp3 && myconf+=( --enable-libmp3lame )
+		use amr && myconf+=( --enable-libvo-amrwbenc )
+		use aac && myconf+=( --enable-libvo-aacenc )
+		use nvidia && myconf+=( --enable-nvenc )
+		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=( --enable-lib${i} )
+		done
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=( --enable-libcdio )
+	use ieee1394 && myconf+=( --enable-libdc1394 )
+	use pulseaudio && myconf+=( --enable-libpulse )
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=( --disable-indev=v4l )
+	use v4l || myconf+=( --disable-indev=v4l2 )
+	for i in alsa oss jack; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use X && myconf+=( --enable-libxcb )
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+	# libavfilter options
+	use bs2b && myconf+=( --enable-libbs2b )
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
+	uses="gsm opus rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=( --enable-lib${i} )
+	done
+	use jpeg2k && myconf+=( --enable-libopenjpeg )
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# pass the right -mfpu as extra
+	use neon && use arm && append-cflags -mfpu=neon
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
+
+	# Forcing arm would make the compiler break left and right
+	if [[ ${ABI} == arm ]]; then
+		filter-flags -marm
+	fi
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	set -- "${S}"/configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md INSTALL
+}
+
+multilib_src_test() {
+	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
+	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
+	LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index c45f64c1df9c..eccc7b5ea390 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,8 @@
 AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac478d4c9606a0f520fb31c0f736f6dad428222cadee5c46b29e2467928fb5adb43f2c4e18aba31db105f6738c3c3e4dca43c5 SHA512 a640a894921f065c58236c2c09a93984f9f3c32a00934bec3a55ad7636d623a0df2e847bd86d9f184ee62284c5bcfe18cb1a9e4943b05260ee6cc0e38dc1bc2a
 AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38
-DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590
 DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
-EBUILD obs-studio-21.0.2.ebuild 2698 BLAKE2B 6383b7f1bb453a355a70b7c010f78afbf9f88d51f8e14f5c11717474d944f8023ec5240935e9ce842f3ac11a620a31eb4e3feb7608608b5cb8e5bbf723cb18a4 SHA512 75f5cec89258c5862a3dcfce606edb994c5e72ef750eefcf533c59702fa9270c8ed1700436fa8efe0b8535bda965b0aae91dc741067c289dabcf62e3f96413b0
-EBUILD obs-studio-21.1.2.ebuild 3034 BLAKE2B 28f24d09d1522e5c8ae1d53a12cc542bf89caa3eb8155ccd0a0ac30d7be66db578832e4a7417a06b29ce57956f0514ecac2174ced0d60de35478da1bad85bad2 SHA512 aeab926019077d31a2ff5a38f0f16bc5d25237bce923a292b8b2677cbc3c1e19e84206aba01d730f503337b250661b427f98284e4641968d6dc67eaa2458bb9c
-EBUILD obs-studio-9999.ebuild 2954 BLAKE2B 71c8b8798e707e87624bbbfc35f8dbde6de6fdc5921307932a84eff6bda423b91f71721e2ca959bfd6fa1de7fbe9ffea2f2a89e08a718d2d004aac33740e5f26 SHA512 eb50971179f1790c66a1258af7dc86d74e5f4ab1d442f675eff48733b7f2f0d57f085b614347e04a35b14a1552b5893462536089223570d2474f6dafec36fe74
-MISC metadata.xml 1125 BLAKE2B cbdc7581bf9c0ae676245bfe24e6bba5914286747c338a8fe56842bc65e6d8ac7b7413f429d8c30ef7d05fecefedc1cffdf60a37433510b79819625f30b0d744 SHA512 f64f485a39668d40e5bd0edcc5f19c57954acd96e1631bb3615e472d566091a70b9ee55548e0dca4e435c017ded350d7be5d1d07ad0ec9cefe94b196d8dcd3d4
+DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04
+EBUILD obs-studio-21.1.2.ebuild 3029 BLAKE2B cfb1e5a15d0dba8f6eea1db0f9f314c69fdb26bff4a77ef1d4fe9cff6b4d3abfc49db3266b52dd09026f3eb5b5923349ca5808bbc6d2f5ee4796406efde5bf12 SHA512 f95541d0de438d10677d6e09b5ab3e8edeedeb6b6a205d2673d40ad2e9297462f1fc6cfb8d47fbb758ff9d246ceb7541f4687801b4a61c5cda30be56d8db7087
+EBUILD obs-studio-22.0.3.ebuild 2984 BLAKE2B 764a2e4531569baa9970ac73b1967ca6e61ee3ba2c5129ac8cf3d3b5e7c9e0d43c9abbe23fde1f39ddc208ce5729723e0ba96de2abade0f53da0ec2018c71995 SHA512 36df6dc1a1796035722b9e92859e19c1372fbc0c6b5cafde1d661a4edb32b0dc63203581336f4114b0068d63e8c76b7f3922306a16c54f77405dd229fa65265d
+EBUILD obs-studio-9999.ebuild 2913 BLAKE2B ed7c95a02586593b998795c5f53fdd37f14f6e10e2c27c829d46edade5008e6acb9046842b06df7b924c4e9d5f7956e07473c4b8d972680ce44a9ace698cf6ef SHA512 63fe9c288e177a213d7b4689d97a0214500a325848210fa59b5cc6aa340d7711681eb1b999e9db029c494cbb6e04ba49543b6fccf4e26d856558db79ba72fceb
+MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 74a7f582c048..89c066c043bd 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -17,7 +17,7 @@
     <flag name="luajit">Build support for scripting via Luajit.</flag>
     <flag name="nvenc">Enable NVENC encoding for nVidia video cards.</flag>
     <flag name="python">Build support for scripting via Python 3.</flag>
-    <flag name="speexdsp">Enable noise suppression filter support via
+    <flag name="speex">Enable noise suppression filter support via
       <pkg>media-libs/speexdsp</pkg>.</flag>
   </use>
   <upstream>
diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild
index 062b0f414089..bba5ad05ece0 100644
--- a/media-video/obs-studio/obs-studio-21.1.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-CMAKE_MIN_VERSION=3.9.6
 
-inherit cmake-utils gnome2-utils python-any-r1
+inherit cmake-utils gnome2-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -22,7 +21,8 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -46,10 +46,10 @@ COMMON_DEPEND="
 	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
 	luajit? ( dev-lang/luajit:2 )
-	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
+	nvenc? ( media-video/ffmpeg:=[nvenc] )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
-	speexdsp? ( media-libs/speexdsp )
+	speex? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -77,7 +77,7 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild
index 208ad0004506..987d58bb89bf 100644
--- a/media-video/obs-studio/obs-studio-21.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-CMAKE_MIN_VERSION=3.9.6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -21,7 +21,8 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack nvenc pulseaudio truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -36,7 +37,6 @@ COMMON_DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-video/ffmpeg:=[x264]
-	nvenc? ( media-video/ffmpeg:=[nvenc] )
 	net-misc/curl
 	x11-libs/libXcomposite
 	x11-libs/libXinerama
@@ -45,17 +45,24 @@ COMMON_DEPEND="
 	fdk? ( media-libs/fdk-aac:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
+	luajit? ( dev-lang/luajit:2 )
+	nvenc? ( media-video/ffmpeg:=[nvenc] )
 	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speex? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
 	)
 	v4l? ( media-libs/libv4l )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES="${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
+PATCHES=( "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" )
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
@@ -67,12 +74,24 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DOBS_VERSION_OVERRIDE=${PV}
 		-DUNIX_STRUCTURE=1
 	)
+
+	if use luajit || use python; then
+		mycmakeargs+=(
+			-DDISABLE_LUA=$(usex !luajit)
+			-DDISABLE_PYTHON=$(usex !python)
+			-DENABLE_SCRIPTING=yes
+		)
+	else
+		mycmakeargs+=( -DENABLE_SCRIPTING=no )
+	fi
+
 	cmake-utils_src_configure
 }
 
@@ -96,14 +115,6 @@ pkg_postinst() {
 		elog "(if 'x11-misc/xdg-utils' is installed)."
 		elog
 	fi
-
-	if ! has_version "media-libs/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
 }
 
 pkg_postrm() {
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 4558c2f4e954..d3014eda9ede 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-CMAKE_MIN_VERSION=3.9.6
 
-inherit cmake-utils gnome2-utils python-any-r1
+inherit cmake-utils gnome2-utils python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -22,7 +21,8 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
-	speexdsp? ( media-libs/speexdsp )
+	speex? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -62,8 +62,6 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES="${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
-
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
@@ -74,7 +72,7 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
+		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index b557d15d75bc..4a4c14334ed7 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -3,5 +3,5 @@ DIST parole-1.0.0.tar.bz2 900499 BLAKE2B d6a1eb21846426781a712f33b7cf8f412b17b9a
 DIST parole-1.0.1.tar.bz2 903754 BLAKE2B 2bd8a8892c04bc145d7ba0bc08c29ad1f9c4507cce533d554952553e46c408e9f293a19820790541d0a494052ac6024d415bfef4864fc09b8d851664688ace3e SHA512 026ece62e6a8175976e7ce218edbd6955a0cdb5074996adad5bed3e536f90108e4d1106f22edcb06d213fb09dd47b04f81bff94f4534710b61f0f53cb0395f72
 EBUILD parole-0.8.1.ebuild 1284 BLAKE2B add340579bde9e74dad8d327f0a47d72d0275eac9a69f43b034b71b80f6e4f754999f937e6585c8e7494f35172fcfc55258f5eb8d6ed4d095a44efd3d2bef741 SHA512 d315e12d36f1d0c8bbf8a5e2bb4a34e3c9f67e4cfc06fa03ac862a7ac8df349957bb43f15fc75589e9523dda4785142e849f8ababd3cd18ed050f222627fcae2
 EBUILD parole-1.0.0.ebuild 1423 BLAKE2B 2cf11db0e9ceb829b290ccf774f9fb9cf94a0af47f8d896e91cd5660d24f61f321fe4d9b5ee7381138efb739263ae71beae28a07352a700b5f8d781f6e882006 SHA512 f7a862aca1db2e6b234d5276f0fe6ea9febd3b7fef718e758558494dbfa3de1aa5302325431b8601702593ec857a7d8beea3ecb93f29e1716172ecf13f349b38
-EBUILD parole-1.0.1.ebuild 1425 BLAKE2B 14511bc39a817114e35f2f6d349207a54b0a2dfec9fc983de15780acd3b69c34a04ea955e37002556800ae456c33bf821b576250a523aba0d250cde13bea330b SHA512 e8e341d19cbc90b6899462c2fff6fb68388587a2bb33544713c9d7487f24b47bd65448633f09ecfc208bc6b7174cac50f1cb7fd65d1be859cdae118b339ee3f4
+EBUILD parole-1.0.1.ebuild 1447 BLAKE2B 0794e419882880e68ed9ee7a2280d2c5b618b16189c34c62315faea26be0c555074454274095f1804ef9b860e3ad7bd8591de42f1c6c5db62328802e72807db7 SHA512 f1c859fea6e9479a2694e22e1ba5c6308a16a7ec2ed543e66fa71ee976b4a7138512403a8da51576f03b1da949acb2c48e27d0873a1ddd97c5e721335d385529
 MISC metadata.xml 318 BLAKE2B fc559f9ed2dba93e1117e5b01a8e7202b4d8fa64493133ebbe758e4d6c13836ae484b7be986cbcae4d32ec3175d138292aa51a86018cf531c7f12c8f3bd06590 SHA512 412b57b034604b0b6d532fadf5eba6478222b30fe4a003ff1486b59ec1136f440343c4524951cee33b235dfa782c09380326d9cbee17e1406408947d12fc430e
diff --git a/media-video/parole/parole-1.0.1.ebuild b/media-video/parole/parole-1.0.1.ebuild
index e25d25434825..36f2c8f0745b 100644
--- a/media-video/parole/parole-1.0.1.ebuild
+++ b/media-video/parole/parole-1.0.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A simple Xfce4 media player using GStreamer"
 HOMEPAGE="https://docs.xfce.org/apps/parole/start"
 SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
 IUSE="libnotify taglib"
@@ -29,6 +29,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0"
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index f0448758f55b..f4b859a22bab 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,5 +1,7 @@
+AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
+AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
 DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.9.tar.xz 1759568 BLAKE2B 5e8d94c64d254f52c0e5f6926b5c0e8cc7ba065f00363e728e48d6dafb26e2cd5496fb20e3d81a1c4f5bf6165b6f13ed2b28eea31e6efd4f9e9256bed5bafc49 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7
-EBUILD xine-ui-0.99.10.ebuild 1901 BLAKE2B 7266d73e30442b60ffd941f1074fe749d105b1307c15ab1b3587e9f2b1d54502e9ff22ae931bb1a8e0af211d4ddefa85b1f85d81170f7cf5a16839ac8d906c42 SHA512 d948983d5834e1f2f34b02744f04e56c9c57e6ff9cf21bebfcb17436589beac6bc60cfa7d032b6f58dcb6e1eb5cdc2c0dfddc88a9bf4398f9d32ce1d41b73196
+EBUILD xine-ui-0.99.10.ebuild 2041 BLAKE2B 1ce636d83db52cd0796592a8d9f133c30f134fbff8ba4c4118c219a6bc21d70648b2ebfe58083f18bfb1b564c211e4612252944ff2b4cbead78bf18da51bc497 SHA512 599c3110ca5f4b7f03758850be900814229a0d9b24b39084f3393f6aa183b4a349ac8b752cd82fc38e6ee504a238a7c3f7b67971f0e79d54f43bb6c0be81394d
 EBUILD xine-ui-0.99.9.ebuild 1896 BLAKE2B 06d87ab48f19bf0fdfee3cecac3f1961fa10ea7bcf2bbdc21fd598a82d97be8cb8742174a7ac1324184cf469b8dea1322e08e40133b986983ef5f7c196942da2 SHA512 ae3d41e072d4c65f50721d0ef22b75dac11db5f5a8e432b4f625a32c6c16a73665dbe3e79fa9804dbda58018fe8a3679fd4c7738fe14263cca578a39ad6053df
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
new file mode 100644
index 000000000000..04aecb7ccf11
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-desktop.patch
@@ -0,0 +1,23 @@
+--- a/misc/desktops/xine.desktop.in	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/xine.desktop.in	2018-10-03 18:53:23.909196224 +0200
+@@ -6,5 +6,5 @@
+ Icon=xine
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Player;
+-MimeType=
+\ No newline at end of file
++Categories=AudioVideo;Player;
++MimeType=
+\ No newline at end of file
+--- a/misc/desktops/Makefile.am	2017-12-28 17:34:15.000000000 +0100
++++ b/misc/desktops/Makefile.am	2018-10-03 19:52:23.262534618 +0200
+@@ -32,7 +32,7 @@
+ if XINE_LIST
+ xine.desktop: xine.desktop.in @XINE_LIST@
+ 	$(AM_V_GEN)cat $< > $@; \
+-	@XINE_LIST@ | perl -ne 'print join(";",sort(split(";")))' >> $@; \
++	@XINE_LIST@ | perl -ne 'print join("\n",split(";"))' | sort -u | xargs | perl -ne 'print join(";",sort(split(" ")))' >> $@; \
+ 	echo ';$(INPUT_MIME_TYPES)' >> $@
+ else
+ XINE_MIME = $(if $(shell test "$(XINE_CONFIG)" = '' && echo y),$(shell pkg-config --variable=plugindir libxine),$(shell $(XINE_CONFIG) --plugindir))/mime.types
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
new file mode 100644
index 000000000000..c5a359758d4a
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
@@ -0,0 +1,24 @@
+diff -r efe11fb1562e configure.ac
+--- a/configure.ac	Thu Dec 28 18:08:02 2017 +0200
++++ b/configure.ac	Sun Apr 01 23:00:22 2018 -0600
+@@ -374,7 +374,7 @@
+    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
+       AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
+    fi
+-   if test test "x$have_caca" = "xyes"; then
++   if test "x$have_caca" = "xyes"; then
+      AM_DL()
+    fi
+    AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h> 
+
+--- a/configure 	Thu Dec 28 18:08:02 2017 +0200
++++ b/configure 	Sun Apr 01 23:00:22 2018 -0600
+@@ -12651,7 +12651,7 @@
+    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
+       as_fn_error $? "CACA support requested, but libcaca 0.99 not found" "$LINENO" 5
+    fi
+-   if test test "x$have_caca" = "xyes"; then
++   if test "x$have_caca" = "xyes"; then
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
+ $as_echo_n "checking for dlopen in -lc... " >&6; }
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
index 90ab46eefcff..ae016e03898e 100644
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit gnome2-utils xdg-utils
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
 
 DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="https://xine-project.org/home"
 SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
-RDEPEND="|| ( app-arch/tar app-arch/libarchive )
+RDEPEND="
+	|| ( app-arch/tar app-arch/libarchive )
 	media-libs/libpng:0=
 	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
 	virtual/jpeg:0
@@ -35,17 +37,26 @@ RDEPEND="|| ( app-arch/tar app-arch/libarchive )
 		x11-libs/libXv:=
 		x11-libs/libXxf86vm:=
 		xinerama? ( x11-libs/libXinerama:= )
-		)"
+	)
+"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.18.3 )
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libXt
-		)
-	virtual/pkgconfig"
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-libcaca.patch
+)
 
 src_prepare() {
-	rm -f misc/xine-bugreport
+	default
+	eautoreconf
+	rm misc/xine-bugreport || die
 }
 
 src_configure() {
@@ -65,16 +76,16 @@ src_configure() {
 }
 
 src_install() {
+	# xine-list apparently may cause sandbox violation, bug 654394
+	addpredict /dev/dri
+
 	emake \
 		DESTDIR="${D}" \
 		docdir="/usr/share/doc/${PF}" \
 		docsdir="/usr/share/doc/${PF}" \
 		install
-	dodoc AUTHORS ChangeLog NEWS README
-}
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	einstalldocs
 }
 
 pkg_postinst() {