gentoo resync : 19.07.2019

29 files changed, 373 insertions, 37 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index c6bd07bff8de..75e0084576d0 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 01e100b95bb3..57ecba0f717e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -21,7 +21,7 @@ EBUILD ffmpeg-3.3.4.ebuild 15808 BLAKE2B c64f1cd480d0bf2e8834073571f40eef01093b6
 EBUILD ffmpeg-3.3.6.ebuild 15809 BLAKE2B b78701e736d5b1a8c029bbbec3c5ce40356223c35e78e160cb93a3e30732441abe1a14ab5940d302556abffde9d798de3ad160a98cd274334d467b0e9ba5de80 SHA512 b71dfc45bf7e29e8a5e70402c1dccfe2148223e60a1270a58918c3c3486472193e269e81cd8a1074a792b12b3d24d7a8733f62e3ef5002689d46ce9ce588f605
 EBUILD ffmpeg-3.3.8.ebuild 15815 BLAKE2B 2bce668121996c1bbdf472dcede998450fa4b53b36dfa25ef62b1eaa988cb6b7f8ab216ef29ebefae026ee06b9d4ad001ecb90076efb61e1c6bbaff9b09dce1f SHA512 8650a978d1283d35f37b549e937f9c04cdc860540f7e7ee1871c07b21c13c3c165322075dd00ffbbeaf629d2c79b445b0fd715ae88fba3e59b0fd217b4c3dc72
 EBUILD ffmpeg-3.4.5.ebuild 15589 BLAKE2B 4c0a74578c7e93f007e149a0874a3bde915d5037f9d7ae038eaae815b86254341045bb4d730ae0726c09b61c50622544afb548776476e8d7118b9c64dbc8c6f3 SHA512 e71404901e95550401dc6a0a58e74778327d7a0f32d154ea05e6e5537e5ce629bed613bf9c7a4d6844e501231e1775d8005846ad8698c03e7028f6661c06ce70
-EBUILD ffmpeg-3.4.6-r1.ebuild 15660 BLAKE2B ae3b4da3da992fdb606850366282f68c813556cc5c4b31d48b670c1cf9fa525d4ede9cc43c50548b64d74ee0226364e2091c2162932fd35ab16e6ee8ad7c0a2e SHA512 704a0c1afa0dca84fa781730e9d91d54c177ec620cd657ba51ee3254ca9bd82bb7a4dc6e5edca4ddfba17813b4c88ed3569a6aa83a77b7b7b021e375ff50b98d
+EBUILD ffmpeg-3.4.6-r1.ebuild 15657 BLAKE2B 52441c117677e6e59d69554dcdf838e73b3fb056871b1059ef96fba1004c8b903ac05b58001d85353dd978eebe4c91ff9b7c18f70e1fcf8548f1394602effc6e SHA512 e47d61cd4ebbae0f07083636f0a6ddfa3e0350ea2b4e168d320ba39228d2926788410c7c63075c29452f985e46203d25569611169ac8abdd514687bdf2a5d952
 EBUILD ffmpeg-3.4.6.ebuild 15588 BLAKE2B d49f5b8411ee48a41af83136a8f0ec673f4feb3a13e194d72716c5d220b929688ff1bb20555091ee113546669ba385df7d1cd880fb724556f90420bffcdb00c7 SHA512 8497f50238398bb270e20bf3a896c95fac17ffae62482d3475aa28df27f7ac23c5d230a0a68de089a9f3230826345cbf9b12cd38a2f6fdbdf76b533fa50b1d84
 EBUILD ffmpeg-4.1.1.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
 EBUILD ffmpeg-4.1.2.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
diff --git a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
index dcd142fdee87..5f88508e9d0a 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.6-r1.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 ~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 ~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/frameworks/Manifest b/media-video/frameworks/Manifest
index b8c396ebd5fc..d195ee6ac20d 100644
--- a/media-video/frameworks/Manifest
+++ b/media-video/frameworks/Manifest
@@ -1,5 +1,5 @@
 AUX frameworks-0.3.7-ceilf.patch 243 BLAKE2B 14f41042f2aaf23a1d6640b7716cfe7eeb746e8c847a10751c44ffd15e5f2eed715497fde75779ea41b614b9c5a664b42ff3638324430e9e036424f9231cfcba SHA512 68b094fa58f59aebb639b8799bf5a15ea7cf7916803744de26a138d8f9b34f43172719dbf73889039cdc7c87edac6a5525f0c0a35acbed353e29e17694e00d3c
 AUX frameworks-0.3.7-strcmp-and-datadir.patch 826 BLAKE2B aeacd7edbe01a5cf1616ac5291423dffb8163066e87c593838b3fc826c5d46a07569f544d87a983918529ca4f090f6238105d9c1e44f907fd2827bedf83bfebc SHA512 9987e0c4aff9b42ec8a826991e38638548614986fc83f12e46dc9e357f9f8f6e7d3be9de23c7012f5b36f7cadb5a3f144cc3d2b3615f69ae0f444c5c017675c6
 DIST frameworks-0.3.7.tar.gz 116266 BLAKE2B e1ff4d3144f926d82d83eb28e51e54003936c511836adcc540e5d0e5ea0efcf2d173282c0b52a0a2c9e568e8c48ad24532714e89994ea7381b3c1ea9c053836a SHA512 e146bf9e6c793fbfb809a47501fa4f9f12ba2a4f2e9e4e6c4acac8dda44421eefc4053b6cc01d98f4429e923ecd8322bc499a8a9fa39f41a334df322229df93d
-EBUILD frameworks-0.3.7-r1.ebuild 677 BLAKE2B f7d2634b5018c754aa2b39a319c7a2df49afb71edab968e90a3bde60aca7177fdc39417ab5b904f5253fc89e6ee7535584ca9e023e59033029ff4c992c2c8cb3 SHA512 021f0155e4c06c40019df9d456ef999ab70abbe7610b61b1fc3002d4b248343226a54ea9f4b66e4e458cf3886eeb98fd52b0c3b96026010367aeacb2ae5bc0f2
+EBUILD frameworks-0.3.7-r1.ebuild 674 BLAKE2B 5ddc0ca8f5b1e6919667989de67dc3568defc7283cc067e6ddf587b9cf07106f33421959bdbaa9edcbf8a9182141af6906d514e85e90c81d512ff2bac5be7c74 SHA512 ab686c27918a1af8c7a50636dc001c509bf29ffc1418faabdc8fdd0c5e3d214aba170c8c474c2b59b919fe755857bb05fa7b5cdecd752ff1611024a9e8327f9e
 MISC metadata.xml 369 BLAKE2B 3d1c690b2fd7efe93f63ac3b460cd0fd2c7b3e2a1ee31d02461619ab1c1e2c9679547912cffdf31545e10d3c66aede437b1dcbb576294245669c7951fbbb58d0 SHA512 447c8547b21a573156781ddefb9adc5c4010807b7ff5d8e5270b14f3bc512ca394a3d1d5a6e81cc459eccec60c7ade516de85a9a0b945c24a98c71b43fb59052
diff --git a/media-video/frameworks/frameworks-0.3.7-r1.ebuild b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
index cbaab961263b..32b2c372bb81 100644
--- a/media-video/frameworks/frameworks-0.3.7-r1.ebuild
+++ b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://frameworks.polycrystal.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	>=gnome-base/libglade-2
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index cc042daaf1cd..8734a6f5359b 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,3 +1,5 @@
 DIST mediainfo_19.04.tar.xz 1732860 BLAKE2B d4bded273b8dce2be2c578d263f2d442ad5b4a37f5d8b292d34dd80ed7fe83fbacce69a4ce740f9527f2fdb9a304b6dd91c96bfe747c023ce0dddac2244eb7f4 SHA512 cb6cb3c4bc3a037267684bd850babe3ca5998954f93e86d5b25aad7c4641918546a012cf7c6df4ef8d6017c85ab159dc5ae0b18f166385f8c5cc940a6fb0b3ce
+DIST mediainfo_19.07.tar.xz 1903620 BLAKE2B 68487713e0c540022d2a5ee8416cb8e1c87ed2a4479f8d7c247d75137a62d3ae2994d02cd8853080837a23d582ce4acab497646bf2307a0b2b4d398635738baa SHA512 ef543b2b3fa61347adaa510fc3b051ff148e24ef6461e25b9f1d158f3c4b57ce96826d0c0e8ae46996092e0eb84e99308ba87d95dd0392b99f05b704438c5983
 EBUILD mediainfo-19.04.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
+EBUILD mediainfo-19.07.ebuild 1602 BLAKE2B ba4076c82d812b436c9c707c36043e1f2a5c493fa23c78ab2b545dc1e207f1d42e49cc3795fd5675820ef4e614f37c94128e9e4c5e3a82ccb79e416338950ae7 SHA512 30306ad04a63f72802532bcc3bfbf9bac6cba5306af8d6f693052a17b24f033ab089a7dc1f928cb6fe5c569c5f73d71206fb8d6d0d1f9b4d135cabf8bc109637
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-19.07.ebuild b/media-video/mediainfo/mediainfo-19.07.ebuild
new file mode 100644
index 000000000000..255a3010c595
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-19.07.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit gnome2-utils xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.37
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	if use wxwidgets; then
+		TARGETS+=" GUI"
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	default
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		sed -i -e "s:-O2::" configure.ac || die
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+		dodoc "${S}"/History_${target}.txt
+	done
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index 1e5553dda6e3..5b4ac2f3e0bf 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -5,7 +5,7 @@ AUX mjpg-streamer.confd 347 BLAKE2B f544307fca9e420d5a8edd3b8ea1834dc5d9125d2aba
 AUX mjpg-streamer.initd 1243 BLAKE2B a9a5d7410aa777809790358cce6ddb457b9776b171131acdf9c8e0cddd85deff16460c69d3f588b32c935cb761c7ea5e3abec02f02bf07204a63e4fee1ebba30 SHA512 5430b14a8f712ee1c651ab080be5d52c42a388faa3f6b030366efaf8918c07d484aba3e33eda0d87b392b14dba21d0bfe3b996a7edbf0f3ca3f97ea097c74934
 DIST mjpg-streamer-0_pre20120421.tar.bz2 471104 BLAKE2B 56edc0e4aac616a546c52cd4c7ee69e93f8895de6443c1987a10bf186108d77ae6715ea376c3c1f193c25d5e1238fa05bd22ef8d5e1a888c4939b3f2bdfe2520 SHA512 bd9fa11c8a615cf33f84898f6acca6c61ead3614c848d50c22891922e7cb553b422f2f121377040f52d636dd719a2f300d3285cefc34759df8861cc84fdc2e82
 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332
-EBUILD mjpg-streamer-0_pre20120421.ebuild 1707 BLAKE2B 72eb00d6fe7e93540bfd7789dd51464e8a4118fbe1b18230c563a041218842a42af2a5a4c043778e51ef2604c52880e67de52f7e0181c2e885aa294173075a21 SHA512 fe6810679cbb16391a73a75e38a5d3b0ee679fb615cdfb95a15dd72d9f37dac632681cac2532b329c573c9894680f46cf83fd410fe566c2c5289319e5b1d2a7e
-EBUILD mjpg-streamer-0_pre20120621-r1.ebuild 1846 BLAKE2B 97c6a5c51438ba1dae539f1760b7324beabb24538ff0d08b9ea234a67ecb56dbc9166b3a7a6f1182ae028b0489e9413bb686972d73b7c8e3f512abd36c50e4cc SHA512 02684add56270f3504787c487cc653e72fc6f28f13e517371a2d6fa1c341b0f5d497f4608201fcba116e36eeee6c3a123592a0959e260185d5943514fe9b66f8
-EBUILD mjpg-streamer-0_pre20120621.ebuild 1787 BLAKE2B 36e9c64bc23509474ee3b2b4f54da0b57a400ae1ae057c872c68d3e1b64aa518f51f71b30be8e7f906c2e1b2612debd096f7e774ca0483bec3eaeb8195672263 SHA512 9cb6b725c59089b33daec349c9570d0528430354a7faefce39008ab269b4ae42476a762a1cd39e97195b70a04112fc265e79c6ef6e831c458c7c0144fbb5cb7e
+EBUILD mjpg-streamer-0_pre20120421.ebuild 1704 BLAKE2B 6a8d1fbc073e9f20459705e2076be3c92d5d6eb13f55c6ad928af2c613d0cd37402a75df67257b1d5fbae006cdf3dd60dff0f266fc4b57da9a345183830d54be SHA512 77f99c6d96626db155dda44e9247735d77c5e96c3ed98589b991d67752b7319eea35964231035eefcaf95ae3492707c7cc8d4fa256e1619b7ce7b3c594b54a42
+EBUILD mjpg-streamer-0_pre20120621-r1.ebuild 1843 BLAKE2B f0dc620a54a6418ab228b660035c5bb84593564cd414e8e2d3ae0072b47b5b7240e159f92bae7611670916b0b039154b07c72ea44daf326d49ba49fabb56586f SHA512 2f425ecc80f6dd244023252c282a5b0e2677cee9c1810fd1c63fc46345fa1486a048dfc57f99ffbe95dd351a8595d58bd8510a8f01c459a42a9d9a40860860b4
+EBUILD mjpg-streamer-0_pre20120621.ebuild 1784 BLAKE2B 03f3bade6ebfeb5611e9fae224aee84ef6d8e618d167d65f3745666e4606dfd3dab66d8f88625117019fb5b92e2d95cf0cf02902aa89f610b273d57bf5c5815d SHA512 58e6b743a6563d16ba0f7a979f86ab6737426bf2f41f54da444e787cc35509b04b3f26abde4e389f9ab856aeeee7722415af16481888c3d064fc2f2a21bc4c9b
 MISC metadata.xml 1925 BLAKE2B 472f7acb0b1a740413bce8bfd1cf9903fa3b9d0632ee07a82a8a3125b68719319ceba84ecd946d389c59fa1761aac68e4cda05fd103886d526315b715174cf64 SHA512 11b6bd28a3384810de1b5b34a006684eeebccebdaf7a9d2fc93384d948dbd4b01da669ab3d8def823c2888423ba0de30bf557d25d202cc7d62577666292fac51
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
index 773e442761a6..12a604613e80 100644
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 INPUT_PLUGINS="input_testpicture input_control input_file input_uvc"
 OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
index ddb3c1d833f7..e13ff04b0c33 100644
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 INPUT_PLUGINS="input_testpicture input_control input_file input_uvc"
 OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild
index f5858dc445ed..ca8898e4a9ee 100644
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 INPUT_PLUGINS="input_testpicture input_control input_file input_uvc"
 OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 2ae343adcf95..72e0e5fb6c5e 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,6 @@
 DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761 SHA512 bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
-EBUILD mkvtoolnix-29.0.0.ebuild 2917 BLAKE2B 0a6f43f3976acee9843c486ecfc2901a585b56cdc5c1f3edfff86322e356c58cefb7ac41e42df32e2cb9cafb14d8bc5d3868f30363538a6464bab073d08225d3 SHA512 4604578ff5449024a7333a6d1613d1fa558d24009e4c1f73a05ece43413f76e62613f8436536815e0062778a73d5921646a3bf37429ac43fdb0167d6fabc243c
-EBUILD mkvtoolnix-35.0.0.ebuild 2676 BLAKE2B 07b73b67f35cfd78b25849f6c859b5f1ca19e0fa4df4df78d3a3b7957323861891cdf9f7259e99aee6aaeefd7e7caf38c985aff1f969f12a0b5114bb42c1d43e SHA512 671912514e22004491cb38f62edfc693704fa95555ae969cb23d23ba0b9810328ff4d93667e37265d87cfb2b9ea6cd97e7b8afee14e569d9f5af7ffb220fd2e7
-EBUILD mkvtoolnix-9999.ebuild 2710 BLAKE2B 2ee4d65bf0c84e68b4a050d6cc8f0d0ab69081b4f1f3775dba26b4d685cdbad898d05c3ad08c792ee08dadee23389e9b4d833857dd18f1b03c713ee255ead330 SHA512 792637c46b0a663eb34cb59e69b8bcf101088468627afcd120d28762160689163c7ed34c76d186393afb101bbb120e0ac702f1808401647455a8635aaab4395d
+EBUILD mkvtoolnix-29.0.0.ebuild 2907 BLAKE2B 2591fc5379f969c62ddcc7ce029397697e6a92439e1e02185b3bf1173d75ca7c2d6d78c8c6f71be1c92279af432ed47cc766299f4a56712915858c2b37c83b53 SHA512 bfa8b9d83d3eb7c215808edabf43b442140d2ab972aa890003aa663d1c14332647c47fb1c3470f505a61114e4ef902868165c22dc0f1ff989dd7f1ded382bcf4
+EBUILD mkvtoolnix-35.0.0.ebuild 2675 BLAKE2B ba3e4bc1b96e62e979a054c53fb0b7c12b5da0d2f7bfc45a0312ad8ce0135af33034e4544e2a5e89306e9aebbe750b1481dc48a61f31da8cdd83f50735cf2c6a SHA512 5cf589522efefbc12108494a711707f84e67b3c3a8d7f1c788c4318e9c5f17e2d4ada8879d0a88b622664ce0018bd724857120c81d2973b41acb91e9d891f7e0
+EBUILD mkvtoolnix-9999.ebuild 2700 BLAKE2B 5022fb5fe50f1ad679460b31422358a7e225221faaf0c5a7a222b92cdb78f6e2f875b84b7ac538d7304e30c2d59c29f9d2c854d7532f8dad62cc1a5dc8a5bd3a SHA512 7ea4aa4ad28297f92910e7997faa97923c02e704d8f066fdb3fc8f5bbb47e91bbd94fa504fca0df6d1de57b06406910e2b1dfc5e9a6762122fc21884d795fb7d
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
index da56ecf94444..e8f9a9bf09ef 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 67e541fbc01a..7cb3dce6c6e3 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 8f7b2cf67639..c91b87e7c617 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/mplay-sh/Manifest b/media-video/mplay-sh/Manifest
index 60c5af709519..bd7a2ccfc826 100644
--- a/media-video/mplay-sh/Manifest
+++ b/media-video/mplay-sh/Manifest
@@ -1,3 +1,3 @@
 DIST mplay-0.5.3.tgz 26829 BLAKE2B 49bce50953f2a068cd63ddfe6328f12c66489c2d8b7cb3d399f0afe9246a6ec18e99a4d7a4da9ec7946d0c59b4c405ec351315897bf2ae8ab5f17cf8a5de668e SHA512 68ed7821e1f926a5be5031dd464eae7b861f517eefdd78437adf366e83974ec6cedaa4e75b4098aff8d7526dea47bae60ab1942b13e0a986ba2e7f3bbbf50fdb
-EBUILD mplay-sh-0.5.3-r1.ebuild 1052 BLAKE2B 6824df64eba2c1d032a0cb8254dbf38dc39f3adf98031b749220b5721bdb63c1da3dbf3701dd8dc5e6a4344100ddc42d146fb127c250be340d2b5b9a7205700e SHA512 18967c18e1e60588e1de8f8ee3e458a0db5ea2133bff1da6d92f6333f882f10f20cf4379f4cdc91c9edd64f9fdd479e27d8dad16451b7ce49476d0382916a456
+EBUILD mplay-sh-0.5.3-r1.ebuild 1049 BLAKE2B 5b746e20d74d237315637b36057dfbb49db5d10a9660c661e8cf6971c492648c782bcfd8fc22f8220d6efd3dd7eac90839b7a52791c290a6f490997c8b460fe2 SHA512 47457a6aababbf6be76c3383651ae60587f8d0285e03154e65497577e82192482536a6596b4b655e06f7e511dca8db4890fada3f6e51d9f8bece988474589003
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild b/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
index e4660d476501..0f6b9838c2c8 100644
--- a/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
+++ b/media-video/mplay-sh/mplay-sh-0.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=62306"
 SRC_URI="mirror://gentoo/${MY_P}.tgz
 	https://dev.gentoo.org/~zzam/distfiles/${MY_P}.tgz"
 
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/media-video/mplayer-sh/Manifest b/media-video/mplayer-sh/Manifest
index 9809b16eeaf4..4b87407e6efa 100644
--- a/media-video/mplayer-sh/Manifest
+++ b/media-video/mplayer-sh/Manifest
@@ -2,6 +2,6 @@ AUX mplayer-sh-0.8.6-parameter-aid.diff 3541 BLAKE2B 40a6e3c4c4f832ca37ef4bbb49c
 AUX mplayer-sh-0.8.7-parameter-aid.diff 3570 BLAKE2B 52622f53c8b8992b0f2fef0e708118d5cafc05e8ba8dafa55910815cdf2dd7b49933fd1f33797faf2f055ecadc35863d6cebfe2819c8bb1ff0acc2bec3accb78 SHA512 9783f779a09143faa89ef3de5d87ec415dd797af53d4b1da6b56ed28021a414768b4393e0fd8812c74805c17970eb24cbee3ebc12ee741e036a2f4276e449e5c
 DIST mplayer.sh-0.8.6.tar.gz 7568 BLAKE2B 4eecf46b75368028f54f090e13575287bbbe9ab6fedaf2def221f539b95fcdd4fba8c3a1ad59d9aca2fd72b6ec770ee159a410383e45d53148d270043fe464c6 SHA512 ff4a11f1b8dae014646f101fcab16d6cebc0c3250bc8d259500c2819b484913270051ed9ec9b1442e647e811030f927db07f71aa64edd6221a875e067e22e36a
 DIST mplayer.sh-0.8.7.tar.gz 7851 BLAKE2B b7dbaf93c509a3d2bb38f226dafed2261ddadbff24a6e450f3fe2cf5cb5208bb3e89a1830fc3e59d674e9b045360208e7c221498e32f228be9c6e0147aef2588 SHA512 5e83dd2f83b104f7043d828b713e34f47c9a42a93324424c802d4d448b770e36515accf67bd67ce7461201b5e9cd5596da2bbd182eccef9578c9b31b5fed50d9
-EBUILD mplayer-sh-0.8.6-r2.ebuild 1019 BLAKE2B f9e079e5b65e597d344316b863cd69ec9dbb924f2c0521a6553c38429545650c5d4ad32679afea13099b04edab6bf325ce1ddc743dc16f117f300af6fa804dda SHA512 90f5c6a0914280f03432514131b0353106f8eff78252ffc5e87ee7e7e7320f4e26d0ae2e733dd3fe86a80bc3c789827b81786ad42dc26a47fa525860cf7d1579
-EBUILD mplayer-sh-0.8.7.ebuild 1043 BLAKE2B f2f7e90887cd42eab87059b60f977e483b9966a8c8c8bf458a6c7f7e7ae2b894e395baef95dce137adb37ac04275509c613cf1a0cfd180e8a865ff5a34862ff0 SHA512 493e799c0e40f6dc431a7412170ff503394ed06d3384271e75e2fe2b9e5bb9aa85cbbbb784148bdf6c672f1e7a2dde8ff220d659cf337d2224f129e9d153b131
+EBUILD mplayer-sh-0.8.6-r2.ebuild 1016 BLAKE2B 7ac9979a063b1b82c10947a19d4ff774213c88f33d98e8d0fa0f4b4814f5cf7f08a5d41208af6e28249144fc0dbb55a34e535bcebb5b4b97c257bad1b68de9e5 SHA512 77c9dfd1500bc47cc6bd5831bcfa96c4fffb21fc8b1ee6d3b0127d0670c94554375decd5b9528c4766c8d0c4524ea54684f0a358db40e448750860217a2ca082
+EBUILD mplayer-sh-0.8.7.ebuild 1040 BLAKE2B 88af926f3919271306a1f8b2f8abab7ef283d27dfb02519d6ef2b7c4384b92cf8dbaca841e809f04b4799afffc7fc56266e86b55ac143b2b2829ffd4cc7f2f34 SHA512 724cce5b006bf67c263f235d4672be7efcbafacece0759a1811b521afff6c0324bb753bc432dd4bb14ce7fb915d4fbeb2a8367471557441cedbe80167327560f
 MISC metadata.xml 351 BLAKE2B 884ab56115f6d1c2455c8f82d125a407cfc27b007268a594fa63c23ff9cfe0d13ea3f7b646d6a39630786282b014df9831d5b36f0421d7545241b85d11f47850 SHA512 6af26c23e8ba19a3126ad46a0fb5cba9d8fa14eceea940fda2e064a3e0c98eae305a9b02c11fbd7b65c24635c40fd650c3691dd4e72219d8ddb3ba2a2b4c2531
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
index ba1d12f2242c..1a81acd52372 100644
--- a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ DESCRIPTION="Video Disk Recorder Mplayer API Script"
 HOMEPAGE="http://batleth.sapienti-sat.org/"
 SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/mplayer.sh-${PV}.tar.gz"
 
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="all-rights-reserved"
 IUSE=""
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
index 8fd6e86d2590..3ffabc1ecea9 100644
--- a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ DESCRIPTION="Video Disk Recorder Mplayer API Script"
 HOMEPAGE="http://batleth.sapienti-sat.org/projects/VDR/"
 SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-${PV}.tar.gz"
 
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="all-rights-reserved"
 IUSE=""
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index 81a984f0a3be..20824bf45c4f 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -1,5 +1,5 @@
 DIST smtube-17.5.0.tar.bz2 748559 BLAKE2B 41c5be3933b74b079136788c99cf3e073eab5903596f2e39f9451493e17338d39454a8956841452f37e56c0e6051720a02a9765f3165f4e7e4aa1d93caa1a59f SHA512 bda1d166fe03eb85e5a9971b0d5422ea3e72ea91293c4dd14cdb447788635971a1d9977fd2dda60bfcda68183511b5c6ca6b39a229960fbd4c7c5f125882140b
 DIST smtube-19.6.0.tar.bz2 748844 BLAKE2B 55e662fc85ec44f067cba037c28b26fbfe08439bafea294dfcd1c4187e8df9f1f066780dd80c765dc4e584ba5b3917d8982a46253039b6327a30ff9d842b9e0b SHA512 f61e432b8f99e34ddbd9415064eecf30c9a3a6731d646073253d63690cf531321a7a5038117db981d036d1abfdbd3150df21bc22c9ae75e32c63ade3a859ecef
 EBUILD smtube-17.5.0-r2.ebuild 1447 BLAKE2B 06f6b15ca00add442247f618b96c82560b7ecb65668ddea9547df95e818d28ad87069227b2d1be728c32bdaec99488e64962974c13ea323675c0580c62c70260 SHA512 679bceda52dc589a039d4520160b861dc03599d6dcf16bd5fef6c1e6e73753f1a36255525b4ce2c16bec356ee7ed0b08e2bbf26ef9855190bd1116b82052dfdf
-EBUILD smtube-19.6.0.ebuild 1308 BLAKE2B cd64ffb10782dada1d0ab433eaa6acf6c0eb0728cc7c928a9e9274e36936393d7c895cfd15edab742aeff15244150ee3a33cdcabeed5d5c281282606c3db4678 SHA512 e0af27f8dd95d6ec4791beacb2c8cfef130330b80db220db794cb8e205cea01422312631a009b19211a645f2b14ca2148f30defd63069100222b1dc938447eda
+EBUILD smtube-19.6.0.ebuild 1307 BLAKE2B 1669f2b0e5f2d391c227d681a34c9e8357d916b3162994c8dc412bb47c1a6c6c4edc5938b3b9ec04ce86384bd2599db9b3ca877cc2b4a946543ff7550c216a32 SHA512 8d2e8fe7e886fb7518bc78a7b41203b00c0511f4a9b7b2c315e0b25d5eb594a8ff43b3bacb796b9fbfdca1faaf7a9bceabbf86992667a3943873dc6bef3fa3bc
 MISC metadata.xml 553 BLAKE2B 5818030e41958376eb0a4566f79a245d8bd1142dbcbf56aaeb21434e4194d2e8c7208bfd7b7e15b11f688f0e8ef47be2e1748740883a09cce1cda04836a70e24 SHA512 0e833e9f3075e066d059871c97bc951acb2d68152719388b9c1eb92776f50822585c88f662e8c5544ef15861f11bd76e469a34c593c98f3bc76ccf898eb202a6
diff --git a/media-video/smtube/smtube-19.6.0.ebuild b/media-video/smtube/smtube-19.6.0.ebuild
index dcf67fb03df9..7c4cc6692fd9 100644
--- a/media-video/smtube/smtube-19.6.0.ebuild
+++ b/media-video/smtube/smtube-19.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
index 7f0e053dc5ea..1d592faa704a 100644
--- a/media-video/streamdvd/Manifest
+++ b/media-video/streamdvd/Manifest
@@ -5,5 +5,5 @@ AUX streamdvd-0.4-libdvdread.patch 1460 BLAKE2B 68577f49d3c837c9d2148838459e3e3b
 AUX streamdvd-0.4-makefile.patch 1378 BLAKE2B d8a244cb91f246eefa9da4f39a861f9f6bef84580a0b2faff3f01d0ad7c0c7ecc2f8a62711b4f5abca8c6e985a6d70934f49724bb052be8e284c506fe70d59c3 SHA512 5234433fd985ef561c43420a6f7a1ee30c4748ce5a4c04e3a6864e95f42fae1b97c8c0e1a6adb0c6c395500a7f007263621cab8779dc57535287a6ba81a32988
 AUX streamdvd-0.4.patch 787 BLAKE2B 61b1619e478e0200a0b4607a0375f37d60b6c111cbb355670e7edf2cdc93a21c84daf24e58fd00180ceb84e67470adc9d2a7d75e2a373684db80b8bdcaaa8897 SHA512 a70535c05292bba30f211a576f6e93a2408a5c2285ded0208da9757f9c4e88e605eb572e3cbe61f02752a198849ff805dd93dcd3457d78c0f9c9294a6de7bf53
 DIST streamdvd-0.4.tar.gz 152669 BLAKE2B 700ce4f03eabf3e3531bac4ab7b618c55a96e636c459368740597124353f9639cfd7c6b00a5a4eacfd438c3a6a7966c0c8dd42dedd3ab877ad96317a8658aa1e SHA512 81e8fdaf028799be7269c239ec5717bd5da58254b7eeef35ee5d436c4408fb02f9badbc5ff8a661903d10ec43bbaca68d8792f729293f6330c2a9e92ee0c48a5
-EBUILD streamdvd-0.4-r1.ebuild 1526 BLAKE2B aae06e75c807c2dbca708995f0a1133608e47df9634e5a3ad7d80e7cce97e696057e73c71c8af9e4fea050461b2d70b2cbcc1a5afa91646a7126c43291536ea5 SHA512 4157b9e5bc8993c856ffd7a8201be36d0d9c66761a235c7629e46ebc231145407a9bb4b63e67dc16b9e0d38f466c89ed523a4bb1e2012ab32f22614e959bb80c
+EBUILD streamdvd-0.4-r1.ebuild 1523 BLAKE2B 6526bbe063750dee1e4143a5149b216e7509b8a161306a9811f803d8496acf6ec15d79c94081bf594f6f55f3f5b1de14b3299f08963a4622be0c6c6e4536050b SHA512 e3a12065c88e5c532c84dafd7c22322cb127acf1dbad6765c8eb4b153f127037ddd96d6f4abfb6aef83906368973b0bfb6006a6b85880058a6996fc012069502
 MISC metadata.xml 559 BLAKE2B d5dd932f55599c1f38b5c68472a7e635852dd846d3c4cb85bf99f783c861be56cf5f846da27fb81460e68b97666b2bcd229655e987380a84c74c352f20668516 SHA512 17ff5079ade1e6a7c74298fe8e6f5737cb3fd0822f3318b198c32af761043c218739bb90865c616229ffba5698711a970d48f83df02716e7f82ab819c3c8fa98
diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
index e983596a9271..531705d009b6 100644
--- a/media-video/streamdvd/streamdvd-0.4-r1.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,7 +11,7 @@ SRC_URI="http://www.badabum.de/down/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="X"
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 62361321cb36..d9a156927094 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,6 +1,9 @@
 AUX 3.26-gst-inspect-sandbox.patch 1789 BLAKE2B b3bca8f3b5ae8baa2b1767fa09b0d389ea49a105534e99cd0614ddb383a492bb0b3a1a142f3a9c2c840f04242a3b5c4d0f12baaf9ad5a48f74d94f9e0dcc1429 SHA512 821fbf78ad33157e7508364849bc1690657713301b06d62ffde126c7c06a1a019f690cdb66b3728b18c03a60fe201be513d6392a5cfd9181fff783f7b93e1a9b
 AUX 3.30.0-control-plugins.patch 7048 BLAKE2B 6c40cfaa9b831ffd054ddf09482036d6b7c66693814fc798ec9e0f41a95163e3cad6474c346e55349172f6189d257c7630e6b51bf4c58c42212cc6f888ba6754 SHA512 410d78444b2f27b61e5a242ba9c4d93ab9eff02f7923129c286b2c482a36c8b799c53655a4e7bcf6ec89252537c7a62269296917378efcc015aa60bf7930705b
 AUX 3.30.0-vala-errormsg.patch 820 BLAKE2B 6b896371078f59b5e46efb28ccca56ef710cbba583ec4c9bc7c7b05b18866e6b30f6ba140461dbaab4b9a56fd50e37a940a61c4d62b7b5132f97b1969e7a723f SHA512 f19bc0bc9e592f0e32cfb776d631acc9aef54d107ae22acf9ce29036dec0abf9b153c5a1a2e3c99e3f0d27d9ee504e4bf9dd91567318be1966f4f3fc157c16ce
+AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742
+DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
 EBUILD totem-3.30.0.ebuild 3714 BLAKE2B 2bdd3294e8d1749afac2a268231f809070ce926705e8b8053b91f280200b8e5c24277081ccf5c0db8c260a20af9095b781822f9259e1ea273f9779eb5da02d3e SHA512 335e3719f373d739331eea050ffab25d15231763885f97651bcee1c4970339f5720d1eba7c4284abc9ed6f2db545f6f3aaf838b44f1f561a8eaa2a473382ab7b
+EBUILD totem-3.32.1.ebuild 3431 BLAKE2B ac935a22e936aff899dcd33cd0d69566559b1993d1d84dc2ae53d72d624d9738d94c2afdf9aea99d3bc4eedb127379aeefb53885cf0549cb8b6ae7d0ad293c9c SHA512 646b70a0283531d4599f7d6c6c052e4ab9593bf552476b6d766e94745abb535954038539d4afe319094e83a8d4ec6fe7fc4127d6903a95d9ac5fb52f640edc2f
 MISC metadata.xml 1323 BLAKE2B 50a31cc1ea80714ce43b7434888c275acfea44b2231c500b20422ead6f248b3ccb0765909df4dd2c74c05aee333e294c599982037f91364efe77b1dad639c63e SHA512 95686fb2c0a601026587bc759548bc7b3798f7ed1347d34d2deb42a35ed5f424da7412ccb4b6d6fb50ca078855c32f1eb0485ffa4eec919baad7e19b899058be
diff --git a/media-video/totem/files/3.32.1-control-plugins.patch b/media-video/totem/files/3.32.1-control-plugins.patch
new file mode 100644
index 000000000000..2abcd75bac59
--- /dev/null
+++ b/media-video/totem/files/3.32.1-control-plugins.patch
@@ -0,0 +1,124 @@
+From 4944c498633f913c07a2680563a64d47c233630d Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Sun, 14 Jul 2019 20:18:45 -0400
+Subject: [PATCH] 3.32.1 control plugins
+
+update From 5bdfac8a4a34e3edec05439fa3cd5544e0515e24 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Sun, 10 Jun 2018 10:09:16 +0200
+Subject: [PATCH] Allow full control over which plugins are built
+---
+ meson_options.txt       | 24 +++++++++++++++++++++++-
+ src/plugins/meson.build | 30 +++++++++++++++++++++---------
+ 2 files changed, 44 insertions(+), 10 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index e1c5909..085380e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,27 @@
+ option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Whether to enable easy codec installation support for GStreamer')
+ option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
+-option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
++option('with-plugins', type: 'array', choices: [
++  'all',
++  'auto',
++  'apple-trailers',
++  'autoload-subtitles',
++  'brasero-disc-recorder',
++  'dbusservice',
++  'im-status',
++  'lirc',
++  'media-player-keys',
++  'opensubtitles',
++  'properties',
++  'pythonconsole',
++  'recent',
++  'rotation',
++  'samplepython',
++  'save-file',
++  'screensaver',
++  'screenshot',
++  'skipto',
++  'variable-rate',
++  'vimeo',
++], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
+ option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)')
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 552cc22..cddda3f 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -37,8 +37,8 @@ allowed_plugins = [
+ plugins = []
+ 
+ plugins_option = get_option('with-plugins')
+-if plugins_option != 'none'
+-  plugins += [
++if plugins_option.length() > 0
++  foreach plugin: [
+     'apple-trailers',
+     'autoload-subtitles',
+     'im-status',
+@@ -53,15 +53,22 @@ if plugins_option != 'none'
+     'variable-rate',
+     'vimeo'
+   ]
++    if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
++      plugins += plugin
++    endif
++  endforeach
++  
++  if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('lirc')
++    lirc_dep = dependency('lirc', required: false)
++  else
++    lirc_dep = disabler()
++  endif
+ 
+-  plugin_error = (plugins_option == 'all')
+-
+-  lirc_dep = dependency('lirc', required: false)
+   if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h')
+     plugins += 'lirc'
+   else
+     str = 'you need lirc_client installed for the lirc plugin'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('lirc')
+       error(str)
+     endif
+     message(str)
+@@ -70,23 +77,28 @@ if plugins_option != 'none'
+   libxml_req_version = '>= 2.6.0'
+   libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false)
+   gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false)
+-  if libxml_dep.found() and gtk_x11_dep.found()
++  if libxml_dep.found() and gtk_x11_dep.found() and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('brasero-disc-recorder'))
+     plugins += 'brasero-disc-recorder'
+   else
+     str = 'you need libxml-2.0 ' + libxml_req_version + ' and gtk+-x11-3.0 to use the brasero-disc-recorder plugin'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('brasero-disc-recorder')
+       error(str)
+     endif
+     message(str)
+   endif
+ 
+   if have_python
+-    plugins += [
++    foreach plugin: [
+       'dbusservice',
+       'opensubtitles',
+       'pythonconsole',
+       'samplepython'
+     ]
++      if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
++        plugins += plugin
++      endif
++    endforeach
++
+   endif
+ endif
+ 
+-- 
+2.22.0
+
diff --git a/media-video/totem/totem-3.32.1.ebuild b/media-video/totem/totem-3.32.1.ebuild
new file mode 100644
index 000000000000..1046a2c110e9
--- /dev/null
+++ b/media-video/totem/totem-3.32.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome.org gnome2-utils meson xdg python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="cdr gtk-doc +introspection lirc nautilus +python test"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+COMMON_DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.19.4:3[X,introspection?]
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0[X,pango]
+	>=media-libs/gst-plugins-good-1.6.0:1.0
+	>=media-libs/grilo-0.3.0:0.3[playlist]
+	>=dev-libs/libpeas-1.1.0[gtk]
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.8.1:1.0
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+	x11-libs/libX11
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+
+	cdr? ( >=dev-libs/libxml2-2.6:2 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/grilo-plugins:0.3
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	app-text/docbook-xml-dtd:4.5
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+# perl for pod2man
+# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-control-plugins.patch # Do not force all plugins
+	"${FILESDIR}"/3.26-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Disabled: sample-python, zeitgeist-dp
+	# brasero-disc-recorder and gromit require gtk+[X], but totem itself does
+	# for now still too, so no point in optionality based on that yet.
+	local plugins="apple-trailers,autoload-subtitles"
+	plugins+=",im-status,media-player-keys"
+	plugins+=",properties,recent,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo,rotation"
+	use cdr && plugins+=",brasero-disc-recorder"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+
+	local emesonargs=(
+		-Denable-easy-codec-installation=yes
+		-Denable-python=$(usex python yes no)
+		-Dwith-plugins=${plugins}
+		$(meson_use gtk-doc enable-gtk-doc)
+		-Denable-introspection=$(usex introspection yes no)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python ; then
+		python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-video/vdrsync/Manifest b/media-video/vdrsync/Manifest
index 53d946f67316..04daee64173e 100644
--- a/media-video/vdrsync/Manifest
+++ b/media-video/vdrsync/Manifest
@@ -1,4 +1,4 @@
 AUX vdrsync-0.1.3_pre050322-path.diff 1378 BLAKE2B 23e44bf7f598c2a60629c4d1f74fe20a97b45457a698302a8b6ef8c589bd115585328bf7596b7717186486926152b5e5e08bad70ecf7697a31eb946dcb77c534 SHA512 e147082f6606ccc9a85dd8336976f2c10427ddb1418f7233969a8d6a3a40061847aaa24156c10d71b6dde772f1a6cf03d660edc299217b83d467c4ce285a72cf
 DIST vdrsync-050322.tgz 295498 BLAKE2B 8f40605c8f035829aa7881de8a4435de9fa8b40af737d38b5452a2338b216acb454634eb14d79767c23de13520a2499420d8aa9908cc1b6a4f557222ea5ec3a0 SHA512 112dc3cb84511fcd8c61144378931dfb6af5a1650b728dd3dbd9004dc783c24fc26125d31fe02ba5b3c26174c82ac7fb2f74fd444b8c390640fcbc45e30c7a21
-EBUILD vdrsync-0.1.3_pre050322-r1.ebuild 1238 BLAKE2B a5521b197cb33bda460309463f11271f262ea1a249ce81a7ad85b5a2a6803a911547616de0a867bda1da6b7cabeb96edac0efe95cb58f5f6443fc845caef08ed SHA512 1a9f773185b2f2e13d58e9ffcb3289ff93c02f2c067490037844dae56de8c59c53fd3dda817a3ecc1f7a89f7b45702e355cd9c884e75a47a072bb330d456654e
+EBUILD vdrsync-0.1.3_pre050322-r1.ebuild 1235 BLAKE2B f6b2dd96ff4b64506b92388de65f01736df75184ba7ecb94e96ea4cfd2e0cb624551248a49e970f3432ba5c3c85f3a13cdaee0051091971ec5257756896fcf7d SHA512 d63f0a97bedb6de401cc14dbf0bb29cd0c81a37fbc1bb4a54cdeda78e49a901449eae1aa8a0e4b8507d3884c7bb6e0340f576d0cb85a1012d7756e18067737e7
 MISC metadata.xml 357 BLAKE2B 2969a06704f541160af828c0e4bb2607cc86a22090e867607fd2951b08a22f45070e6c4fcf84ce22d6ec074b288ea4d8e04d42bd77dac69e3ec16600a311d1d0 SHA512 c301a1bb051eefde7856ef1462d13343fba21acfabde35a2fd9feba5c00f3aaf697b9e358132cc56114f59af0b785ffb07998d8a6d084369275cbf1b616a7fa4
diff --git a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
index a80fd6cd2096..fb37db3df2e3 100644
--- a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
+++ b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -15,7 +15,7 @@ SRC_URI="http://vdrsync.vdr-portal.de/releases/${MY_P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE="dvdr"
 
 DEPEND=""