gentoo resync : 21.05.2019

17 files changed, 11 insertions, 265 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 522fa3f95ad1..0934c134bde2 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 8d80b9033d9e..93c90f894ee9 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -2,7 +2,6 @@ AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2
 AUX alsa-plugins-1.0.23-automagic.patch 346 BLAKE2B d544fdbf01229404342ae84c81ec72cccbb5def2593bbd323e464300bf04e95ba9f52a24e365b786d44d361a55165841121990f319801574c81e46ef0a111a7e SHA512 e10f990a0138d83af93bbcb8848a588ed0a1dc643452352b75ca56e243979b69a07a1b6685dbd4c5ff6e32a3d2e98fcb3c0f5da35ff5645c0cae490ece3c710c
 AUX alsa-plugins-1.0.28-libav10.patch 10113 BLAKE2B 880c8e9781ab19afcd724c408c5291948b4ef028935915c13134c03dae393e0a7e9a258fa91905a1a7a663a276d2a53cde6be3477bd5ed5d0e3b6ea2ae38767d SHA512 b0a169c300e3cb21ee76a6773ccc1f6d69c0e9af604d6bf24669a561e038cf670bac20c5eff5ac48b33f3f36de81d99895b6a43c8310b2609e9b2bfce42cc0bc
 AUX alsa-plugins-1.1.5-optional_plugins.patch 1123 BLAKE2B 453d9455741c118bde8ac697cc3d5b8b1404eb93d842e7a05193175261cdcd30d34e0cc7a8bd90aeb402799c60bce81dd42dcac2bd3b085b3385ba9e06cc2859 SHA512 9659eca8a071cdb2cbae6f1ec6fc0b447a45858a5464023f1dc5c36fda8053572d6a2a8cff629e8c2768b8a61e9f15d6d7cf420ab1aad1b3773084b7ed959c5e
-AUX alsa-plugins-1.1.7-double_free_fix.patch 876 BLAKE2B 782924142a0523ae800b1f55af7b625a0a96f6de07a1c81820c23a98441a066987ccfa35e07c681a48209c5b90b7b1cca3f64e63a4a2d72c818d9d25cc0c235f SHA512 62a21886273d4be05e1094b674b13296dd629ce9aa0deddec3ba4cda9a0a4b00e931aa80be969b3e5dee24c0c649137a23b97bebed15260ee614bf24dcfbe257
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
 DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
deleted file mode 100644
index 9b3a81599b39..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Tue, 23 Oct 2018 09:32:46 +0200
-Subject: [PATCH] a52_close: set slave to NULL to avoid double pcm free in
- open fcn
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- a52/pcm_a52.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
-index e431fd0..b005bc2 100644
---- a/a52/pcm_a52.c
-+++ b/a52/pcm_a52.c
-@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd,
- static int a52_close(snd_pcm_ioplug_t *io)
- {
- 	struct a52_ctx *rec = io->private_data;
-+	snd_pcm_t *slave = rec->slave;
- 
- 	a52_free(rec);
--	if (rec->slave)
--		return snd_pcm_close(rec->slave);
-+	if (slave) {
-+		rec->slave = NULL;
-+		return snd_pcm_close(slave);
-+	}
- 	return 0;
- }
- 			      
--- 
-1.7.11.7
-
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 4bc9036a1857..b51b2aa2fc81 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,6 +1,4 @@
 AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
-DIST grilo-plugins-0.3.7.tar.xz 1892848 BLAKE2B 9894a01dc555f20c3119208e2ee875898c918f8d81e36571a777f7f1776c284d5fa5b4ac9126a352dc812b0f5ba9c15e0e81a2381ef9cb636afb66e272a77cec SHA512 9e69835b3b8f6e2974d799480e2c8c55a084d2089ead6b37112a8c3c79b6bd2142b8fd66952493b7118e09eb5070789408b59bd28784bd9f6bf5ea5a7bc5695d
 DIST grilo-plugins-0.3.8.tar.xz 1408952 BLAKE2B 3375275189a25289406b5d9fd6dd42b6c0ad92779b081ce2f480b464929302af7b52fc758f2f6277c94fad38a2b0bbfc8fe9fd668ff98fc0ac7fbeda69a5ac42 SHA512 c5a0a80fd7c871ce69a06bdcab2b3d8986708e4e6b9c9020d7e938d4450655f962db7f84da0b40ed38ba197f65fc2a561e06a92cdca593620d66c2b153eb4879
-EBUILD grilo-plugins-0.3.7.ebuild 3573 BLAKE2B 6aa27cf042fd684d4b5bfa98ca20e21b10312ea60f96bb79ea0524e52fa21fb5742b829959e3f944c17766384eac4ee9456b68c02f4572c4eb473c7210747b66 SHA512 84d162f7b1fd65713cf02957c337aecb6a73e29ec54615316f52fdfb206e5ef4782301ad8f0a2fe37a81cd9d1222734e478515eb202adcb7ae45c95b78bba042
 EBUILD grilo-plugins-0.3.8.ebuild 2983 BLAKE2B e6981ac32540f0b919e4d256e1695c3752e65c32a5b1c42efc4720cc9243b5f6b54d444a61950defa5b8cf4f5138b060b635b80988c60140184d4c07c7fdc0c6 SHA512 2b65bbdaa3c4fb2fedf3cb22144d5979b7b47a561574919341388ab1eecbf568eddf3eaa0f226df17fda8361f9fa83a553dce273930d8f4f7c2d148e09eade0d
-MISC metadata.xml 1136 BLAKE2B 0efdd69b0def1abeb70d76229addd8cc17db0d8bf314696eb8abfe3e938a8f60ab68b47b0be7aad81d99ddcf0e597cec76e1717ff32e5c0529a8b4bbf8b92c08 SHA512 d308b981dd17f7c78462d0e90892169e2f15affbeb99d909aa35a46e0c1728f6fc3530e0fd936424150781411b469041a47fe62bbf438aa68c0140755830799d
+MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild
deleted file mode 100644
index a1fe9c9b70f3..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="daap dvd examples chromaprint flickr freebox gnome-online-accounts lua subtitles test thetvdb tracker upnp-av vimeo +youtube"
-
-# Bump gom requirement to avoid segfaults
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=media-libs/grilo-0.3.6:${SLOT}=[network,playlist]
-	media-libs/libmediaart:2.0
-	>=dev-libs/gom-0.3.2
-
-	dev-libs/gmime:3.0
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-db/sqlite:3
-
-	chromaprint? ( media-plugins/gst-plugins-chromaprint:1.0 )
-	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
-	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	flickr? ( net-libs/liboauth )
-	freebox? ( net-dns/avahi )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
-	lua? (
-		>=dev-lang/lua-5.3
-		app-arch/libarchive
-		dev-libs/libxml2:2
-		>=dev-libs/totem-pl-parser-3.4.1 )
-	subtitles? ( net-libs/libsoup:2.4 )
-	thetvdb? (
-		app-arch/libarchive
-		dev-libs/libxml2 )
-	tracker? ( >=app-misc/tracker-0.10.5:= )
-	youtube? (
-		>=dev-libs/libgdata-0.9.1:=
-		>=dev-libs/totem-pl-parser-3.4.1 )
-	upnp-av? (
-		net-libs/libsoup:2.4
-		net-libs/dleyna-connector-dbus
-		net-misc/dleyna-server )
-	vimeo? (
-		>=dev-libs/totem-pl-parser-3.4.1 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	>=dev-util/gdbus-codegen-2.44
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	lua? ( dev-util/gperf )
-	upnp-av? ( test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') ) )
-"
-
-python_check_deps() {
-	use upnp-av && use test && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use upnp-av && use test && python-any-r1_pkg_setup
-}
-
-src_prepare () {
-	gnome2_src_prepare
-	sed -e "s:GETTEXT_PACKAGE=grilo-plugins$:GETTEXT_PACKAGE=grilo-plugins-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-}
-
-# FIXME: some unittests required python-dbusmock
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	# Plugins
-	# shoutcast seems to be broken
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		--disable-uninstalled \
-		--enable-bookmarks \
-		--enable-filesystem \
-		--enable-gravatar \
-		--enable-jamendo \
-		--enable-local-metadata \
-		--enable-magnatune \
-		--enable-metadata-store \
-		--enable-podcasts \
-		--enable-raitv \
-		--disable-shoutcast \
-		--enable-tmdb \
-		$(use_enable chromaprint) \
-		$(use_enable daap dmap) \
-		$(use_enable dvd optical-media) \
-		$(use_enable flickr) \
-		$(use_enable freebox) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable lua lua-factory) \
-		$(use_enable subtitles opensubtitles) \
-		$(use_enable thetvdb) \
-		$(use_enable tracker) \
-		$(use_enable upnp-av dleyna) \
-		$(use_enable vimeo) \
-		$(use_enable youtube)
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		doins help/examples/*.c
-	fi
-
-	gnome2_src_install \
-		DOC_MODULE_VERSION=${SLOT%/*} \
-		HELP_ID="grilo-plugins-${SLOT%/*}" \
-		HELP_MEDIA=""
-
-	# The above doesn't work and collides with 0.2 slot
-	mv "${ED}"/usr/share/help/C/examples/example-tmdb{,-0.3}.c || die
-	mv "${ED}"/usr/share/help/C/grilo-plugins/legal{,-0.3}.xml || die
-	mv "${ED}"/usr/share/help/C/grilo-plugins/grilo-plugins{,-0.3}.xml || die
-}
diff --git a/media-plugins/grilo-plugins/metadata.xml b/media-plugins/grilo-plugins/metadata.xml
index 55f535cb6b73..f28e9651454b 100644
--- a/media-plugins/grilo-plugins/metadata.xml
+++ b/media-plugins/grilo-plugins/metadata.xml
@@ -11,10 +11,8 @@
 	<flag name="flickr">Enable Flickr support</flag>
 	<flag name="freebox">Build support for viewing TV channels using Freebox</flag>
 	<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> support</flag>
-	<flag name="subtitles">Enables support for subtitle from OpenSubtitles</flag>
 	<flag name="thetvdb">Build support for thetvdb.com</flag>
 	<flag name="tracker">Build support for content discovery using the <pkg>app-misc/tracker</pkg> indexer</flag>
-	<flag name="vimeo">Build support for Vimeo content discovery using <pkg>net-libs/libsoup</pkg> and <pkg>dev-libs/libgcrypt</pkg></flag>
 	<flag name="youtube">Build support for YouTube content discovery using <pkg>dev-libs/libgdata</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 824713eba6c7..a2b8cf083136 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
-EBUILD gst-plugins-gtk-1.14.4.ebuild 1199 BLAKE2B fe65fadacfb4ae697ad830dbf4ceaf25d0fb626ae47b3071599a85b417f2dc8d06d63812b53156af1a86ee96f00528b17dfeb9cb3dd49bcc63809987e1b3e8ad SHA512 2782ce9975f96467e1036bce953ab76c7e20ce9c6b20dde8888e5bc2e61f6a186bc89245ce452d78083684aa163c2255cf73eca467825f98e351d6e41c139baf
+EBUILD gst-plugins-gtk-1.14.4.ebuild 1198 BLAKE2B 043b5ad75eece99caa732e1baab41066c647e5d43ab1d41dde493372dbcea6ad01f431b20ddd764bb1f334414d9b24de934a3dd7015f5dfb2b79e7db5c12b11d SHA512 306dad8ddb3652f3860ad5495f3539471346476604dbd653358913693c0979c1f4b9dc3600473aaa4f9292aa8b35213256387ee80d8214d0e8f367c45b6b6134
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
index 38c256254329..e7d55b9dc145 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 8f5d7d87105d..b7ead815c224 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -6,5 +6,5 @@ DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1fea
 DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2440 BLAKE2B 61c9b14b905aefdac17cffc297fd6e2e6ef850ea7f0b980c468dbdb3f12b52d192134a51c623ed3294872fe74153d66d766dd0cdf8e8fa6eb2275ac4341c14d3 SHA512 b26cca92978671ac18d713c751a2087e0e86d6a05169626ce36b668920a58d98f354a3c151e00af408bf2cd09a02d46fec85ac7d01597b47ecd30eb6e3a3e328
-EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3169 BLAKE2B 48d4165e5f751789093ea17bc754331b525263141718f633340a232a93c7b12f309c3d720fd129f5b2fda4879f9eb7e2904f7d58a19e229072562bfbf934a37a SHA512 b586a1360e7baecf931896ff59b8bc94c949d10b2530e26c52528a217d9b2567253fa9fd30874ee417ca35c22b8b867165bd8f79e66411a7f1be434bb59570c4
+EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3168 BLAKE2B ce33cf804b69808fcee7405881bc176249cf88837c553d0912d9dcceda6836518b84a66218a753ed71ce4e1f475d3134ad80ac958e160e6bd38edd7e639abaf0 SHA512 9d463d628c5d09a4e5b0ce2e195367e48fdb65aa82d53601f77f406b33d2fd8718c28a7c84aeea56fbdc0dd9a0513588419838abeb509bd1fee89fea7c352157
 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
index e9c44dd1b7b1..36d97103ff28 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="libav +orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index af5ec008773f..f3b211734289 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -2,5 +2,5 @@ DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daa
 DIST gst-plugins-bad-1.14.4.tar.xz 4678032 BLAKE2B 098d0b0600efb9f7926295fdc34d448bf9c9a719b9061d5be2282c6f5d09550b52f7ee78e90398577c21db2bf05510d74a5880d1d401a4931a0dea2b81509973 SHA512 a5bef1863110ae25ef4c75ad2cdbbde011e1d1a722754cc0372e8de9c81aee9159e2301d90d6f9b04b66a20887abe20de20d74dbe207d20102e8081130eaf839
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
 EBUILD gst-plugins-opus-0.10.23-r1.ebuild 483 BLAKE2B 6bb8cdf5374aae793161711f58f645d7dc0a9e0e984dd36ef440c86350d6af56f302acaa34233745509731ac228275b062b4131262baf636b40a6e77f821278f SHA512 5bdc5e46ed34feaa7b63fd6f5dadb6e6c7b623b05a6c22b0f5e893f0f6c1e9a243d6265f865dc509d460822429d446833172ece1549564d676b1154d2ef8cba8
-EBUILD gst-plugins-opus-1.14.4-r1.ebuild 1249 BLAKE2B 42f38a790999981d31e6aa3615892506f2dee92d56216a986e431c8bca02a3a9870527a0881cf6c9135cffd71d6b0e68bbf9a97adbfc938bff0e20e90bd74825 SHA512 20ea3d60bf7ef92e7556ddf6d9e4afc1db96e37ac5fc80d105ec67c58f5cf21ed47735659aebab02c2fbc311ce1f3ac3187c4d16d93f789898b8b64d1d843820
+EBUILD gst-plugins-opus-1.14.4-r1.ebuild 1248 BLAKE2B 3d4e072c529f8ed0c0310c7f371f273af4ef74226b41eb350ef2a3bc5fd17b5b953c17884e3f95ffdfaa34b6f8dc56d6bbcf048225c606436b856f0e8373f75a SHA512 f91065bb4a536ec9e7fb65f18daed71c1e3367f1b69adf60c51d56461e0b88843660eadf5bc08f2264c8329f63997bfb29447ecb2e0c565c0645383324eabb11
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
index 59461a36ff53..69a7f7b47231 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 15355f031fb0..4581243d1d61 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
 DIST kipi-plugins-5.9.1.tar.xz 1468084 BLAKE2B 92ae30ae4c3fa2af173b32b294a610c1670754be5e40d395aec939e192ada42b274572de3dd449e74f26f1680abe07cd3ba48f67d25b75541317e9dc7ac3b494 SHA512 7536602edc85464aa651f5134f1dc085141632775907603d738f3915c718df359adb155013571ab836f91a1fb597418a1437e677b98c086bce5ea884133cca51
-EBUILD kipi-plugins-5.9.0.ebuild 2064 BLAKE2B e4f2001bdead9f014a543a1b198f5bae46bd5e968201f53d028021f74a24301f3f5fdad9ac2a74d670d15946cb95d6b43637620d35e0da00245a909fe287fcea SHA512 b33a3a2244f9a9fdc9aee333b910345ed91e8dd6e0651d461f16d921126beadfb7774b75e819653adf01585561ec5b9e85b28862839e455eeafaec7ee72aa186
-EBUILD kipi-plugins-5.9.1.ebuild 1472 BLAKE2B dfa41d1794a49f6725f4ab938e10e4d4d1ce2576615659aefe11a339c009ac36b6256a835b1c4ac3ae960017df478c65e628aa732d9b6efe95ae036b9fc36005 SHA512 cbbcdcc24c3aa2c326fda3ad2cec2997d3599239f3414ef6ca0efe908a516e02a669a2e79f004ea28f12f9932307c8549133ec0247b8daf0010c237b63044d06
+EBUILD kipi-plugins-5.9.1.ebuild 1471 BLAKE2B 555ffc87f6cf62db12f2075f408014bc401f127bce26fdfd2bfd663d2b797b25a147add31c084593e9e4714a0f567cb1a4251e5d378915ea39ec8d98907f5be3 SHA512 e11a151c2df8370bc39f532625da1670af080c55e68ddc8466be55669abe1a9b579c4af4b4fd924d66c93709af569325fc58b60428efa96d53180f34d3c3cfae
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild
deleted file mode 100644
index a4f546183106..000000000000
--- a/media-plugins/kipi-plugins/kipi-plugins-5.9.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2+"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_BRANCH="unstable"
-	else
-		SRC_BRANCH="stable"
-	fi
-
-	MY_PV="${PV/_/-}"
-	MY_P="digikam-${MY_PV}"
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}/extra/${PN}"
-fi
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkipi '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	flashexport? ( $(add_frameworks_dep karchive) )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( $(add_frameworks_dep kio) )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-plugins/kipi-plugins:4
-"
-
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		if [[ ${SRC_BRANCH} = stable ]]; then
-			# prepare the translations
-			mv "${WORKDIR}/${MY_P}/po" po || die
-			find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die
-			echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-			echo "add_subdirectory( po )" >> CMakeLists.txt || die
-		fi
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package flashexport KF5Archive)
-		$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
-		-DENABLE_KIO=$(usex remotestorage)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild
index 610b6300b5b0..11fe9c31b7b3 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-5.9.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Plugins for the KDE Image Plugin Interface"
 HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SRC_URI="mirror://kde/stable/kipi-plugins/${P}.tar.xz"
 fi
 
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 622b32956a69..1268fe428af3 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -2,5 +2,5 @@ DIST kodi-audiodecoder-modplug-1.1.0.tar.gz 25619 BLAKE2B ca431badbfa6c7e765543b
 DIST kodi-audiodecoder-modplug-2.0.0.tar.gz 30001 BLAKE2B 9ce90103a9b50a37c3f6c8671ecf9986f2b31320fc483dfee6d97331cb56829a9641c8cd1efe1fa9edf6ada360bc1b10bfcff0022022f4ba097a191b52dae0e6 SHA512 8f1cbd95b4fd6dcd560dc615c161e733d7b3413a80abf91c19eb59137e7acf250c9bfd5561a722ddeb52afcc4cf7e2ab0d4f6d8bc5143ef18e0b2c431635063a
 EBUILD kodi-audiodecoder-modplug-1.1.0-r1.ebuild 706 BLAKE2B 92862756b7b7044744599432610e183623d3cad30fa27d087951ee3cccc0a7cc2f429e573e2dd6e257b5d609c907b7be1a1ea82ed380e4430ab7646b3a46d6a2 SHA512 fafce743382edf211c6787e2da919df3ec0f22820e2df2c3f00de683d78a3c5f70a4ebf3f7b3dfeb9f9d744034064164cb2aaa6593eda8a2a9d1085843f9e0df
 EBUILD kodi-audiodecoder-modplug-2.0.0.ebuild 746 BLAKE2B 6100bfca367bfb618d12a59bedfcb19d3930d574dbb502815b7ea04ae1413532369a8cf510020f318f911d16d17b073c6439c2f991b70c1a4d3c2fa6a17eb4eb SHA512 cd60e7b2c102078b7f49b851a221ebc3602fb41c8876947b88efd75e2931369d92163802c62e40a7e768753c53b089ed5a29e86908796384914b236fdb28792c
-EBUILD kodi-audiodecoder-modplug-9999.ebuild 749 BLAKE2B eff46be6ffcf76b252fe8c12c6848d65566ba80a59645dab903f31fe251715329b358b84cf1901b2e5017975179cb882c587e4e3c486dfaae9bcf5eefcc3ada4 SHA512 fa512443264705e12e8af26dde7f4227f9b38a66f6f1b90d857044513abd45b41cefcb969f5001feb27528932f08d0de850a62d1fc603de0ad47e6f648255ea8
+EBUILD kodi-audiodecoder-modplug-9999.ebuild 748 BLAKE2B 1c32d152f205d12c546b935629dfaf1a4aa34ed861534c3d0ab23088b6c6a27cd605fb923540d6e784b8819191881a9c432ddb8a1ae2829a40a1496ca62c4cd7 SHA512 0afef5a333c6441e201fab8f45ab544152c6b6af6711c5fa3c716c9172a9d35df2e3db801879d13f5d2e05b0eec169aedc586443050e44b21d3bf6c97ab1adf3
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
index 78e9c1d36776..4077a1296a9d 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	~media-tv/kodi-99999
+	~media-tv/kodi-9999
 	~media-libs/kodi-platform-9999
 	media-libs/libmodplug
 	"