16 files changed, 45 insertions, 165 deletions
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index bc21321d7a90..6cf0cd4bf55b 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,7 +1,5 @@
 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
 EBUILD avidemux-2.6.20.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
-EBUILD avidemux-2.6.8.ebuild 3756 SHA256 172e966eb9bbd8c601fd9e9955bb1734661c50ce4b691983bf6650a0f8b75e9b SHA512 81fe43ed4d4e4263587310b5a14eaf355dddee13d145e6417b9cbd528e2bff230dc16e63b39004977be61ca8ee3507cfb4b438f88e9778f0087da08b74b0bf0a WHIRLPOOL 53e6427ad1939f300c90c1268e528ee6faa14208cb8e0250ccb929b40c398c2bd6da8588b793a5a3c9b92d69cb877847b9ef7e3d5e8d86da2403d22cf389bccc
 EBUILD avidemux-9999.ebuild 4429 SHA256 1d3faeeb54d83aab20edd51e8baad2f9e2b564f0a272c7bb5292f223892f6106 SHA512 bfb165003b197c1bd6ce6579cc5ef2ef6e974087bb66589cf7f72d50f0f0fe0521bfa9f1cec00cc3abb9f2a03b87bc046c6c0fb94ab0f58176afc5581d92acee WHIRLPOOL 3bab699388501377585ec4277b0070ff666a235b2f9c2823fa8aca65b3a98bbc23c2acc1081132cff3bfe6034bcc2dfbbb2a6fe80f8e19d96dcc7942a358b8d9
 MISC ChangeLog 3639 SHA256 3a79a443e426c7880449f1b2cb9a46029fad0e5f38d292e0eb95a9fba14cfbf7 SHA512 10d5194ff3371f4d98eaf444c00958f3b597732b8d8f7f08156ff4fd629a7223637e96feb76af5f5f447be6a354e056a25c91cae10c3d17efd23be7a7c948c6a WHIRLPOOL 97abe8eaf9b159d491e2a07a52f0b0024e064eddfadf25eaec3d19e1379f8c535a61479c06ef07feb8cceba884b92e3a9302c7efb67460255bb5398ff2d2d0b9
 MISC ChangeLog-2015 43501 SHA256 bf5c8b539d6e30ac299b9383b3c3dda2ce8a5bb087860335f6b970b174da3957 SHA512 e85c2de4babc72668e180da6e580876ae2c6cef1cc0826b96546e9838e071949c167507ab02ee943d97d7e4ab77b90116e615fdcecfc10dc1326d4f7ceed6652 WHIRLPOOL b070add4eed7e98da1dfea88a5f534b50944c7ebdef40bdc4e8e38eeb860509d57f95a04f58429a163375f0c3d9084e73b28e13cf5267b7d40159c5d5a0b9754
diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
deleted file mode 100644
index d31c66fd8977..000000000000
--- a/media-video/avidemux/avidemux-2.6.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-
-inherit cmake-utils eutils flag-o-matic l10n
-
-SLOT="2.6"
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/${PN}"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
-
-	inherit git-2
-else
-	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-DEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
-	opengl? ( virtual/opengl:0 )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
-	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3
-			x11-libs/xvba-video:0 )
-		)"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Fix icon name -> avidemux-2.6.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
-
-	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.5 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
-	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
-
-	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
-
-	# Now rename the desktop file to not collide with 2.5.
-	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
-
-	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
-	local mycmakeargs="
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl)
-		$(cmake-utils_use vaapi LIBVA)
-		$(cmake-utils_use vdpau)
-		$(cmake-utils_use video_cards_fglrx XVBA)
-		$(cmake-utils_use xv XVIDEO)
-	"
-
-	if use debug ; then
-		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
-	fi
-
-	processes="buildCli:avidemux/cli"
-	use qt4 && processes+=" buildQt4:avidemux/qt4"
-
-	for process in ${processes} ; do
-		local build="${process%%:*}"
-
-		mkdir "${S}"/${build} || die "Can't create build folder."
-		cd "${S}"/${build} || die "Can't enter build folder."
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
-	done
-
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
-	done
-}
-
-DOCS=( AUTHORS README )
-
-src_install() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
-	done
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
-		fperms +x /usr/bin/avidemux3_cli
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs
-	fi
-
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-2.6.png
-
-	if use qt4 ; then
-		fperms +x /usr/bin/avidemux3_qt4
-		domenu ${PN}-2.6.desktop
-	fi
-}
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index 19365fdc6b06..ea488552af15 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,6 +1,6 @@
 AUX dvgrab-3.5-gcc6.patch 993 SHA256 148885d4de8ca880d93ed418913aafc08529dacda5cd0d1095682ad49451ff78 SHA512 db155702d050c58b7833c609e5e1a38f91256b5bf5b8c6c8619648e12851924fb0177ad7930f4dd77671bd6515abfd6059ed5ab5611aef9b6ba4e3c8260b88b0 WHIRLPOOL 1563c74a7fcb358d2d6c275e8d42fe60a900a8958252640fc8a10b08408a6564130d2d2e933c5aa726883be44187e390316802d361ed242911fec04b27e04c92
 DIST dvgrab-3.5.tar.gz 205268 SHA256 5910183429d300221783d6054ff5add15bb2ae49ae33272d723a314bc2ce0af9 SHA512 7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735 WHIRLPOOL 2e1227a1845c047e0b8161afa6b50cf1d271758fe4a47a77b7f47c46f1cc568e4fb72d8d795c5f1a0976fb12f0d6ff461c0326af002be5b3f1c6a5a3a4ebec90
-EBUILD dvgrab-3.5-r1.ebuild 706 SHA256 ea3a85ed800714c77b696bd68376667cdfd1b2f94a99ac8f44d1bbd078f80dd2 SHA512 f5d15abde322117c6818229b018ff0e696be7e81c29d3411f70c278595c3e69379454483c2d9a8ce3683b5e721c416f3a33c5eb143f800aff2832626df6db9fe WHIRLPOOL a74fc207d69f2fe3afdbc4fc1d0706417106574446646f6c447a021ea221cf7caf5a8816c3c383957974ae742bf2f55a618cfc46500ad99027964913a7b5215b
+EBUILD dvgrab-3.5-r1.ebuild 705 SHA256 95a346b52531c0334492837e978dc6abfa5bb8090cdc9b511541eff8817b6f86 SHA512 a699bb08474f3754b57da8068fa6221d8a8f8ec2326b77fbbf9e142dc859d3514f842469ae0e786d3989d4473ffc2605493406a505bade89cbdc0901d24dccc1 WHIRLPOOL 032bffa68a3efb35e520876130d7c47b9cd5abef15605c60331f5cb420cfd01c343ed2e5cf4133cf463789121e0524e16273c8ee180e2f1a405f9930e8006a16
 EBUILD dvgrab-3.5.ebuild 787 SHA256 7e9d068f8b384cb3a059111bde0715e9d209595d75430c3bdd23f2ecc41874c8 SHA512 6c9a164a8837d2279710ef04744313edc2d210574615903ae079219b69f8036394df9d11eac390b7c44be77f7c1e23678058fca61347fd2c58edb9084b045590 WHIRLPOOL 1162d359095aebdd0994f4e12ecf300a528c4532b49b25f5f87be02279390a32649832d77eb58d8f32297ee947bc2e477e10d1afbe6adb09dcb26eeb15fd5075
 MISC ChangeLog 2423 SHA256 949a1dca7c8f62690e96b7d147d655a81c8aa217416adc82d91c0acd868c47fe SHA512 f167a747b4a4a1219bbb258953fa7b214bbd0e3cd9d3d3555d0c1427597f6daf01417ed62012b7cd0c3c9d05465b06dde4d1545c88a8b69de7061ae0590e6bc0 WHIRLPOOL d10dc3b734fdbe8c7a642604a79cfe68184a387640f44b1ecc65d7f7f618d70b68fb759cb8551aed7bece912a7011e79ebddba89987d91cdfba17b6c03cf152e
 MISC ChangeLog-2015 5696 SHA256 64bc6461429e8463504a76dbb34828f176b11e0e8f450113092e0c2e9fb3c42d SHA512 9dadbc48f3900866e0f6bd8fa870a5c060aec213f2cf5e6340212b661b4d56ec3c084fb1908a128f96e2cff35429c22865d869b2dff53945bff3002d52af50f8 WHIRLPOOL c2b70f9814f24e3f02684fd81175fed1cdd59c1c2365d903c1f00cf34f85afa57a5d9fb811dbc2d4557034ae8350611ebe9572e59c36da85c40e0f979a2ed17d
diff --git a/media-video/dvgrab/dvgrab-3.5-r1.ebuild b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
index 004dae6a1642..4c9372683ce7 100644
--- a/media-video/dvgrab/dvgrab-3.5-r1.ebuild
+++ b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="jpeg quicktime"
 
 RDEPEND=">=sys-libs/libraw1394-1.1
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index ef1a8521f5f7..a220a09c6ae6 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,7 +10,7 @@ DIST ffmpeg-3.4.tar.bz2 10171702 SHA256 5d8911fe6017d00c98a359d7c8e7818e48f2c0cc
 EBUILD ffmpeg-3.2.6.ebuild 15078 SHA256 8429b0673a250afb791e7ae3e48456d88bbe42017602947957ea24714743d3e0 SHA512 56e3a5e60aab2c15d22e9ce9630138ed95ff6e751a41b4211704b052f290d8748a0859766b39e0221d4cb1ad2b1163982a25179861eee7b85707053f99b5f869 WHIRLPOOL fb99c0c52c19fd45f997829715466b60e47d077889b30c4d64b8da98255e6006fcb62ea835c5ea68d35843bf385a15eca708d069e84737a97bff6ee1809bad9f
 EBUILD ffmpeg-3.2.7.ebuild 15083 SHA256 c5b9bcbaf74024fba519764852bcd2d800fcc740b13558c555f8ca8a1c8af49c SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e WHIRLPOOL 40092ab775c49ea1b902017ec0bab05a9bc898c88f49a7dd2061b86af89404f4b0bbd1b0f96e8f6cb2f73ec682f83d55e52de3d712d5a22f0bebdad928c4496a
 EBUILD ffmpeg-3.3.3.ebuild 16075 SHA256 69536764659767c709f17df58d698eec5593a74b932c273f3ffd9ae2e15a9e87 SHA512 037ba3846ccdc462945800af3438b4d852f026f0261c0264409f0e5960168457fd37c20bd9f332d2149bcf11af075b130fc7f27adb09fc6887e693fc86090204 WHIRLPOOL 1e28f1b0e98797acd5fe7123b83eb50818c1fb4eacd6b3aa953f776735819bfdd2ab9887457ea8b617b99af467c915eafc1d8acc12aa0d84bfbfcb71fcec0cfa
-EBUILD ffmpeg-3.3.4.ebuild 16109 SHA256 8dfffba69b54efcc60ec3d671e04a587d8c73d5d00f8fe9147aa1909857b4ef3 SHA512 4c994e2f3d0a4a5d2ebbd3868eb8a60b2f1c459b06747902cfaf4647167abb05295e02d44526ced588ab139d0e58d84c2127915ad3fd1f82756113b27eabbb18 WHIRLPOOL 69061f150cdba1eb0884818531264a43312c3e6d8b32bfb1f8986e5133ece8b3f2e81145bc52fac4b3dff5ec2b92cdab757dab36d55c9ff5502ce3985ccd01e9
+EBUILD ffmpeg-3.3.4.ebuild 16107 SHA256 d7f48a8aa67297968bd97ff4e91095cd76db5559f46fbaa888fbb54f617b04a1 SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b WHIRLPOOL 6509b5525e8832dbe8459db8fd48f8ab66fffc5cf9bf724c675b6bd045e9b42c10065a6d9be80b78b51671f3f04ac966b7ad0ec0b659bc39f060d42cc778179f
 EBUILD ffmpeg-3.4.ebuild 15664 SHA256 c3e195e6126953e12170e8846e6952bfd326561a5c6ec6bc212553effd838ae3 SHA512 2060c89e73a059b6626505c1632f727536f711fb7b723633ac8b8c2a057776a2c7e7b1f98561585addadd6317f4ef506057033097d1c15c5553969e31d07008e WHIRLPOOL a5c034b4264f6076fb7e3b43d73ac0d4f8f177dfef9f5f274b65ce3f8a120f86aa7e46b5692a3be04b4b92f0b71380afe9a634e2602e9cedb4cb657d9ce8d723
 EBUILD ffmpeg-9999.ebuild 15671 SHA256 483e9cb1d91cb9f665f5bc5a2b7ba5cb82fed6223cddb4ac6a4e2006f75a7755 SHA512 31a985156399ca0ae0948fafb49168b76d8bd74c064c600c3630acc3be3ca78413952726bc80af6e919357ebfc43c8fd1a74d30d3e59da5ae5343cac99871f16 WHIRLPOOL b8ec3270ba4301bd1bd93945e6c178e33494eeb6f7ea20ba7a0b8dc086f4a8a1da871aeb749f73648cd4d16af2f66462103b280bc050269fb220f41dfbdf244a
 MISC ChangeLog 23132 SHA256 09ec61b302618a36f1aaf270cc3d8a0adfecae89915cfa1db49eba415094887f SHA512 6ec8dcf80d54a23683e72425d5989d70ee5a2f0a9cbf93a6ff3583d7af1556e9897ae9d917e216d0d2a4469ea0ea05d75389bff11c07193f9c599d59848b0468 WHIRLPOOL 7bd7dd2164286941873d7640311f3b9e501a66c4fadce9f825dcf94ff054e79e1ab1ec4922a193d12631806ceb5fed3787cf4992332586a75e4d7993a74e7a86
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index d3e881309387..6c79a3343159 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 1c662da1532b..4ac9ee46e42b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -2,7 +2,7 @@ AUX makemkv-path.patch 2153 SHA256 daf69f09e936929e78c82ef8efdd6014a3b1bfdf77675
 AUX makemkv-wget.patch 1013 SHA256 8153281145a2299c190e5b3453fa3f76c9451e1eb16006fde459e6665a7bad80 SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f WHIRLPOOL 453a619c70b8ef28e0d8ccfb80141109fe129879f7a4e31355d52d059d95a2abfebe74b16b05d14b033b0c63fa28a0f1567d4382c370937c63990d66d22a1b67
 DIST makemkv-bin-1.10.7.tar.gz 8724225 SHA256 2b9a9e6fb779bc876371b2f88b23fddad3e92d6449fe5d1541dcd9ad04e01eac SHA512 7c3c1713df6b4009de2337a28f4c5b1f38d37be3a30f08ceafc6dc276c960960f6443fd5b29f5f96f10597093ff170fb5ab69d6244db5165da30abe1d3732aab WHIRLPOOL 7cdbd0aef4d1d5e9d7eb0b5ba1e7be5d478a84dfa4fe2c6528c91db29c2ebe86db4ee2cd5059b84b934bb720f293979e0afec9bcce2a3c8460825d9c5a6ce104
 DIST makemkv-oss-1.10.7.tar.gz 4570003 SHA256 be61fcee31dc52944ec7ef440ff8fffbc140d24877e6afb19149c541564eb654 SHA512 f329449ed1bb4240a8256c3171c3c6cc0843c8d07a79526608fa3ea83e012634e6c6d9dd17160853b973d012e3483bcdaa17d9d1e6f7beb90c048b6063c12aa8 WHIRLPOOL 2e74e6d025bf26c12b036c971648975a4e7d9b753a2015e9282f5a4ded0885e83df4f54ca30200c8f50ba5f748283c582fba3b65b4e26211a7d87e4d431ec137
-EBUILD makemkv-1.10.7.ebuild 3113 SHA256 bd8dfb616f0219994f7ea82ca2526ad1030ecb1d4ed765ad2968049fef631d88 SHA512 4733ad340dd9ab8fe247e6f37005620ea5ed5e364c21911d81bb54e7a31e02b5c652699422a14d0fdd3113c2870529e20dba8b3166b424ab3472971c7a960202 WHIRLPOOL 078a37c1892a4fa9700848db25b34f1c232f7428f328303822819d0e86afd35eee61e350f862c68b3af96f681b984f4c53b782e1ecb1fb60b9cbc34be516853e
+EBUILD makemkv-1.10.7-r1.ebuild 2910 SHA256 7a3bf0095f0b62f3e80f215c0720b7a40afd61b340427f4191b66cd8c0c3943d SHA512 9f72258fcce7878938b086613fd31d0197f4b1380d4a02ce5e3ef67356d0f2ade43e8e2066875bed76f8051539c646ccd401b9f292b73a70f7bb69cc0f437a46 WHIRLPOOL e093f3cee709d82f45e10938868552bc05aa51186f80e5ba43180496cd0e96d3ab82be65008753d129b532d92bfe32c0fc97d213dda246a9d317db091dde3316
 MISC ChangeLog 7615 SHA256 377311aefb24e51892ac094ee9733edecad630891cdea77e76c745b3059fc0b1 SHA512 99510e41787abe9edefd918edaff201c5a43f3c8e05c0bf49f9499a9b31e685c6dc8f1d5763f9feb251a352e76a9a9b7d5a13488c33ea8d18ddc32cb6370d1e5 WHIRLPOOL b30a6ec149a2c90ec532b38c4ed8c10b33a7285ee9174c792fdb44123e454704906ebebd92f497c0a5302392884559cabf35af71c7a1e0621f3a7f1534b43cc5
 MISC ChangeLog-2015 12085 SHA256 fbf29eb91bf5bf4b516857b2e3e778bc4ed54b6fe382d80f84ffd688dc0afb02 SHA512 63a0713ae6a6cee55f3077d850a86cc6079a574145683b61b643b8324dcf9ed55dc207e54e70709d1b818489a9fb016c12d553076b5f7aa9a298c599990a565f WHIRLPOOL 3a54bb835dea1cd815cfc2daab46338b46b65e785bc0684a7787ee74ff69b8fd19f8741d821fb5a4de968a3029742e8f7666589e03d64d34b518289a9294c2e6
-MISC metadata.xml 1221 SHA256 19e142b9a9c08384f526c0bf2175aa9443a31c8082f8fe6804dc5011421db4c8 SHA512 697327658b9d1dff99431417d48d9184377c56eacdaf61d98f22a1f7df1e596ee34971f6f75f13cd3842ccb49a21bd2f70592acee8269ae9c130261f72d6a92b WHIRLPOOL 9231c2da5d1d02def5eff7b9609f470720710ea9fb6d2c807226a7488b84f9baa000215761ae71acb88306d59c9429a5bd6ec761bfe1c0918baadd6dc5886083
+MISC metadata.xml 1281 SHA256 fbbb6558c79e5a4df39afcd552f583f662ac08bdd10ccacec693661c256cfb99 SHA512 5060b07ae001cff4403f34cb7a5d09aaa9338147b3a649ec1ab98a355029b770e8c127ba08f771b24c27182c24cb2c72287af77022482844b2188a4a2c6b22d1 WHIRLPOOL dab82e73c8bcbe382c3bd849f5915dca4fe2dd2c6cea65498224adb24eaa66ffefde76aba79b95747af469bfeb1518eb5beb2687123401f1274380e430b4a973
diff --git a/media-video/makemkv/makemkv-1.10.7.ebuild b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
index f01bbdb662fc..8ae13a9e98f9 100644
--- a/media-video/makemkv/makemkv-1.10.7.ebuild
+++ b/media-video/makemkv/makemkv-1.10.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="libav multilib qt4 qt5"
+IUSE="+gui libav multilib"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
 
@@ -25,17 +25,12 @@ DEPEND="
 	dev-libs/expat
 	dev-libs/openssl:0[-bindist(-)]
 	sys-libs/zlib
-	qt5? (
+	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	!qt5? ( qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-	) )
 	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
 	libav? ( >=media-video/libav-0.8.9:0= )
 "
@@ -49,20 +44,12 @@ src_configure() {
 	# See bug #439380.
 	replace-flags -O* -Os
 
-	local econf_args=()
-
-	if use qt5 || use qt4; then
-		econf_args+=( --enable-gui )
-	else
-		econf_args+=( --disable-gui )
-	fi
-
 	econf \
 		--enable-debug \
 		--disable-noec \
-		$(use_enable qt5) \
-		$(use_enable qt4) \
-		"${econf_args[@]}"
+		--disable-qt4 \
+		$(use_enable gui) \
+		$(use_enable gui qt5)
 }
 
 src_install() {
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index b650d107cd5b..9de3ac702c5f 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -21,5 +21,8 @@
       without intermediate conversion to wide range of players, so you
       may watch Blu-ray and DVD discs with your favorite player on
       your favorite OS or on your favorite device.
-</longdescription>
+	</longdescription>
+	<use>
+		<flag name="gui">Build the Qt5 GUI</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 9518d975a216..ebb7c12cafe8 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,6 +3,7 @@ AUX mplayer-1.2-get_buffer.patch 12054 SHA256 ffffa0672bead0e97d970e98dc9ed4d1b9
 AUX mplayer-1.2_pre20150730-chan.patch 966 SHA256 d92a18180b023833a748ec4186a5e2914781247f8840d57d41b564cbe06eed48 SHA512 9ea28c193d26feba870283d110a69d42e739696571ac13d40f983b4b6f0c83f01befd12fa7825b2dca10d5f3279d29d71dd07f2f53553f78e88b182fd8250df4 WHIRLPOOL 8368cf41f1c1ca82674fde7ca39c46a7ec95569fd56acde0caba55b848a1a2635ae0b4b8b5e39c9b6f5f79bb6ad6401c2d7920568aee9d0c24e2e2def8a1f5fb
 AUX mplayer-1.2_pre20150730-encode.patch 3022 SHA256 edf081f8704fdf3936be1971d2d1243b684f78772d4c2a9459ad56a2db9c87fa SHA512 c1da3944616205c92926910d93bf9ee39404f46cad07a68df28050aeab88a358480e9cfe09f41af8fa047b623d9400bcebc1a05c6982f704d5164a777e591792 WHIRLPOOL a928b0ff7bf40495a4a34a4f89f7c6cd17d76bf528ecc696828d9dd5b67a9121f455d22fd439d74dbe434b3e6c1c94e572023e694db8510fea3b6581bd95ab72
 AUX mplayer-1.3-CVE-2016-4352.patch 617 SHA256 3fac635945a9327b3e08d6707f7153966908df147b7bf3d06d0b72d2d3215ae5 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512 WHIRLPOOL a7f36dbb623536ceeebdfc11f1389c97d51a7e5afba335345318b867bf2dbed9f8fdcfd695eb41de0b8fe648b3b40a04f61857c2845e43d46d8ad4ed0dfa08d5
+AUX mplayer-1.3-vdpau-x11.patch 543 SHA256 e941130dde42fe4e4221eca35c3b5fe477c136e5ca3735c22e902663b6feea8e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805 WHIRLPOOL 2d3eefde487ffe33e2bbe248708b07e61f8b27cfdd60bc1289398f83d55efcb9319b1dc2342d2a827f97066453a21256d5c85d318983a3692021e1998a854cdb
 AUX prepare_mplayer.sh 757 SHA256 ee4c0765b2cbab5bcc99408c4864669647fb0ad42517e0a51a6524c12b55804f SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a WHIRLPOOL a4de2ff8e6ecfe66e41881664a84bc8ad91147e7b559e2ec334f9ad6671d9892de01bddfdba514b9c2b0589956b38d22fc8d2ce6ff00c267bded4bfb6c3ef6f0
 DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72
 DIST MPlayer-1.3.0.tar.xz 13278984 SHA256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae WHIRLPOOL 4aaa9609b0c27c0363671e32fb6b7cac8d2c0944c3425c8e76de0250fb76865d5f47c341b11704a0ea980401288d1d28fcd172a5f8469c9713ec37f977bcb088
@@ -11,7 +12,7 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 EBUILD mplayer-1.2.1-r1.ebuild 17429 SHA256 96024a2fc6ec79a8c8fc32c9fb2173e4287d10807f6371961b3c95aaeaf81b75 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3 WHIRLPOOL 8f8e334b08ff302eeeb164f0aa48f052ce144a108e1f5de9ff2e37bcdb1e721d20c91cb823a4f7b11d0e6191c75d7c7c19b88ea36a822ef00e3b9b1eabfad97b
 EBUILD mplayer-1.3.0-r2.ebuild 17194 SHA256 1424b2b4087e9f83d60f37a8f1fccae9f9818ef6372b1713670b08dda6b28ef9 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d WHIRLPOOL 53a194edac6cf2520f9c4180f4f0741ce938a9c23fde391eb5cbc8452fe8be5b739e51c08cfd4587b35085b37142d26386b1424c90d25e3a6247a0ae8a12c393
-EBUILD mplayer-1.3.0-r3.ebuild 17291 SHA256 7299fe0a625eddc967c549992a6f3e93e5f00ffe1121d60acae792e15f17cdb3 SHA512 c7090f69590d7fb36a702c9ee93e5d252ba5bf015d25408806e0fcc64bc87dd822052cd63e3ed3d2627b9ff9dbeb7e3424c80065a8aa22dbc44c2b7a33857814 WHIRLPOOL 6999865997bbda05c0bdf0de812991761436a44759dfc274f42bc08035d0e4dbfc6a8e69281717db159a7208ad3128e5c1f1687849cdb835321de89776fa1357
+EBUILD mplayer-1.3.0-r3.ebuild 17342 SHA256 9282558e9c29f23a2cd0fd22c7dd0473a0edd2462015653e794ab2fe17f04fdc SHA512 5bb5222df9ba043dd5ab7d251a5bb5f749274bd78d95b3fa535a104d5d196da134ac423fd8010d17df81d5b4a0707d37ce998033659bc48713b949a98e3f495d WHIRLPOOL eae711f3deefb5e6172ebc7de4e40a609f0461125b937a9d7494631faceeeb17f2402f55821a6c5b6dcfea04870bdf37132cb823962801d69514cf1d1349f1b3
 EBUILD mplayer-9999.ebuild 17206 SHA256 a8ce728287a09091c4d2917a3e91bc686e31eb7cb5bfbbbef6716d97ea64735e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a WHIRLPOOL 1d23c6754b0c21f3eb3b515396a4a1dc4d2bcb3dee1b2472b38edf91fd987f31b7ee5fb7f229529f826a502d7ae4643b9d57df300cfcc21477a2c4aeb4591f47
 MISC ChangeLog 10735 SHA256 6c3dcfc43705566e97c1761d41f94e41aa26a6a1d7893c25b14e635979e2d267 SHA512 97d8be790bbc844cb59784d2b87dbf9ad0125e69949e502373a7e3cf230d6b5a964eea20b06648efc67634768af865ee5639aff155b61f4eecfa13e08ac93a73 WHIRLPOOL 28daecebbcea2937847c7c1122971327454dcc05ed41b01f1b4a79586c2d5d3db93226ed0ecf4870a2d43061d39192eb63b5fc05ef207ce9408c8b7873d5aa62
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
new file mode 100644
index 000000000000..ae21941a8aa1
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
@@ -0,0 +1,19 @@
+r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines
+
+vo_vdpau: Explicitly include header vdpau_x11.h
+
+The include from inside libavcodec/vdpau.h was removed in FFmpeg
+commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
+
+Index: libvo/vo_vdpau.c
+===================================================================
+--- libvo/vo_vdpau.c	(revision 37931)
++++ libvo/vo_vdpau.c	(revision 37932)
+@@ -34,6 +34,7 @@
+ 
+ #include <stdio.h>
+ #include <strings.h>
++#include <vdpau/vdpau_x11.h>
+ 
+ #include "config.h"
+ #include "sub/ass_mp.h"
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index ef36667a3189..9283124a63f6 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
 fi
 
 # faac codecs are nonfree
@@ -185,6 +185,8 @@ REQUIRED_USE="
 	xvmc? ( xv )"
 RESTRICT="faac? ( bindist )"
 
+PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
+
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
 		elog
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index e64322a873e3..e3010d1398ee 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,12 +1,12 @@
 AUX obs-studio-20.0.1-fix-curl-crash.patch 2240 SHA256 459532f3fee6e24274a93d4364dbc1be5b2cdfa3b592687ea6068927efb0a839 SHA512 dcb09aadf3dad1af5e0de2b83a9ce0b7c9d89911a1cdecd6d40cda6d46f5de2d90ff42d8572f45e9933938a37f5017a7e1160a6885a5247aad2c74c075960688 WHIRLPOOL 013f44817cd8f0b3586b02e4878dce39a1b78bbf2262bd41dddcd4ad0d6dab7242ab5d81c7c4d8e3195887da70c4f32ff00212e2951dc8dcc5c022113d535cd3
 AUX obs-studio-ImageMagick-header-path.patch 2466 SHA256 043654f06cedf7e5f2f66144ecfdc5405ab8977ab0a1177bc69bf255c29d9bfa SHA512 c352671edbfe8de6ca92c3155dddc5f4116e2f0c0e1197f73bc2b59749f0015458e93c892519bc4c1bbfbc89874411f3287092d67951d8ae365cb0411302a2a2 WHIRLPOOL 4fdf33a059efeb3f0d88949b0f39e5715ae4288413a5862ca3678bbdc3491ed24753623ea6a8c699679f3f4bbc2f752b1f6f3fef8c26dbf73c175aaa926d3ddf
-DIST obs-studio-18.0.2.tar.gz 6073678 SHA256 1cfbad3439b1d581b4f5b47792ccc4dae231acaf37178808811ff4e2b68feb0a SHA512 5d03791438e73e1b7689b319d4a7bb2235a178655061e816309a115026207db11053e3c27c08c5dde4f3638b3bb424ebb3bf3748bbbe828374a06abe75b2e39d WHIRLPOOL 66e3a425dd4029f3649e50fcc88d57f7e85133e16ae65e56b69d5e7ad584df37f6d51079419d47ec79397e321388c762715bab14f797f1fc40d1980cafa9c785
 DIST obs-studio-19.0.2.tar.gz 5509958 SHA256 c7846e09f13061587d844588c538276aec6d498c8f9a4518fc3d8bb206776f01 SHA512 8e2c720d713f6b3fdfb0ce64252cba3129644155be75e0942250bb616700ba62acdb04265a7a6d0ce9406282fbbf85d662d7bdc36736c36be89fd726c8bbf5a9 WHIRLPOOL 7200a787ef1afc848fabf52193210a3309456b799da8cbd083d5914723e2c721dc3f7269d5b23edee3fd61c61314c96f11c683b5585d13d8b19536e3480f1f5c
 DIST obs-studio-20.0.1.tar.gz 5610534 SHA256 3241667f180816b860622fd9ac572a86375a9a766ac45c69a886dcbdaf524643 SHA512 891be96bbe18a2de4af8efd2eaeb54c388332ac7d93a66efcc18208af9ef2dfe3981f81ba351bdb16a93b2d66bcfef4f5277d3d8746261f0beb1f324ed9a7534 WHIRLPOOL d43526496775a409c75212ab53c30ebe3d55250583761c58ab5bf9cbe958c5ac4174ea7a3692a133d0be58265862b9e4a62515afa85b429d4d601b0b102a1ec6
-EBUILD obs-studio-18.0.2.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016
+DIST obs-studio-20.1.0.tar.gz 5637636 SHA256 3354e21f1909633dc98e7faafc4c6c57fe0edd049d2675a85c0a1a0e007eee83 SHA512 fd0c4b910b9a07644a9ddb72c2622d1fac67878a8bf445d7ab33385aafa23a5207f89971c428a3be01fa851141d9cbb55e86ca81201928783227fc730d12b962 WHIRLPOOL e0ce146c09ba85904191d339b9a14ff3f9420a7fe8f6a5e079e3f78a019e553a17ba8cdd1b38b0a6c5f66d3b3e517bb567bee5e4d1e9ba31b820f765012f9744
 EBUILD obs-studio-19.0.2.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016
 EBUILD obs-studio-20.0.1-r1.ebuild 2798 SHA256 7c12481e3b3bd77473f4b1596d1aa5480f1f642e381494828673b938bf9830f3 SHA512 252a30b740c525bb975a20cd70a6a5987a3c13bf7b7235fb58a74b0f233b21fe5bdc9a4a32612d3de1184a3d31dfb0e8e32afb9e16dbccdf224f190d19dd22df WHIRLPOOL 4b14b33a6e182fd60b8ea28062040d68aff3b54c088199869a3ca2d366e93865628040b4187b97a1e2ffd383ea9e10a60e129ab12a66f195d325be6ec66503b1
 EBUILD obs-studio-20.0.1.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016
+EBUILD obs-studio-20.1.0.ebuild 2686 SHA256 a93b1aaf0d2943279ca3a15de8bc7de518bda7d15c55179612bc39bbbfdd07bb SHA512 30a3d1bc2f224528d217ab1e855892a373fa434bdd62a13c0935da9cc49f04ffae9e1739a0b7bde6b0cdf77f0ff92ad53d669ca1777411a4b551610d0ed9690c WHIRLPOOL 21d210db03e4d9b5187f17449bc22b6cf1d7e391b596461cdcdf842530b117a7b46fee57581caec4af73c5cb0adf3ecce7e0118ecc4da55061ab71557592f340
 EBUILD obs-studio-9999.ebuild 2654 SHA256 e745f5db8303efb1794b971d6fa17056ed96a00760177a1814d55362b01d881c SHA512 e5a0695d6f87e4335fbf3a51898f05e7ec00c7c9fca12c6a8d71374e54e4fb3389cb711fdc4be4908cc8063297b04528ca9b302e54898871c537d0cd671b2cf8 WHIRLPOOL 86687b0e844c84d89bd64654e5bad06aedcd1168d35041361748c3aba739292d9d8e981eb945f4dbebacf6a83921581efe7669f60624ec0bd02c5a421da83794
 MISC ChangeLog 2578 SHA256 0b32345d309d129d538db25a3de7c29a842fa90e96dd7512d29ccfe72cea3dbd SHA512 e1beab278a575b4059dad958ca01c03bb09cd839cc53b6345ed048bed591ba4222612828f676528877cbf42a2bd7e0eb564891ed7ecd50508f6d367307239cee WHIRLPOOL 93cb13b159a9282db547bc7bbedf159e1e585bbdc4e6a50ef96e8d3d6120b40d2131788373bef15b1521f005c6826b7eda66ce5c79151a3bc59535e101aba74e
 MISC metadata.xml 786 SHA256 ad1780d1edc37a4e0947ed48aac398fbeb887e68bd1fe709aa278b8932251703 SHA512 94ee6c6239b9befb24c87cb647aaed5b87c374deab3791df5742714e7cfabd28cb07822d2cb9a17b310b82f11e2daa6216bb14b327752a7b2a8ddfc9e7062492 WHIRLPOOL 0890c883c7ef15588b132c2c5519096a58d4ee18675ad385b5fc357b761083ad659e797cd9acecfdb178f9fe57469b00c19c39cc4fbfc131654f5cf4bbdd1900
diff --git a/media-video/obs-studio/obs-studio-18.0.2.ebuild b/media-video/obs-studio/obs-studio-20.1.0.ebuild
index d742e19dd528..55ccd0be37f4 100644
--- a/media-video/obs-studio/obs-studio-18.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-20.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit cmake-utils gnome2-utils
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
 	EGIT_SUBMODULES=()
@@ -62,8 +62,6 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch"
-
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
index 812724a98062..948c62e9138f 100644
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1,5 +1,5 @@
 DIST syncplay-1.4.0.tar.gz 539743 SHA256 37fc2b3d1d6d49e2289dcdeffcf24ebdafbc24398411cff4666e09d49405759d SHA512 2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a WHIRLPOOL 68ea8b437c379e2a049efbb9a4258c9d85bdb2d26841ed1100ee7a0083b4e66687bf21826daffd12102acb236b9bede9037f63ead0eba67dbbc5142db309d183
-EBUILD syncplay-1.4.0.ebuild 1358 SHA256 0e6a4996b29b4ab0136cfc169768d713cb2e0d236d46c2b0a6375228ae5d0c09 SHA512 143e8591a326e05a3f07fe70f1df67e54bebaa180e703d8102d5556299fe3e637f5b0ce086c0f16a4757cbbaa87a42502364b2187d923502c7fa0841b3c2fb1b WHIRLPOOL b542e1032d52bee34ab63634442a02bb4d02b94275f847944ea67b71e668e869e2f6d3b589124f2a60ab5274853cb3d72d1799dc612b5924cd744a436a6ecb4e
+EBUILD syncplay-1.4.0.ebuild 1357 SHA256 4a6e8fd0ebdff5bb33518c98f22599f12f90a31b870db2cdac70a3e998c6a488 SHA512 decf80d28781f046bb5a12493d7dce2c9dbc2a8822446810302b38f3793aeaefc11a029e5cc70c0d17337b6598ba586eb4db97b28acb653c1c8a9349f0371c38 WHIRLPOOL 6e64f1e7a42f5cfdfcad95d93cca7dfd9fbd61f8b4b1b7af32d80d7b45d8319c45487522e645d842a2048accc42d070543d4d6344224598148c1aef83992f16a
 EBUILD syncplay-9999.ebuild 1309 SHA256 6aadf78c712c7b90fd2e2eea9afdc800dcf9362bce5def64ced8898d79c5632e SHA512 20927635cf3f40ff0be4c4150c894e2e7b5093b2b0504a3ff0fe0abc6dbe9809a52e445593f06c8a97c3249b7c6fc53a215b7afe9bb1cb2df75a4fe10cdc8ddb WHIRLPOOL dda95c65cad3579c6a41ef2f987a09028472550102217c617babd21bcb0f07b1a2d365da034e7e55977e372e93fd1356492703355f0bb7c6044e93e20132bb1f
 MISC ChangeLog 660 SHA256 1ed9c00f7085a1c3258996731070237b931a0ea6a3657e6bfbd7a693bc9861f2 SHA512 b60cb14a3e25725d362f81bc1611fb03bc002059fb162d3982b268d531bfeea4013b0aa8d80ff0f7dede180690472f1f4da989bdea76951966e1e07f0b79d4fd WHIRLPOOL 49253f8235fe1fb98a0ea5a8981ed7bf16836c1fcf18a5391f4cea752a627a865f5d4feffef75d424db039765792bfe2b3ebe9cbf748498cec82d27396747823
 MISC metadata.xml 679 SHA256 dd3a1a62c1874d252c4260b55f30d85f3cc309d0de861995b99ace5eeef0ed16 SHA512 e997de8e604c16977c8a3dec989c50e9cbfba327e8447277bdaee835e442d77565c2b2092bede04e64babe34f62e1fcd640cc01d6ef56d4c7572bacb1718b714 WHIRLPOOL b7f02f423835c640c974c7554ad5df19a9d1428ac58284993c07a12c4f8767bbe35ce896674af3a1898a6fd48da32a17825f8dbfb0850ee2354137f133e659b7
diff --git a/media-video/syncplay/syncplay-1.4.0.ebuild b/media-video/syncplay/syncplay-1.4.0.ebuild
index a2c620036d4d..ae5ec4785364 100644
--- a/media-video/syncplay/syncplay-1.4.0.ebuild
+++ b/media-video/syncplay/syncplay-1.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Syncplay/syncplay/archive/v${MY_PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+client +server gui vlc"
 REQUIRED_USE="vlc? ( client )
 	gui? ( client )