gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /media-libs
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
145 files changed, 2697 insertions, 793 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 2238a60f8640..1af0862f0c6d 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -12,17 +12,24 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
+IUSE="mpi"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-libs/boost-1.62:=
 	>=media-libs/ilmbase-2.2.0:=
 	sci-libs/hdf5:=
-	virtual/mpi"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch" )
-
-# Docs are not finished yet.
-mycmakeargs=( -DINSTALL_DOCS=OFF )
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-Use-PkgConfig-for-IlmBase.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS=OFF # Docs are not finished yet.
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+		$(cmake-utils_use_find_package mpi MPI)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index 2728cad4d0b9..c8b9a5f405c3 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
-EBUILD Field3D-1.7.2.ebuild 645 BLAKE2B 9b02a5fbcefbed02b0434e553e24207ae103eb898322917caac724ed7ff39f3ce673dfc21b340e8cd1439f4d7e32a29202cd88ee4a387f8de8571aac4a4ed717 SHA512 5d31100bc97fb809082c3f8dd4bc727dd550168ebde3055f8d4a492216a77f7d0e45a1fa8cba65136799a34f7b6b060ff74600a789003ddf6ad8c47847729896
+EBUILD Field3D-1.7.2.ebuild 803 BLAKE2B 85f88e8134a9c39c3e84122a39f6e80c590898c5aae95d65c8f55d3dff44f16bcf018b8fe9f523045df1bc8da3125d21494f8c12156673417a3f17d3afb0d59f SHA512 ea22e2ae2ae07cbc54f1afb47781dea15044be9284a3d16e115dd5016a6e3f351650465afb6226736fc4551864f7d41433a2eaa58335758cff954cd1447e5c05
 MISC metadata.xml 820 BLAKE2B e8b04778684298db20cdea68773c50d5791eb0b024fcc0193293dcc34dd06eb0180cfb16075117c3a4b325d1ef1cb78b3bd40b64b67fb3e41e162a17fceb1cbc SHA512 3e8b636aaa7cae681572ceae3b942e20149864be38c5f437227c462185e3acf4660de7a9071988cf59e3a481e47d804de0c563d23674bc772287318cac9a933b
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 81c84f65fd46..6dad278ad22d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/a52dec/Manifest b/media-libs/a52dec/Manifest
index 290ab279181d..bb4b70d75235 100644
--- a/media-libs/a52dec/Manifest
+++ b/media-libs/a52dec/Manifest
@@ -4,5 +4,5 @@ AUX a52dec-0.7.4-test-hidden-symbols.patch 637 BLAKE2B 542d1bfbf8722d900b25fa6bc
 AUX a52dec-0.7.4-tests-optional.patch 299 BLAKE2B af245be87277559c2fbc1695180d4e451ccc6a76157111d57fa86992c4cd4dd59e166b7a68a7d799bdda56d0ac5ae3ddfe5c433cbccf6eef4a999e2b336eda0e SHA512 9f5c0afbfd656287eafeba04eed34070f53a77cb53981d64ff71edb96bef6cc2c0638e0be6647086cbad87ead97aa0215cd6cb413258d0122bc3f45bcf4480b1
 DIST a52dec-0.7.4.tar.gz 241507 BLAKE2B e8475b391a3afe77883f5683f58a64d2babfcf93c08a3bcbd0208476323e9c86c5d268d2738efddd2093a1c47886deb22185cb8f00c4ec8b4153f64e1af1f49e SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
 EBUILD a52dec-0.7.4-r6.ebuild 1439 BLAKE2B b3d5cc7a25f0694ea9a771ae3af526a28a6522b0e2bf094dfc6eb6f56d424fe90502878a8697f12618288c27116deb5d4d4c861bf4b735ba889f8695f3209bdf SHA512 8437c6bdbb0ec560ad57829cf6a2227b07886c27db4a954c3c1b3e402313ad710ea8c0dad575c0f325deb64bb3ba9ddb064255aa37751a27f6f3b6578af54d50
-EBUILD a52dec-0.7.4-r7.ebuild 1570 BLAKE2B 4ef77d35ca6798d64b988dff2b305041c07ebacc812cc07ad4e142987a19ad1a17972347df7ef9f7e7ff3f2547519a8d1653804acee2ef98f5cf243a8aed8a97 SHA512 a3430ca53b31cf7b5f8e6442ca0c5ad16cbfbe9f5b2cfea2c56317a7fa8e2da043a88cebb92e8bea08b7890cd7cb982a7c53fa3d682e42c5104605c24444988c
+EBUILD a52dec-0.7.4-r7.ebuild 1566 BLAKE2B bc6e1c658067476153d9f046491dc0cd0e8aeaa77a3aae784f619d9ad93aee4905351e81795127b85e0eb7afcada94cf365d8aecce84444a71b5fe39a577c99e SHA512 4a33964a3d8a2bc42996060313aefbffee0780495ba0cc2bf91eb157c012ae2cad2d8dd8dcff411eca08125484dff972150484be007f131b95a6e54651420214
 MISC metadata.xml 442 BLAKE2B 6e92f797dedf977ed4dd7321249af91b56488c98f9bb64cc8df4fd1ed1012a501d0f49ef5cb063d52e0636583dca77c4376df2e1071da889f598415aa91d801a SHA512 acc8d37733d5efebd4e65401dfff5926a64e13f641dd383343a26b666fe13963191782990ec4571c18803584808b249cb60646a06d91437f0a6793237eb99ca0
diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 121fa7a0e6ce..0fe011bc5422 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index a97581ad1bff..005969f3b24e 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -9,7 +9,9 @@ AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 9e28af560d359d1ef2e2a13ac30ede196
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
+DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
 EBUILD allegro-4.4.2-r2.ebuild 2586 BLAKE2B 9436548344a878ee11ffdd2fd20c6f7c6f7157ee1c8f73f9d55e376d386fb8fdbaa5a1178c3bfff2e0fecc9c83ec0275b9883935354746277c4ec0970e2090ea SHA512 8ca49bd5e811faa9e707cb0af64c07857286f6af9f962adc97ae33d3c267e996010bd4f3ce76faa99414ce922f6eb6bb123b9671da388019c8109ee6f8805fa0
 EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
+EBUILD allegro-5.2.5.0.ebuild 2792 BLAKE2B c68cd10374a280e4e230954b1843c3e0c5d5c3854da9c7309bb7ffeaffeae8d8c69938aefb4dd3cec619f3de54da34b3d4b5aeb5a49da9696827cd395591bddd SHA512 d9771f255e1ce41b34c0c880bbcc8fed5ad81101b0beb57b2fa0d27dc648f73450de07376b08e9ccfb1bb2c28e278bfdd2889c1fe815995898b465b693c36d75
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-5.2.5.0.ebuild b/media-libs/allegro/allegro-5.2.5.0.ebuild
new file mode 100644
index 000000000000..355077dbfb22
--- /dev/null
+++ b/media-libs/allegro/allegro-5.2.5.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
+HOMEPAGE="https://liballeg.org/"
+SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD ZLIB"
+SLOT="5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
+
+REQUIRED_USE="X? ( opengl )
+	xinerama? ( X )
+	|| ( alsa openal oss pulseaudio )"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
+	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_DEMO=OFF
+		-DWANT_EXAMPLES=OFF
+		-DWANT_FLAC=$(usex flac)
+		-DWANT_IMAGE_JPG=$(usex jpeg)
+		-DWANT_IMAGE_PNG=$(usex png)
+		-DWANT_IMAGE_WEBP=$(usex webp)
+		-DWANT_MODAUDIO=$(usex dumb)
+		-DWANT_NATIVE_DIALOG=$(usex gtk)
+		-DWANT_OGG_VIDEO=$(usex vorbis)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OPENGL=$(usex opengl)
+		-DWANT_OPUS=$(usex opus)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PHYSFS=$(usex physfs)
+		-DWANT_PRIMITIVES=$(usex opengl)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TTF=$(usex truetype)
+		-DWANT_VORBIS=$(usex vorbis)
+		-DWANT_X11=$(usex X)
+		-DWANT_X11_XINERAMA=$(usex xinerama)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	local HTML_DOCS=( docs/html/refman/. )
+	cmake-multilib_src_install
+
+	dodoc CHANGES-5.0.txt CHANGES-5.1.txt CHANGES-5.2.txt
+	doman docs/man/*.3
+}
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index f4be5771e606..c668477f2870 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -4,5 +4,5 @@ AUX aribb24-1.0.3-reset-control_time.patch 713 BLAKE2B ae8d2bcc787ff12c5bd3374c1
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
 EBUILD aribb24-1.0.3-r1.ebuild 692 BLAKE2B 31de88410fe23acfbfc52aca125563792566e296315b614ae07c0d378176d10722574eca4bb16d775ded48bb3bd2f679f92cb0f5bec2e6db952c77a9385218d5 SHA512 7650c1ccb3cdc429570da6a677b43c0721a41eafbae387908862123dc7f8f7f65283810cb9c91f0b037cf3b1db364b4da9836c37a7768657991b4584ebb91cd4
 EBUILD aribb24-1.0.3-r2.ebuild 853 BLAKE2B bab9cc33bda115f2be63fb47e076f7f038cfad7e06814cab4dee51839e9aac8f98e7eda9cc56da08224694b799baa047c3ae675a4c70710d5a4a74bc91215eb4 SHA512 23ff30f07977bb69af456a6c9c603e02e870646aec33550ea2c993acd16cf65c7b55425c3c6911132628124c6504c02688c7f64d618d5494070bbc7bef87fef7
-EBUILD aribb24-1.0.3.ebuild 610 BLAKE2B be387cc22c418985fe567238db2dfe1add1576f0484d3fc28162f4f47e4e6f22a2ecd642670d8f5dcb43d3866448b7cb6a0206032f9c25b525d9efcd9bd40054 SHA512 5fec871008d5d91cabb85d145327a748d910898b3eda002eb4efbdc7ab7eff4fa6cf0770b900986c8e8046a1e11a7338cdfc3ca55f0fef59eda79b1b9c1c2040
+EBUILD aribb24-1.0.3.ebuild 616 BLAKE2B ce1ecd3b136e91fd0982f9905c99326241293146fa31a13ab4948943200df4f40dd850e8bd0c5c6b0b60d3030f895d544c8352ecafbdc6c8e900080da6a4eebe SHA512 6f40d29f3a3c0b69e2b00ddd754b75648619d23b76549eb8e6fa9e0c3a0fe011be923dc01bc76c6e2ccfd5aee361c38feea3fbae762d3a92ed8b5adc240007cf
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
diff --git a/media-libs/aribb24/aribb24-1.0.3.ebuild b/media-libs/aribb24/aribb24-1.0.3.ebuild
index bc97622331ec..ffeba8187ac2 100644
--- a/media-libs/aribb24/aribb24-1.0.3.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 
 RDEPEND="media-libs/libpng:0="
 DEPEND="${RDEPEND}
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 6d9008613842..842793072946 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -2,5 +2,5 @@ AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8
 AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928
 AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
 DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
-EBUILD assimp-4.0.1.ebuild 1331 BLAKE2B 3c703835ae02fd9a706efddb628a13848d00535a40425aef1447ffb39c199ea11c408e74e5a1ea49da19c0dea7b5c5400c7e1726fa7413d1f95496b5743f8dbe SHA512 79164a1c28b7244acc305accac8d3ae8b9de29cd313bd474654986ad4ba137adfd8de26803ae64d74637831559503fbc92cd9d0ea21545b951a4319d77c2ce67
+EBUILD assimp-4.0.1.ebuild 1334 BLAKE2B 69cba811c5f5b0957c36b257c1bc52c30b15c58ade44c5cff8a1e3697eeda607d8ed5885362a5ad8e1b8ba1c982dd8155f325ae3798a982a39a8d0132e68cd4d SHA512 c47fddb39ed30f9c8cdd9fcdf5b43703c07134a8e7dd187518eaec8392792614716252d39f19262278b8cfe832cf92df602b08855d1d0724b74796f851068d7a
 MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
index 4bdb7525726e..954e9f5f3a09 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.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=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/assimp/assimp"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="samples static test tools"
 SLOT="0"
 
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 784d12060411..5901083e0c7a 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,16 +1,10 @@
 DIST babl-0.1.12.tar.bz2 642234 BLAKE2B 2e60f7bc5edd55d78e3e588c1c777e3aff6953ffb0ecb5ac91b2a1bf7019329a1ddedb8de53b77fd1c37342b607f2f9603bedfb45ceb9943051d63bb0bd364ba SHA512 b69c8e3870f25372b2223aa4a716383af30342822461fc847039af964cdd194603dbc327a5c3547369d64b206b54280a5a9a227197ca6b7bcfbfa8e2e560df6a
-DIST babl-0.1.18.tar.bz2 734225 BLAKE2B 8fc7f0c25adbde4c88fef6ef104de232f5dd074c6262a6e47f177be9362d62dc8cf30e098f3f341fe57f164383eb2fc5054d7796214464482c1ef684f09d1cbd SHA512 70cf2db7294d5744e30519ccc9bfd795c9ef4bae4425bdf8719ce0028c6bb81deca7b2c0550e98877beddc7f5d5ce71b9ba5318416dc32c3087a13d8eee42304
 DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6797a6e077de16d47239a67cc8fcb93253f54de31012cfb1622cafed2c220cba5cb3cdd9eb1599e5d11b4000f SHA512 4b55b666170322adad4b4624c98110d7a34c496f7aadb22a53c09d1ce5ae518122c2105fd2cb2a057e752fe1540beb703f8192e48e7c43601342a75db2bfdca0
-DIST babl-0.1.56.tar.bz2 673080 BLAKE2B a172819342e6982249734d2e5a0014bc9feaf882788c50c72494adac7160e9cca4b8d45411c110217b8bd8642fe46689295801f1207e54de1219be5e13a475b0 SHA512 e3d6192126df136537ce13b2858a7ec078251093762052bb3edd826a26ab36fee73375ee854bdf423f22fc30f23bcafb3ae46e986ed6555f3ef0809b12c612ba
-DIST babl-0.1.58.tar.bz2 686407 BLAKE2B 89e93f9152adddd5761728e0234e0139b8e7a4611fd0b082998f34bfca6cfc155d35e3d9b66d777022948d6b46e8d6e12af739d43138139b361c63879f39f1da SHA512 4747e9432072ab786f096f18fabe307587f307369ca89ec7ece2ae8db59ea8f618a67c6c9ed93a8f21533bd91e00db05653b37b923dfee074d7c4381452324ce
-DIST babl-0.1.60.tar.bz2 685707 BLAKE2B dccbbb6974160377eb70fa32dad998ceeed6d065ba87a34c11d38e4bd2ea6a4c359f107bfe4afc0ab637fea99377d83c4669519a61fbc9e221a842d1d5375870 SHA512 a65533b4527c4334c7ab14fb16be41e3e2e93f51bbeb24dd427fa9263e25fa8ad83337b73a805bebc2414fb57bccceaa681f89ce5c5187bd0a03703bf07cccc2
 DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3 SHA512 4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
+DIST babl-0.1.64.tar.bz2 705991 BLAKE2B a22522f3c9ce73b4a0d29f2dddae870e7d241c4456295cab8b3a1d6441dcc7221c510ace57ba22a86ad8aff605734430396b65dbad3a51d306344d0a230034bc SHA512 b728c2973f80b62e2ee62307880e00a95a90839e778644dd6ab4076e43708e4939c8162b9a6a474dc3c3c4c087475d51eb64d2effd6dcdf969696060cc22a8aa
 EBUILD babl-0.1.12.ebuild 1340 BLAKE2B 5134dd30060cb44092b6915c3f88da469c319d760e8aff3960c36c991b1b15cb4f696fe05966cbbeaa09910a824067893fe19b853494aae34e09562101ec7161 SHA512 809652f63a16bcc6fee76a7f4d9d2f4460f9b5e79f3e3325ec368694004c1702e5bd57efc5ec5dd91bc66494080268b89d7cecc116943311bd347a32a18b9e8b
-EBUILD babl-0.1.18.ebuild 1470 BLAKE2B 5e45d86ec4e9c274c66ce2bf2829a286a08c81048c36d74e96bb5c7eb4442991a75a224747b1e4e509ff08f758a0794c95d7e8968351f190076d865c49b62828 SHA512 b07a5b88eaae36f039b3f11f729b01464075bbe383c037609784b7644799adc9f1a9a3e156c1207856b2d78f4c85d7a0e39cccb26597c6f238a2712416645634
 EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b306edbe483db2c26cce220ccc24d5b8c8435aa1f687642a3f3c88180f5d7bde43f6ffcb9ca5a71c2ac5fffe6 SHA512 d79e7597bb0d5fc2670d0991964051d08dc69c090838fa36ec6b188f5062190943ebe27d01bc46fc1aedd7da24e91d7e88c976dd67e85c36887494ba0d2d677a
-EBUILD babl-0.1.56.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
-EBUILD babl-0.1.58.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
-EBUILD babl-0.1.60.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
 EBUILD babl-0.1.62.ebuild 1537 BLAKE2B c79d279334766e1ff7621a7c90b660dc723a56acbd0b53afc55aa3f764e99d8c44aec04a608d0d756f6dd579d491c0db1524b647c2ca6fa96ac1757f468d3fa6 SHA512 8a4ade232489f16d797c771d272b465b7d187faccd528015400b86ca8d7be5f83f236344b23921a1ec1f9c959af617c4bff7bb76257219823bc1e99282b24a9e
+EBUILD babl-0.1.64.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.18.ebuild b/media-libs/babl/babl-0.1.18.ebuild
deleted file mode 100644
index c4a928b72087..000000000000
--- a/media-libs/babl/babl-0.1.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch_user
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/babl/babl-0.1.58.ebuild b/media-libs/babl/babl-0.1.58.ebuild
deleted file mode 100644
index 8d6d747f60ae..000000000000
--- a/media-libs/babl/babl-0.1.58.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	inherit autotools
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/babl/babl-0.1.60.ebuild b/media-libs/babl/babl-0.1.60.ebuild
deleted file mode 100644
index 8d6d747f60ae..000000000000
--- a/media-libs/babl/babl-0.1.60.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	inherit autotools
-	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	econf \
-		--disable-docs \
-		--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable altivec) \
-		$(use_enable cpu_flags_x86_f16c f16c) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/media-libs/babl/babl-0.1.56.ebuild b/media-libs/babl/babl-0.1.64.ebuild
index 3fb4930af3dc..c6f18423b435 100644
--- a/media-libs/babl/babl-0.1.56.ebuild
+++ b/media-libs/babl/babl-0.1.64.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit ltprune
+EAPI=7
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
 	SRC_URI=""
 else
-	inherit autotools
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
@@ -30,7 +27,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
@@ -53,5 +50,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 546bc3c2e503..772987a2d1e4 100644
--- a/media-libs/bio2jack/Manifest
+++ b/media-libs/bio2jack/Manifest
@@ -1,3 +1,3 @@
 DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a
-EBUILD bio2jack-0.9-r2.ebuild 1113 BLAKE2B 5ee09177b04626796bcf12f62456703ccd3ed850570d4fb366c14e9fd97646683c7d09db5b9c8379359e363f70f9c6a4a302db867d9f6049a154975d1af7cfac SHA512 c90ecfbf8289e65fea6b548eae41e22760da1cceacba0eaba64f3234e4b8fe335b471803a7b71ba1f66e7be84c00cff693bb21a38c023da415b65a856204f872
+EBUILD bio2jack-0.9-r2.ebuild 1059 BLAKE2B 66762e33d7c0d21b3a307ca5219c7406a74061c3bd66629f0c24cf2085859b72bd199480d1588f099419af4f4ac9e31e5e3854ab9944845ce088a2319d3b85a1 SHA512 a376d12ed7fa57350b820a746f8c1ca38c8473ef5540a536877849ca7c8783fdbd0de284597d1c15b3f56ea75d910690f7924ff839ac2ca52e3c2345e9b9c191
 MISC metadata.xml 331 BLAKE2B 10b8c96e08bc97853a40647f2875aafc8c7de9994ba5af8cf5e2ed429efc2cd494b65d1d6dd424da234785568ebaeec822f15c0b088a0bc8df1a12322f2472bf SHA512 57c44fcd806d4de0339c0a6041635dac52545c8aa71516aefcde41613a8ec92f293c5e28f7b04ed3ab746fdccee306b80a44ef4faef24b2ade1abd2be831ca27
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 1365950c7e60..a9ad79512962 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A library for porting blocked I/O OSS/ALSA audio applications to JACK"
@@ -13,20 +14,23 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
-RDEPEND="media-libs/libsamplerate
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/libsamplerate
 	virtual/jack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	eapply_user
+	default
 
 	# upstream does not provide a real release, it releases a tarball
 	# with a _prebuilt_ copy of bio2jack. Drop all of the built stuff
 	# and recreate autotools from scratch, then build.
-	rm -rf *.a *.o *.la *.lo .libs .deps Makefile config.{log,status} stamp-h1 stamp || die
+	rm -r *.o *.la *.lo .libs .deps Makefile config.{log,status} stamp-h1 || die
 
 	eautoreconf
 }
@@ -38,8 +42,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dobin bio2jack-config
-	dodoc AUTHORS ChangeLog NEWS README
-	rm -f "${ED}"usr/lib*/lib*.la
+	rm -f "${ED}"/usr/lib*/lib*.la || die
 }
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 935fd70c0c7b..407253b24e62 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,5 +1,4 @@
-DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
+AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
 DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
-EBUILD codec2-0.7.ebuild 485 BLAKE2B 06f9744dbf2dd9eeb47bebfb09662526253ac62e3d34b47390b9b4df147721b6b7aeb51a67c9a5495474e133a4fc27465736ff50c4a9043e3be8e3ff8c834357 SHA512 39da503a4cfd811cd0de69e775b38cd16a1e41cf97342df493f09597efbd225a06e2f56836e9641367d67c5005da67e4c89bb5ee5052b1605117226b251d8b89
-EBUILD codec2-0.8.1.ebuild 638 BLAKE2B 0c90251cba1a1b918d92dc44a7988980b94b21f17132c98020412ea18494d8632d233ee246d89149810f1c5f64ab00ad44b3c444454835b19f0cd084b9b6e558 SHA512 a624acdd621265c64afc95a1dd1215a117b396b0e4ded70b92ba0f276944de3402f9744fa9f2283871be0f6a9ab8762fefb40ad6a2ba9b293588d16587ba0a28
+EBUILD codec2-0.8.1.ebuild 657 BLAKE2B 068d47df535a6094365c8be35bee0c672b7e6203350f209ec2ddefe9efa8bfed26fe541e1a73c07bfcd2d93fc02531b0b4b825f47a5f8a14881317806c7fc39e SHA512 9aa724b393f39ab66e3157323957eadaf38b852ff4c8901d33ff037467c8e2667fba2074e1144078fe2c1cfe57bb855f4b5731ba344145db0aa81c4ee359a5d9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.7.ebuild b/media-libs/codec2/codec2-0.7.ebuild
deleted file mode 100644
index c50c30e8bd4c..000000000000
--- a/media-libs/codec2/codec2-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/"
-SRC_URI="https://freedv.com/wp-content/uploads/sites/8/2017/10/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=( -DUNITTEST=OFF )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index f220838eef34..78da953304a8 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
 
 multilib_src_configure() {
 	local mycmakeargs=( -DUNITTEST=OFF )
diff --git a/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
new file mode 100644
index 000000000000..174e5173aa66
--- /dev/null
+++ b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
@@ -0,0 +1,79 @@
+From 3f786481d49e25a089586df4656cab563c90ae41 Mon Sep 17 00:00:00 2001
+From: David <david@rowetel.com>
+Date: Thu, 25 Apr 2019 06:47:06 +0930
+Subject: [PATCH] removed unneeded dependancy on libspeex and libsamplerate,
+ these were just used for random misc programs
+
+---
+ CMakeLists.txt      | 30 ------------------------------
+ unittest/CMakeLists.txt |  9 ---------
+ 2 files changed, 8 insertions(+), 48 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 669b8be1..6c8eae19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,36 +195,6 @@ if(UNITTEST)
+     find_package(Threads REQUIRED)
+     message(STATUS "Threads library flags: ${CMAKE_THREAD_LIBS_INIT}")
+ 
+-    #
+-    # Find speex library
+-    #
+-    message(STATUS "Looking for Speex DSP library.")
+-    find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
+-    find_library(SPEEXDSP_LIBRARY speexdsp)
+-    message(STATUS "  Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
+-    message(STATUS "  Speex DSP library: ${SPEEXDSP_LIBRARY}")
+-    if(NOT SPEEXDSP_INCLUDE_DIR AND NOT SPEEXDSP_LIBRARY)
+-        message(FATAL_ERROR "Speex DSP library not found!")
+-    endif()
+-
+-    #
+-    # Samplerate Library
+-    #
+-    message(STATUS "Looking for samplerate...")
+-    find_library(LIBSAMPLERATE samplerate)
+-    find_path(LIBSAMPLERATE_INCLUDE_DIR samplerate.h)
+-    message(STATUS "  samplerate headers: ${LIBSAMPLERATE_INCLUDE_DIR}")
+-    message(STATUS "  samplerate library: ${LIBSAMPLERATE}")
+-    if(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-        list(APPEND FREEDV_LINK_LIBS ${CMAKE_REQUIRED_LIBRARIES})
+-        include_directories(${LIBSAMPLERATE_INCLUDE_DIR})
+-    else(LIBSTAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-        message(FATAL_ERROR "samplerate library not found.
+-On Linux systems try installing:
+-    samplerate-devel  (RPM based systems)
+-    libsamplerate-dev (DEB based systems)")
+-    endif(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-
+     add_subdirectory(unittest)
+     add_subdirectory(misc)
+ endif(UNITTEST)
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index 35a944fe..9b2e0e95 100644
+--- a/unittest/CMakeLists.txt
++++ b/unittest/CMakeLists.txt
+@@ -73,12 +73,6 @@
+ add_executable(tfifo tfifo.c ../src/fifo.c)
+ target_link_libraries(tfifo codec2 ${CMAKE_THREAD_LIBS_INIT})
+ 
+-add_executable(speexnoisesup speexnoisesup.c)
+-target_link_libraries(speexnoisesup ${SPEEXDSP_LIBRARY})
+-set_target_properties(speexnoisesup
+-    PROPERTIES INCLUDE_DIRECTORIES ${SPEEXDSP_INCLUDE_DIR}
+-)
+-
+ add_executable(fdmdv_mem fdmdv_mem.c)
+ 
+ add_executable(raw2h raw2h.c)
+@@ -91,9 +85,6 @@
+ add_executable(tnewamp1 tnewamp1.c ../src/quantise.c ../src/newamp1.c ../src/mbest.c ../src/kiss_fft.c ../src/sine.c ../src/nlp.c ../src/dump.c ../src/octave.c ${CODEBOOKS})
+ target_link_libraries(tnewamp1 codec2)
+ 
+-add_executable(tsrc tsrc.c)
+-target_link_libraries(tsrc samplerate)
+-
+ add_executable(tlininterp tlininterp.c)
+ add_executable(tdec tdec.c)
+ 
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index a3072c8a1591..5e92d8290724 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2180 BLAKE2B 8b4399b82387d57421092c37ddc56be55c4fda6b2894299ba294e90d7107e826a045520b5b9b3f38380bc749e53cfb45c218523e0d44022de52b92f948ef6ba0 SHA512 6d6acbe25ee6fb929711e8bdb24f2d0c3bcf52547e0e694ab94d529395da9c0850cbb328d8c4b2288f1467255914fb799f27db7a9ce10af223488933d07fef14
+EBUILD devil-1.7.8-r2.ebuild 2179 BLAKE2B bebf9505ef4a83d834503cb4e6adf9ec0c79ebfb06256d4fb30bf3de847ad7247dd5cded55f2fe928df18b95a1bb63403f95c5873edd8244d63a52c9dd076056 SHA512 aaed7e62676e65f3d18fc98bc7740bded30e9e32e60911e71cdbfb9518e568d23cdc867c454952812fe74074780418fb84ada8d12880c318c41db86977f81690
 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 63a422bed59f..15e294645407 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm"
 
 RDEPEND="
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 7bfa1dd8f205..724185ee4311 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,5 +1,5 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
 AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
-EBUILD exempi-2.4.5-r1.ebuild 1223 BLAKE2B c2d247879a8bd65f89a9a957fd2c7be1396b8f65824a64702adea1f5592596d2367310ab57c11d6cf97a2ea0d9029bd4a6caf2bf182938f5fa1d2e53865f9173 SHA512 af2b6995b53ae1c5427eac267ca96fca20c7bc2a3475a370493c9b7022cc6e24488113fc9ea3e382a904b6798bf10611e9457ff348a7e8ef99da575f729db049
+EBUILD exempi-2.4.5-r1.ebuild 1222 BLAKE2B 93e186963c5e5f3d7e147db76d39a92e9e981ee0446c8323fe9f0164df3ffb88426d5280856a20beacc75dec87ccb31ad069e678103a7f5b505b78d1ca890bf4 SHA512 0111c4a6373b0bcbb9541663afaca2603b8ee5c71a0bf452749b76dd313e90a55c2d57861681a95f777f0be9d3bca10c95dd118060b7392e1c64287f5d15d590
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index 85ac5b69d1b6..de40c4624571 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="examples static-libs test"
 
 RDEPEND="
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index b763b372dec5..d10c8ee7e9d8 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,4 +1,4 @@
 AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
-EBUILD faad2-2.8.8.ebuild 1243 BLAKE2B 79a5ace3014765e525f86e969c789aff38620e9257b1da650cc7fbf2c9fd99cb71111fe44cee5628df49dfc4193f46e5d53f2163237d8df22d96a1ba5fc3395c SHA512 70d321880b872c1bdfe98f9aafe519116cb8a1f09f118a230607df36758d4813b7f33b9e5c565594bf3dd826136dfc9ef4e957de343802574c155ed02879d832
+EBUILD faad2-2.8.8.ebuild 1242 BLAKE2B 3dc8a0eec842ed70efd09286079280adeb90fb0be8cd8326d8e92960465f6a9fb1a4735a5850c44312d87f3206e67a2f999c6a745814a88891d51fa46f61e7da SHA512 82e5a871874c2c79cc1064619c4e4f6be13ef27b87b5bf893bf92cbd0f71e5d4ddfa0541ed18170997e0ca3df190ab9e25f54d4099ed54fa9fb298c113753066
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 71287ad16ea8..52d52b03f259 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 37651adb4aa6..6a8d5590163e 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,7 +1,4 @@
 AUX 1.4.0-x32.diff 755 BLAKE2B 87ec22ce9c53c49788b12f82797f876e207c07dec95a7229a4117cb9bf8b5be988e98b78dc13f7d62079c43ce0d5a6ecf894590ee6dad2f2071541a43b221411 SHA512 c143704ef537a1a151a7778f84c51ca2e098648c7c50f8c17ed0e2ee625acdfa95d9d3462ebd1323fe1be1fa4b72524c219becab320bdb9f2eaa06ad2744d581
-DIST gavl-1.2.0.tar.gz 4589139 BLAKE2B 9e99aa41128690f580ed023de07a449a101a15549e39f77e89dbf08c0eddd6db691d2bd5b50ad64b2be293d6c4cbf6a1d9157a9cc8d4749c7a5118c15cb9fdd4 SHA512 fe3b7ed91b8564e7f61b738f29ea439af462c1e28038ee04f5b8fc82d7fd6270acd7d1dd54c717f289bba181bafe9c3ec6156449d95153d9fd43e18a92a60c41
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
-EBUILD gavl-1.2.0.ebuild 1021 BLAKE2B 34fee7782a808bc01812044354996539bd6d82ba4a059c37a0e36c19a37f29f9a32946abe6baaa8b16720e731915644cbf62190dcbdec96f800616ca28fa5123 SHA512 bd67ce43d24c876b6b5281cf6e6d7567ae917c6a57e28340a98698d3900a239f0e54c1773661477d8b48788097d3eb7d4c9a85010b7418d3ad84872ed8171943
 EBUILD gavl-1.4.0-r1.ebuild 1089 BLAKE2B c6d284504cb16bdd3321c2ba6e0152ef50a6e5226ea9e814bf61515ed972af9dd087ce3116f16f822bcbe5f74c16c891b16b6e84d139a3c2e8fa09eaccf8f27d SHA512 bb18d6c0f9013f3cf07a6c1e2fd9b7d1470430e68c47c47eff7e76215bf5b3b95ec4e4a0aaa0750cb1a8c78c3024771ca61ba848d369180842b1e6667a2d21a4
-EBUILD gavl-1.4.0.ebuild 1038 BLAKE2B 0f58085701e912771bd1fa583057316cafff26ab12633c91b6fbe29be5c8914d4cd6650e590071b15cd276a5a1e5a6ac0e211a7985b36b077f9153cac97bd535 SHA512 c188d45c8e66f8ee204bf092f0d2ce10490beb1f35e604cf8db0a1081edabb71b7580984393a3bd05e8c1a303ff7361a911f8dcb0749be3c97bde4bf5259408f
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/gavl-1.2.0.ebuild b/media-libs/gavl/gavl-1.2.0.ebuild
deleted file mode 100644
index 2715afa75886..000000000000
--- a/media-libs/gavl/gavl-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools-utils
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-# pkg-config is only here to satisfy autotools-utils.eclass wrt #432796
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-utils_src_configure
-}
diff --git a/media-libs/gavl/gavl-1.4.0.ebuild b/media-libs/gavl/gavl-1.4.0.ebuild
deleted file mode 100644
index b839782daa1c..000000000000
--- a/media-libs/gavl/gavl-1.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# AC_CONFIG_HEADERS, bug #467736
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	export AT_M4DIR="m4"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-utils_src_configure
-}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 716dc79ed1a3..fc684b470321 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -19,7 +19,7 @@ DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66f
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
 EBUILD gegl-0.2.0-r2.ebuild 4777 BLAKE2B ed7a2d4ee08e7b0b9ca6f657e7cbec1acb5a1269f0eec3cd3cb6861f585c3be38381a3f754e16ab5243b4bc0c05f3db7912dd204b31fe1c9439c7050b1c941c9 SHA512 ab067c5e98dc06f8de2cf6d3f6e4914485c2c9845a7d7840d7d51ddb0f7875bcd40fdf0a0c1331271f70c1326c95839b10ce1167bc9d86c647e31c212fdbfe80
 EBUILD gegl-0.2.0-r5.ebuild 4984 BLAKE2B 46d4f811b53c6db09ca75f93bb07c68cc9094e4e790e6fbdbcad29680c1e39173577b06474dfaefe1abab0b0e14d6bd836adbfb33dbb9f0907b6ef2fc507990b SHA512 da64b73c555f36830d5e6641eef87008d868c566ed5adaed7de3bad519a1d091c189643859b1b30ee025eadb54a1add9847a67839a5006b207bf558e423f2f32
-EBUILD gegl-0.2.0-r6.ebuild 5031 BLAKE2B f2a0afc2e46268561dd0e887c1fb05c56c69488177eaec0420cc4fa68441b1eac6f358dc78bd46d8eb35e69a3e2721ac53088de883586014fcd466b91edcb55e SHA512 a50ac55bcb8cddc08916d61da67174e4d24a927f685a8db87b2ab1f33b7190ea32d2ba52d9f2a263a0c0e055279b0609560626d1350635e86aa2f6a59e3d6272
+EBUILD gegl-0.2.0-r6.ebuild 5030 BLAKE2B 308f3f88459aadb95c729fb1597394f7a1b71734d320adc8cc2cb9eef9e393b0ede43b23c285a8d7ee42bf391f994a498702847c24364fd6b3ae79af9c99ea0c SHA512 7c6594c499cbd000679538693fd3dd846fc2977d8da3a69944d87b45666295189a5523e30af5c9c7d6032b279bb8bb6e7f78453d616b457e3e6d582c80da6e9c
 EBUILD gegl-0.3.0-r1.ebuild 5383 BLAKE2B ed633ea1a6331b918632a11811b248872508891fa40c21cd17d4f0b19f1463d675b5b1b7180acf904ee9f08dfa1420ae881c5c4cc7e7ff7d71e92e1e70e00e98 SHA512 21587a2c02c1d5f96ee346251271f188ea5fe1cd2711e0005c583535cd90e47d4c8ac119c2d95efa6ff5767e1c5e53802c0b25a9e0dd0b8a2124b629305e9c70
 EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfda816b53a29b2a4dbaa67a441d26b27ce9112cc686c11f2b182bde320b46bb0dacb519a365a7083051949d0 SHA512 089ef4ca7d2833248af322062bdc05f3f155fd7cc9aa67c89e0567d0c7b6a08bb2ab2bceb54e8c0bb790f8caab4bd2418f3885f7f7cc288014f05064163eb6af
 EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index 63cc626cb6a9..55248ded85f0 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 07edf5d05bfe..24680e5d95bb 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,6 +1,6 @@
 AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
-EBUILD gexiv2-0.10.10-r1.ebuild 1846 BLAKE2B 373cd362dd1062da5773fde0ed3065a21c21fd74b369f5538afb0b8c572f09c5cd4579fe75d17a1700ed170a4588b22245bfec7c9563c02b7b07c40afa17da09 SHA512 efbb28059e59f23862e0fbda53ac826ff1e36b1d47ec94b59dcc1fe6ef74a4c8d4a948e719741e1b3fac706540f2fc0673edf684c983917f38858032fb77427f
+EBUILD gexiv2-0.10.10-r1.ebuild 1845 BLAKE2B de2fbffcddc6ac6c09171916520accea55068cc52ed43af73908c6cc4feb141fbe26cd187aa6362ba0b246a4d7b00aae9d6448741c4ba351009b84fb205caf64 SHA512 2192b65ee68d7ea41a1b0eb225cf773d05556f6b10df61db5245858da8ef790ef35dfb9e44b1c48b76f8b96cf2f3d125349a43a1537e0bbf0ffc50b5da7410a8
 EBUILD gexiv2-9999.ebuild 1650 BLAKE2B 648e3adfb789c2b410c155e5c5f9392327b017581c98893ed3fcf7a6e7b40c0558ee4417a7937ac98d82132747a492fff9d7d9e6c4bfca934173219a1dfb3b28 SHA512 0a3104e245f5ba7236c91cf6469398b997ad6eecf97caa80a1a8dead8af3cb2216d64ab587e1ee1d3d61b356401476ccc9d4423d534240fa348cb8eb764517fd
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index b82e65a292f3..c9cf2f6ea763 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index fc96f3d3b73f..99038d3b30a2 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,5 +1,5 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
 DIST graphene-1.8.6.tar.xz 127984 BLAKE2B 7f67b99796cca1a47324674b1871ddfbcce1193ded5f0a37c8c2894d52b6b5823b0fb1909018ea6adb90f7ed53ad6b09eeda9b1606a22a8b85cd0d661d500195 SHA512 ef6e9b5587bd540099216a7e3f7c86eb62368d49876dcd380c9767c6740c8267c9d510c5025dbe56402f3cd15084ef8fc634d3abe486b516f4f5328b87df277c
 EBUILD graphene-1.8.2.ebuild 1743 BLAKE2B ee7cf602d60a917cbf63d825e0ce2c82c702f1719f7bc772645a956b1889c133cdd284b397bbbfd9cd4f3521f4e29d47c9a1df626f7c820e7026adfe689a509a SHA512 02c21c16bffaed406bd4cd1d3c0a439ec571d2e9c88981bbfe7c5983a840ac6df3bccb74c42ed7562ea0b00f2cb2efffe7a7b20f8a4f50173f5c4d2cc01d6962
-EBUILD graphene-1.8.6.ebuild 1829 BLAKE2B d32ba8fa47e8f825108e2cb280e77e825b3b2015038d9095ff75b0f909df403714bad136c972185c3c85161cb00863fd4e23aa286ee37417e61017f510fe07ee SHA512 74e305c9d98eb3fb3840c953518bf6b8a3bd4908ea7305e2b3f1b9ce1672ad929189d7b449c0a82569cf24f50165178ac22b6f8eadc39aba6b94ac6d8766938f
+EBUILD graphene-1.8.6.ebuild 1828 BLAKE2B 43eb21a73492c9283eb95e3fa404557cf3d85fd45c92b062be9bbfbf9f302d95856fa781b75ef739cdb91ba32dbe4e9956baabf9b3bdf9a62c634d5d83d1ccf7 SHA512 c7e1f6eba98c3e219168405a6c870f16fa49de51cee6d9c9a1d13d3d0e1577c95963e8ab1308215d594d4a23238a121037579fcbe05fe0849e80e0bfc74e0ea0
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
index a2fbb6880248..97fa539628bf 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 80f4c64d9f2e..04799135bc57 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
 DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
-EBUILD gst-plugins-ugly-1.14.3.ebuild 966 BLAKE2B ad427380760b614297e3d963f0a6c511c237c8b7e833e365e1757736483388483fa498c6efc1788fb323834a4efa7c679e43c15109532509b2eced5faa849fef SHA512 b42cd6f5ad727c85cd962aefb1259109d1825e1070bd4de75a41c009df296cec393f72e1960443d0c0d1ab896e01977477428aa156895248f286ce932d10e8ad
+EBUILD gst-plugins-ugly-1.14.3.ebuild 965 BLAKE2B 053d48a6de2524a7a87aeca9d55ae3da187437e66d142679f300b5799a282869c84df5460a294641a2d0ed2b591b1289e19f6d86eb4bfc40df73172dc57d70b4 SHA512 ee14e14b1e463814dd3e7dde4567e2b6bd7584f5855f6ef38685a966f29147b2900d103397101e95deaf6044090a556da52dd1f0f76feabd01c8f01a15a73a89
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
index 126fbe0aa3f5..18fdf4c9e2ab 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index ca43d9273c34..6e6526222d1f 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,10 @@
 DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
 DIST harfbuzz-2.4.0a.tar.bz2 17919355 BLAKE2B 4df7677966844481b707fe3133f4fddf3c5c41d7de8aca4e87019e88c928d66000e49117c795af69967f7c69532438ef5aa8f41ead276e7d05fdc4dd874daeb1 SHA512 daeaf029bd5d0d0674f930a8d0dcdc4e0b1253b2369c732c7b4fd130ab9438d0d9526967224a583ee58974c3b492874acaccdac13c71b58c950f0b3f031e505c
+DIST harfbuzz-2.5.0.tar.xz 5620416 BLAKE2B 881789f5ada8e0f5aeaecd1673a87540674c6057cdd6cd8af0c7bd1a19a1d999544c7eb492a7e9a0c3fa2b208c34e79e62089b8548bee5800d6b0d5cdd2914bb SHA512 4b02c20b07f367cbc21d69c86c5d1c0fc403b76c40ed7e379796afa289487dfa4f9a5f769a2da794658c983dc947dfe3ed394ac647f67e86863ee4b774815428
+DIST harfbuzz-2.5.1.tar.xz 5636068 BLAKE2B e026bc77fde742cad28c19562c03ada3b51683dc6192afac9af1f96d2a4e5bc6bad515f601500c65391cfe015e737354088126d998fad1866a4b62ad74a79077 SHA512 402a97c37b81c13c420d25504d1983313f555bc1dec5a21d26ff219207bbf6ddedc0d35f8bb31e4a7fee6ed53efd93b008713dca0d42c3ab966c2afd1a2d3660
 EBUILD harfbuzz-2.3.1.ebuild 3023 BLAKE2B b9a3d08627e11d8b78a5b1c293e3fb929d5796527d4986796235e3e4a0f6ce54d90096eb931bbd6bfb943a36fca9db2ac207be4fdabbc355be407b89831bd9e3 SHA512 0774d1f803551979890e15ce733f400aeb1343af66bd5569c4ca23b3d90131ce82afb3ade7e516b3e5cbf36af0c7fafdd9b07a465b20654aab76eeaeaa6c2004
 EBUILD harfbuzz-2.4.0-r1.ebuild 3051 BLAKE2B a8be41e65f6e1bd80e0d84c520681368f7e06eb80a92c8ddd841b2950e9902a62e8f7c8912839307b999d4e110fc9b3d5be9baed9583fe8327a5e589697e1a8f SHA512 687e9f6a6dcfc7ac01fd44c116b215426eb18ae5fcafd60d55ec1b15181d5256e41b4d30d8e289e4de51e0fe0a5484a0851fa6bd970e36047de8a6af0616fe75
-EBUILD harfbuzz-9999.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
+EBUILD harfbuzz-2.5.0.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
+EBUILD harfbuzz-2.5.1.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
+EBUILD harfbuzz-9999.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.5.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.5.0.ebuild
new file mode 100644
index 000000000000..f03429a61fe5
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.5.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-2.5.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.5.1.ebuild
new file mode 100644
index 000000000000..f03429a61fe5
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.5.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 072663ae41e8..f03429a61fe5 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
 	inherit git-r3 autotools
 else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index bd52f5d0df6d..8a89512516d4 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,3 +1,3 @@
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2.ebuild 1527 BLAKE2B f7c7e2c881ac60caae5d52e7b3339b98df4d7749167c1689efe135d3bc0e8bbfcf9f1fb414f5d6730b63cd05f1594f06b11aabc057bf1133e57c3fcc6953df06 SHA512 61524ea29e278104674d42f3891e9886fe0e368ff3f04b8270b92f407f2eb54250ed315497efa23d78c50a9ff0103ec266e37fba2322775d576a2ce3af0f2992
+EBUILD libao-1.2.2.ebuild 1523 BLAKE2B b4411784534a8bc852597f925ffcce6c8ef87f6e2b9374f3728ff77ef9baaa7bf33b0cd50444ed3cf1183172fb908b2591488f8c46b60fc3fa3f40a2fbaef1fb SHA512 ddc314cd6ae3efc80b21c399728c52203cd868ce0aee260ca76a65fdd422f4dee2d65b77c22178a61ef941c0665d19bb29b694aba33f6d45417542cea00c44bd
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
index e6d756ab0e1d..63db88fef4b0 100644
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ b/media-libs/libao/libao-1.2.2.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=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index bfc0618ffa0a..698b67abb3e9 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -3,6 +3,7 @@ AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ed
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-EBUILD libaom-1.0.0-r1.ebuild 2465 BLAKE2B 11322e9cb751c58d10c0690aedbde81f72ee50ca6def9770b94267e36584f06dd8ce2a73a0a60b9b18006661fd8081e96245fe99597a259d8ed1b1b7fe6f3b85 SHA512 631746f10c064e4ef5268dcc63f5b4c988522bbb6a06d89c568e6e742be90ff6291d2034246a48856da5ed10e52227e961695a1748dd2b140afea8af0f8e0e33
+EBUILD libaom-1.0.0-r1.ebuild 2464 BLAKE2B f73d81d653a1913287af544186bad78e33124c6b2c30ff96a4bc4c92a5b5f2decc60411523d129bc50b8a0569dc29d497eb70224fdcc44e75fa7e4382c57deda SHA512 2b4e8e4413cab4534fbaed0781d97c5fa6b36b4969a5aea29bde54b304b74ad9bcb8da1b398a6f82f97bc16b4a1d893821bb9bb1ad237c8f290c627ef46db48d
+EBUILD libaom-1.0.0-r2.ebuild 2562 BLAKE2B eee8f8319e5b38bce5585a3ac6446933a2b5be567846c91a3558356ed854c89040deb02b800f7a821be8b96a4d06f2d85e9f226e4c7ca3fc1e7301250b41a0b0 SHA512 33796b8d29ee4a1a8977429d3ee5eaf37ea059465966e1b2c2975c8d364bdf470881046e6c19fd6608b739dea5db4f91f110750601114fd3ac53d4d5bad3c815
 EBUILD libaom-9999.ebuild 2110 BLAKE2B fc0aabd237735452c5218edccfdfd723808d67877025d20e344fc13e567f8705bd48a97316d641b056578a4d70fca8ece459a3fad684febca2198f27f8644d9b SHA512 401a82d1cc0ec2ca9086edb0203d3e9c39dc995241bccbc546b322bb0ad6da8af2a01101d7ceed32b381b3ad175bc7bc616f3fbec17c28eb1cda99d2fb7cde2e
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-1.0.0-r1.ebuild b/media-libs/libaom/libaom-1.0.0-r1.ebuild
index 0746269412af..3dd2b5c6462e 100644
--- a/media-libs/libaom/libaom-1.0.0-r1.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..cb5ffad0646e
--- /dev/null
+++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	if [[ ${PV} == *pre* ]]; then
+		SRC_URI="mirror://gentoo/${P}.tar.xz"
+		S="${WORKDIR}/${PN}"
+	else
+		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="mirror://gentoo/${P}.tar.gz"
+		S="${WORKDIR}"
+	fi
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/0"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+PATCHES=(
+	"${FILESDIR}/libdirpc2.patch"
+	"${FILESDIR}/pthread_lib2.patch"
+	"${FILESDIR}/${P}-version.patch"
+	"${FILESDIR}/${P}-armv7l.patch"
+)
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+src_prepare() {
+	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+	rm aom.pc # ensure it is rebuilt with proper libdir
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc docs/html/*
+	fi
+}
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index b44c86f8c2cf..6b528e5e2e34 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
 AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
 AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
 DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2485 BLAKE2B f1d553d7a9f4c8d9b71399fa0712c06dc6b30912671cda86e99c3ed22e19a33dd96bd137f2c4fd6adc35092d36934e3b73151c8cc8525cb5f9c5e87e17249c4d SHA512 b9a9a36d53c06fbf74fd16e10919f1295401ffb5a7141dc595d93cba2cf441713d15259f1c461134c8f4018ae3931d671a16771b41afd27906d08b91cb3eddf0
+EBUILD libcanberra-0.30-r5.ebuild 2481 BLAKE2B ff884faf9f1ce293710b3de4a974df4a08d41edb769ac609dfa4fe5f1b90adbeeb81adc040aac6a62fe8382f93a16dbef06721ad105066319526c5d09e5891d1 SHA512 1236bc9d589dbec9ff8b4fa4f5f8f7fa30cd3806e0e4f36c6ab18855c9a60b2736d3dd7338484189269854e2f48f72481cec06160e95323cae44981e68710d81
 MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 029a2b7200da..514e1435191e 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="
diff --git a/media-libs/libcue/Manifest b/media-libs/libcue/Manifest
index b0a2c530dc8f..95d33830844d 100644
--- a/media-libs/libcue/Manifest
+++ b/media-libs/libcue/Manifest
@@ -1,3 +1,3 @@
 DIST libcue-1.4.0.tar.bz2 249426 BLAKE2B 5f26182abade1861fd2c8d9d05a9a9a4a97fc3d408a17b7b0ae6f2bf1828a1223cec7cfabd25778fad58c849481aee979c11d70925978ebf796e0b3598fffeeb SHA512 1efbe4ff2d7bf1716547c9377a8eefefd5392ce9fa62ee07bc948fc5b8832cefeecebf655a40e49eefe4ec857978dfee5a66a0439e36e4440e0ec472e2226ddb
-EBUILD libcue-1.4.0.ebuild 599 BLAKE2B c61779dbb376e3e482e705c0ff3097ee5ebaccea069df475fdc875e68bb0265a914dd5dc4287cb9a156068df4c96b3c10dc73fdb6cd02edc2b4ca0bf95089c08 SHA512 de82bea6a31b94b70a07f3dda133b41d83f738568649c5ae5447c9d4858b6fca484dd8c7e13cba45a7f9e4e34fa41c99d1f06fea73ee2fbb9d261642a5c08c37
+EBUILD libcue-1.4.0.ebuild 595 BLAKE2B 6c6939506c31fd64d83624592ab61d9ec64b2d1a58c57cb6850d2f7565efc28748df9f6e1f55e2831a4792aafa0602dbe7f81bfa879fbe52ef6fd172dad3121f SHA512 316e77edcaae1ba67167f71ab3a6fdbf3a748509c1cbf3b7a4fbbed28c79860b0eb0df71ebc1eae6ff3e993127c686b1134e96dc52afc6d769af5c9ed7e5eca3
 MISC metadata.xml 329 BLAKE2B 3f8c73c503bd519120a5f95a20a1f148643b474b7d3ef590a0581a30e30b6ee47e9e7f9e67c9b21e764b47cf43332d3276f5224e6ef9c20c072b915f2389548e SHA512 6fdc6b7927ab5fc199cfa02255b07209d59ec5992da77c0bc2782e909c6033a2d23895753f33da557e7f3769eedba116d6c7cbfbae6ec5819ac313a6f0de68ee
diff --git a/media-libs/libcue/libcue-1.4.0.ebuild b/media-libs/libcue/libcue-1.4.0.ebuild
index 0c80188e0d62..45e7b06937de 100644
--- a/media-libs/libcue/libcue-1.4.0.ebuild
+++ b/media-libs/libcue/libcue-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 976318f99557..165712106ba7 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,5 +1,5 @@
 AUX libdc1394-2.2.1-pthread.patch 332 BLAKE2B e43035a9b9f9f7dc42806ee5fac9b1c7c7edcef700a82e845fe72e55f09de31904d61795afdbe50a8e8e1638ac2da0efaee5658a0301b183bfe06dea0a5f46f8 SHA512 ae0c6c4ad19da0b06ebae86e2602dcf80997ccea5cc45c18f71b5c55ac668310989d87e99075a1020cc58fe5d9f8bae71435aecae21e786b4c7436628fba808e
 DIST libdc1394-2.2.5.tar.gz 611918 BLAKE2B 64a5e156bfcef1f7a0ab2ec9be6cab65cf47bdc79ec3387d183778287ea1f72234325f7df5b67745289d68aea0105f24d7c55a4f13e913a60d43e3d74fcd4979 SHA512 4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c
 DIST sdl.m4-20140620.tar.xz 2420 BLAKE2B 2057bd14817809fc4ce8188971e846d70deda495c25dc3e1e87499f61b67373870c4b3f171edd9e5cf20e29c5d4c1eb11858001c67658e06715be3550668a61d SHA512 d8844d0967809241b642e0b6aaf45f2a5e94567d239d338aee45aaeb0e38765bcae419660562b7064d91afec63cc6ade0878fc7d6f36c61c083d136098a9af55
-EBUILD libdc1394-2.2.5-r1.ebuild 1383 BLAKE2B 351fda021ff1424217d978ee74ef195f4c8c084b930f2fb59ff62e4dbedfda1590f79bafaecbf89d52e15bdb10cf1c48b1545f75f89a08cf9b7295273fce499e SHA512 357627854dada364f47726c2edba2cecc83bb47cca22d433804edd08a1492a5ff93a3553c742ddb8e6ceb978a6e2e8ee4625b4ae1b7560509b728009d93bc626
+EBUILD libdc1394-2.2.5-r1.ebuild 1379 BLAKE2B 9897407da35f4592fdeb7fd8e8ae8730d46e6bfcd923cc92985dbd9251babcfe26d7495292f5c99bed7dc1442c12b0e3b396337a2f9febeb879a486cc7bb32be SHA512 4cecd5e6e7e86e347dd888beb94985efb0ae84fe24493219d3ff03bfee8ec4e6cec749b0006d1ab856151a6b7aa9c058e8c64793a78243ff7e46eaa0096d11aa
 MISC metadata.xml 310 BLAKE2B e433df9a1c48848c371f278ef408de74d5a78896a17a511cd1dd7cdf35e77a87070178f22ad55f70a200088f8f2186d970b1c5cea7eed8ca66b8bad58549667b SHA512 2fbb994fc42ad1c7e1da90b5525ddc1ee1b1abeefeed6496b3aea4df79d556e7032291c782c022ab855216ecdf1539e624f951766f19e33564fd80646bec25b1
diff --git a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
index 760d658cc4ad..e2e4faec021d 100644
--- a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.5-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=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 84f9bc36f500..72924bb2285e 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -2,5 +2,5 @@ AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac0
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
 DIST libdca-0.0.5-constant.patch.bz2 3424 BLAKE2B 048d7afd856090b5f9d0db1d5894b78d037fa1c03086271342527a1bf04f41ed379b38fe6d72eb9bbf74a864c67710b5f9abe53177cdb2f4f53a8e7502d77c44 SHA512 37bd56b8c240f16a6ee86b04d44571345278f8b9dd395cbc307e9fb7e6c001487411d1b4775af19dc97f18fcaed63be97fafeb4fe504f0a76b87022ec792d23e
 DIST libdca-0.0.5.tar.bz2 393291 BLAKE2B 093e941e8cd25ca52ae43ab16607f8ff3c5ebb95ffc4b29c3cb771b6bf9ba45da4cc8ebd83cd91ccd66b0dd981c32a6c77cb3e90f46093b64b9a483dd854ffb6 SHA512 d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
-EBUILD libdca-0.0.5-r3.ebuild 1508 BLAKE2B 4fb0529cfa895ca1f77a230c795a7fdeedda638aead83aaec1be5ea6c58bdd05c4ce820bf3c16f25b281bfd940655f67abd29287de6db73a5569082abc2f0d0c SHA512 2b07259aaf7252f8f2b81ec285015ac375c7e21d9f5bf1c1886b9ddd302b3c26adbe608f6dea7ca0229e2f6365cfd480e4b4cb86f78563c6ab6c4cd741c3f30b
+EBUILD libdca-0.0.5-r3.ebuild 1504 BLAKE2B 803a0831fa470196a9195e4b75cee1a37fd37742e1f50f22c68c4a98fdbfd0e49dc81a129dbb7553925d99976d03ca278004b21c54ca16d2c3df19a815061d2a SHA512 dd402a25fbbc502b6dad9884576b62ee74dc5286f0596b2e27fa953112d1f5c03de5ac164c351a41dd0385588b536e3c42d16e815be37eabb4cdffd177c93761
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 6b12d373c533..faee1c7a6532 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss static-libs"
 
 RDEPEND="!media-libs/libdts"
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index 515fcf216734..a906f3eec4ad 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,5 +1,5 @@
 DIST libdmtx-0.7.4.tar.gz 370999 BLAKE2B 7c87d1b1ca8a1466aed6dbd8b60b31c1acacbff46d99855a2366c89a0998acbc8e0b3d3e70612d6bfc736b48e2001d8de14b9169920e802490623009f3395ea9 SHA512 307aeb30506e60fc44550d1bb86081634f0718d53e7b878b45b0e704e75c5996e27285a16881b7c3a93cafa9a9b125175dadc0f0c2c2f976878666eb652108ae
 DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
-EBUILD libdmtx-0.7.4.ebuild 559 BLAKE2B 2bf658670fbe81aa3d73265f684582be428ad3cf3e4454787cf48ce5e05d5417440f934562fcf3e1467dd7a5aaf6eacdadb9c60bd07bfc3798902df2c88bad31 SHA512 c9dec7100a4fffc636cde5fb6b99f7a9e5a4cee565d2ac52685db6df4c5b128adadefda51aeef494449e71f4a06dd48033905cff1c773e6d1eb9c0229f37127e
+EBUILD libdmtx-0.7.4.ebuild 555 BLAKE2B 26f24731d334beda4d62b34c48b790d91e5c1137444cde0cdac388d9ca786ab71c6509b7b33182525e3f5ed42f4a07574ad709849d26b97004e03a09e7e0d94a SHA512 57f59f9cdbd5ced50c3dd0a2e0470422ca00b92e36444bac240546d76e357449399ea273586b3b619359cacf577e6192f7dbe52354608de61a87f7b1172fc968
 EBUILD libdmtx-0.7.5.ebuild 667 BLAKE2B 0016a960c64cb003682ad790ad8319f9bf0f8ed7bec7e7c09f083db71b80b5b040c5630f3a0d3f76b60245a6ef2741a72ac9c03c2bde6b3e743de1686fb41fd5 SHA512 aa74bfdc89d850c9781b7425f071921b59475e558d36a434011ebd53b4d7a681d59c10e87bcbe66b413cbee7bfb39a0396c633df6a81a947a3e16f5e8a44f394
 MISC metadata.xml 378 BLAKE2B 9dcdc2a67e0836e73a48174390263c6344f329beb3682a92ffc52a11856b87ce5a4338803ee67f07f9d2337b4292433727c3edca55b155ebd93200351231113a SHA512 f4374bbe8333e1e1700cedd7482667159e5c2e31d8b0f6e52074c9261a11327ca9eab2c857f768cdccd287728b3ab3f52628733e4d91725230fedd985d376a7d
diff --git a/media-libs/libdmtx/libdmtx-0.7.4.ebuild b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
index ebeeb12a21d5..860a328be6d6 100644
--- a/media-libs/libdmtx/libdmtx-0.7.4.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 8ec7ed39afb8..f18a5b9bc939 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,5 +1,5 @@
 DIST libdvbpsi-1.3.1.tar.bz2 479964 BLAKE2B a29522d39544d90b34915e2ca9fc9ca455a556097c63639d7604679275b57378822adfb4c022478884c897cdde2c0e5f84355fdecf35fd6bb305d1fc275eed8b SHA512 015d586d1ef1fd35fc4b6a5b79d1ce4570e07070840d7070938c38be64853fb987172ad225f000156166559709061de6f901237bfc0f7f26f219b5950b57c27a
 DIST libdvbpsi-1.3.2.tar.bz2 487807 BLAKE2B ea8d1e121e47d2257d8537beac792e3a420ac957dbf3ec6d89f0c4d063e249616bbc8f3e14ed37769b676ed18d5d4c3c6a33e2a706217854eb2ded91e7c503db SHA512 cb59c2e66a214cad7bb96aa1f80a178399fcd80da9fc05b22c72763f2cd818bfab3724d36eee4c6467fb8bc8bae18b1d8afec64c02e8e47cd7a6e887f0230309
 EBUILD libdvbpsi-1.3.1.ebuild 961 BLAKE2B 6fbc4e59378ee2267ceb69f740cabf84e3a2c4ce6775a93db3a890c1ecfb9219ceed8383e24323a3f9b306d2623b4266e6fde41190ba46e9eb0b5f7f779c7145 SHA512 04b0ef6a8239d868a357964bb97a54f188fd27f767ed52b0d14e6eb9932f286c1e1a2fbe134ab663461a9436afcebc781934ea0279cf4dacd2df11e0a6a16bed
-EBUILD libdvbpsi-1.3.2.ebuild 958 BLAKE2B e9aa40ca6254ceab463572766eb7f83884bd75c72f4265042d69be540856b31683c52e0a6d994055a6befa26d26d56d5818e6858e2049582b7b463c2c9456e73 SHA512 e00ca677560636b09697575c80003aa3dee8957f373720ab0694fad5926e982d3d9ad72a4650b9405339c83f3815177a07c82589b60a443d57ecf2cc2e7ca567
+EBUILD libdvbpsi-1.3.2.ebuild 957 BLAKE2B 80145c8e053eabad5260a499cbd52f83f9696a36f25c6d7418e80b6266692b969e295878af00ddd615a413aac7b04949c41ef53dc57dd8b8960c1584a4c13be2 SHA512 dbd369691f87cefad14f8ed3d6c4698592ae69b27a92a777f4bfe76bea410de0fd654343a9e96806cf4d5675fb3d2e6bdf4a347c9006f04771ef75c5892bb239
 MISC metadata.xml 212 BLAKE2B f25483a51eb36c195e77aee58c9f94951dbbd719edb1d088524ef3db4f2d8ffc628b6c0c01efb9d5f3083a81e6cd0edeba56af12a9dc643bc3facbf16e89c0b7 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
index c740210527f0..067915a1756f 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 078ec667770e..310408e7e601 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -3,5 +3,5 @@ AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e87
 AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
 AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r3.ebuild 1365 BLAKE2B f423574c76bdcbd9c9f8eb5e7716371280dc3422c2ccc60bc8aff7d74c1f4e524c763b64b04048310650b75bbd3a669ff24b6528943942a24c99dcdaff8e38e6 SHA512 328ef707b3f1d555e071edab2168b351f7ac3b4713dda375d9bb471a6b74224b2edc4bdff632e7f31d6e715679dbc62f40fe3662132586bf162266dd7540e919
+EBUILD libexif-0.6.21-r3.ebuild 1364 BLAKE2B 05d4956de3c4d901780846ec77f11eee72424238e6f26d1a76152e8685db882e7312fcca3bf64f87a810cfc75f2a338c6bd41a19b48c4ff5d0bd6b7f1b7490af SHA512 2a921f46af9fd82ac4669b80c1346a36e2ec5564f2fc33c3022b909a219d6c9e05a47e801c056df291f8097212833c0a783b2becd434847c84ce00646271b428
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index 77ed7b4ce609..4c5b6bc9155b 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 055401eeb604..7f5c332837d5 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -3,5 +3,5 @@ DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f65562
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 EBUILD libgphoto2-2.5.16.ebuild 6230 BLAKE2B 14a4b1f316a0f4ba439c42a729cd5fc763662f4c78199edff7765ed5bf70e36e2234f07f7fca9e7a4f42a0d888317449b2342e7eb50412e26048f08cebfb5f4c SHA512 91baa693f5cecc6d54f3d1cf55d703fcfb62bb11b266f49c99e615fb924e20ff70ad736ffca98b67677f2e340b3fb9b55dc4e6215ca41237182b56c5702bc00f
 EBUILD libgphoto2-2.5.20.ebuild 6232 BLAKE2B 3617e5aaababfd54a469f77eb01508fe7341d25e013df88ea76c3775410d615702debc961bffebe69bf885bace54a01b979d1c0a3a0f5e54163af07dc25e1fcd SHA512 4e1d7c288187641e8201f6370134b6e8b379e2e02f56fd713af3477781d6b2df1dc6b6796ea30e24457f9f8919926f308f025236f2d7572becc12f48148bf056
-EBUILD libgphoto2-2.5.22.ebuild 6237 BLAKE2B 193a9cd4d99423bceced587ad2bb0bed7f20ddc643fa06fe0666399434b0fbdc7b4bb19dc814ee84e8419deb9ed45c0c4fa82708c9fcd7566ec384e2d750c927 SHA512 e2844be117f14e8ea5ff815b38d8d2ec95739a94c5bba16de85f16ddd6e277d1431cb1eb5a07b244b33b4362ace3a5e1ef2fddbde450773f6517b1dee9f6c360
+EBUILD libgphoto2-2.5.22.ebuild 6236 BLAKE2B 282f564e6172a9d5af1a3a5fcf3f282bb9e1a3bdafeebd081d5580a1b52c47a3665dec84109a8bfe57bf201418e62ff3e616dc457cb4a0f2cb022cc6b8ea6af1 SHA512 2f4b313cbc7067c74e04308691e92c9366106bba603eafcfa501ea15208c6fb931f08d2f8e6b5375fa7bb6870e756669dd05f3f4cdde1d75d58cc75c4b04854c
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index 4ccf9b401da9..b962ce107c2c 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest
index 818ba56b56a8..ef8c09e802b4 100644
--- a/media-libs/libiptcdata/Manifest
+++ b/media-libs/libiptcdata/Manifest
@@ -1,3 +1,3 @@
 DIST libiptcdata-1.0.4.tar.gz 569132 BLAKE2B acfac5b4f5945f38da47a5280b92939089f2efa8e4ceae9ad00d9d21c7f062445f63c74d61493e711102789edb8c98ffe49083635f67e836a87c32e1127371e5 SHA512 8656b2febaec133d1a8783252047672bebd58ae9ceab5477c4acfa35bcc381dfda08b655a957b962878af28c69deff77d920e780c84b4debdff2f980b3de94e8
-EBUILD libiptcdata-1.0.4-r1.ebuild 1244 BLAKE2B cdf5907a78f9819e7820884a8c103206485f2a17514c51be071f188cc6996aa887d88f23afbd03eae2e605c91314a598fc5b22e655f560f5e79044fe23fd1862 SHA512 9c89c917306faa0de7ee545bae71c8d1e54a744b6d1bb5d92dbcee51df5f5943adb38f6d6d0ec5c5342320ad21c65b7f6540c58f50976578168332508f3031f7
+EBUILD libiptcdata-1.0.4-r1.ebuild 1240 BLAKE2B d4c4a6e3eb9830b266054d2bc962bf6634b0baebdb164c698a62881a64ad73d84d21c529b7896c063a139f034d89d5fe875f870cdd37f72800972690bb1256c7 SHA512 eded54a7f1ba346962290ed6dd384a6f7050cec292a3b7ea1a95353c1fdfdfa81bced8e2b7d7624f2c40f6dac074606a7860d2124accf0233a059d4bf3e54c34
 MISC metadata.xml 975 BLAKE2B 307530f831f91c4ce735b1bc48e836a351ed7b2fcbb7ceb3fdf6d3527f70ded81bae639b2701bd6da54011842964af56b3a7890a0b240052bb81a0273261a103 SHA512 f72b79828ccfd7df1c7a9bbcd961dc73e57ece831ea97291efa52a484b97eb4fe1f7257aadc6a3bb70c7f9f36776b8ca296bedc43b5df86b17f6902a1ec33572
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
index 5169a9e48f51..575825e620b6 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="doc examples nls python"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index ce6b997a906b..274b14211c5c 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,3 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r3.ebuild 1310 BLAKE2B fb48bc9f30ac6e9e4dcc846b8c7c41182372b2a5b0708c9e6d35dd0d12bb9f89990ec68090ee0efc582420c72208dafe976139b09bdee0afd1f7d2a8962569e5 SHA512 de2b8cfebd28adc1a694625556efc7d9eab191ad663639c7a11c8567f78381785eef1ea4f8d76b17c48682c6eb7b75affeafa7ea041d9f6e3d78bd150b7baa35
+EBUILD libkate-0.4.1-r3.ebuild 1306 BLAKE2B 78f34a4556924ed6335f47611209fafdd842032674886f8a548f0007877ca079ffb81615c2b18ef231bd2b16c9c77ad435b9bfd344e70bfad9f0c304e94a762f SHA512 d9ad9ab1320e54d0bb388c5a2db1830c70083bfd01ad9576f097de7155e483d791a9c2a4a1bf8e50bf527a6f9f0f5a3f18123cc982e86304ece43851fe4f7812
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild
index 72196cff5575..accaa364ea7e 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r3.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index 881bf09ef7eb..3ad697578bee 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -4,5 +4,5 @@ AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8f
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
 AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-EBUILD libmad-0.15.1b-r9.ebuild 2210 BLAKE2B 771ebe8a78e51729afd376c481e28f438e64d61b36ad45e260467cc106932610d1bb5ea6c485b330d7d5dc41be42eb27b7b73b888bce71973d6c7f978c8e417d SHA512 fba1226071d1c333970a14d4983d6d4b202839cc8bd8035fb672d201c6e5dc2c8a5308e4c96bea68bdc68b5cbc0bc7394fd0f0308c452aefce67e20cab3dec9d
+EBUILD libmad-0.15.1b-r9.ebuild 2209 BLAKE2B d6ad47c53af33d47cc8e581d8b5f90db6c359989ac14a6bd69e2877759d75c1765c6066d60eeaf66dcc2e486200be820c472c326ee9f27b2cd243a55e423a36f SHA512 18f6535ab32073bd313f64f71c31dbba60bc24db636a9d3cad1c227a93da181c3eb952e8b5fffd577ae738d94a209ea0a17f3619ec7b33ea82bd78278f8df8f2
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 55105d3364b5..0cbe0cd6f483 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 785480e57aa1..938016d4548a 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -6,6 +6,6 @@ DIST libmatroska-1.5.0.tar.xz 64596 BLAKE2B a14f3f1aef87e2bc05989d3166b562edf852
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
 EBUILD libmatroska-1.4.8.ebuild 701 BLAKE2B 8db0db6e5a931f685f76fe67e9dba35ecdf54eaad1f4b4e496e2df77a8d3f468ec2ace53b7b906047cc3cb716f5919f0b37001a640233a7f853d8241a0857efa SHA512 a7a35513c071dd2f660f77dc3f2c062e183d062b913bd6d305b178ab1f9f87dd82bd6e3d0ca0a366b4133c322025f8b025bf211ef8e955770ce41a609d34d1f3
-EBUILD libmatroska-1.4.9.ebuild 662 BLAKE2B 5a45158f814b9c4905081001c3e5a8c8e277eb144fc57432a8ed849964daee316e671692ca3530f7bf96833563a698014bbe0adb0b22df3081b70d1886115e6b SHA512 ade6d326be44913d8be1b3c514e23c738a50c680794205e41c21a7be95f5e2f19f9f6d7c3ba4c9fdb0ebde3abc21eeb7244cc23bd18ab05aa2cf239bdafd3557
+EBUILD libmatroska-1.4.9.ebuild 661 BLAKE2B ae2a926e737b0cc32a9c8c0976e2d66c6a9c58eb0ed4ed23d970c626408736cc757944aade2ac03b3182d745f2ead53e67e12995f1aae82087a2a9b4ef47b7c4 SHA512 be7d2508b8ef0ce98f23330b7192a64cbd50ca62d26c4fc8e4865e76a048d2f08e2aeb1af4b056f066a8b58bb02da6fbfd3275155e17f401fc23fbcc1b15a2b6
 EBUILD libmatroska-1.5.0.ebuild 670 BLAKE2B e78268605d9dbe15a367f23354efb9e284b3fefc092892c4de2956edb3ba158b12340894f4a375351aaab639a09999a54dfdc76ebcf653668e0bbd9eab6545fe SHA512 1138fb82839cbcee9a9b0438d937ff047012e88151615cfa5027b1f12adb4d4a76cea3b41cad591ed1c247479a5c269d93fbacb9bd5638a5036b771d6ac0cb5d
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.9.ebuild b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
index bcc4d226d0ff..830cbf92352b 100644
--- a/media-libs/libmatroska/libmatroska-1.4.9.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.6:="
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 6391386a2dbf..c71d70e1e985 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,9 +1,3 @@
-DIST libmikmod-3.3.10.tar.gz 1237413 BLAKE2B 25036cada7e9152a95151483da1b030ba2d02199b52d9f550eb312cd6ec69621fbc5ae7973ddfbe9a22bd683e1f184b2d1c474c3d840a274d8c9e6992a627e07 SHA512 89a71f859bb2dbd20db2b8e1c381df61639302b5e10b85d64fa329fcad5aec603992f11d24c4498c442090f1dded7c8f14271cbaf1acc1b7e719be9cff60b3fe
 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de
-DIST libmikmod-3.3.11.tar.gz 1240329 BLAKE2B 7f5ceb26cae2e7e53ba5e07bd6e8f29384d9b62863b3c62e147efb1581a62d104d5abefc12eae12d97d55d672436d613679cdaef81365d34af14f240e48bd680 SHA512 61866fee68d91ff967ac2bad041e70034abbb4c095bba0475ed02cb81a467621a41a0685957cd9b5c19ec5218885ad42dc655443d67e01aa2623d91c0496dd63
-DIST libmikmod-3.3.8.tar.gz 1254702 BLAKE2B 4131dffd201061d6573cf46d78b569bbfa0e828261914bad2c278986b64aa4b9de3525e28b64eda4cebbce12a5ec512ed525b9c18e20b51166e40653f64b4e71 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15
-EBUILD libmikmod-3.3.10.ebuild 2047 BLAKE2B 94b45940812e21e9784217bf46d75b3f5997e0c7776238a8587af37fd50696cd268c081cb1525973e526302416d22eb1e586c3cc1224ec5f7a7f2de1f33c850e SHA512 36369710a60751bfa25646e83e8370b5a9d1a1972fc80714b374bb7a26ffc7fb1b2112a2f5dc86ff078e782bba8d3f2045cfccb6b663ee3855b4fe80995cb5a7
-EBUILD libmikmod-3.3.11.1.ebuild 2154 BLAKE2B a6847649cee4fc8ebdb11a59254a1db735f4b2dfc90617954feef14eba2f01fabd0022493c88b62147c4ea7952b87a8ad1e52dcec475b743d1b015cab6aa8099 SHA512 a4bd54f9b2098a906498b6d1b90566c96d977f3884897af8a71257cd6a7b050436acd6b499dcce4b6c9176f8f54bd3325d8b80985b841516d037565c161a9e1a
-EBUILD libmikmod-3.3.11.ebuild 2158 BLAKE2B f746c9fbaf02bf7fdcbb23fc9ea76a1df5f5322784ed9c88bd3104cb07d129ce96ff3c9af26b46cf005aaaae35e436a851da5898da7c9bd23127ad4e49ca5a77 SHA512 749ed3eb424efbc6517bb3825f52d97048f8a48f194df3b668244521d1ac5647d72fa1b8ca08aecbb9941b7200c5fbee4dbd2e3bb71275e63ad5b1c2bbe9f46d
-EBUILD libmikmod-3.3.8.ebuild 2025 BLAKE2B 17652c792f297c2df7796a0701a90695cc66849a7ac4426ed3cc41657249c98d5c7b83732ac5a3d199f2ff7a5f47831db153fdeda8093408d5d96d9319c65afb SHA512 fb49e02feb167be764d6c0e0a92a5d9d847a0d7f0e1a639f28e0245bf2a8e569d2e03850b7b6f878252f5b0ebf4e3d4598c8bf6dccad73b7beef1a744652413d
+EBUILD libmikmod-3.3.11.1.ebuild 2153 BLAKE2B 87bc7ff96df31c3ee2ed272cbbc676e74034557540e0cbf124d98fd3255ed20f5ebd9eaedf99194d20684609752e7e2e49b19fa2f598d309ca5859c06ad4a2bf SHA512 2dde178747d840f2b2e9c2d82bd79e3d5516854522e90c49e6a277cf7a9884dd536394fa262a4b1ad6545678e5f1062c33db23afa5ba4719cd49f61e2ad2492e
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-libs/libmikmod/libmikmod-3.3.10.ebuild b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
deleted file mode 100644
index 232cef07afbb..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libmikmod-config
-)
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use amd64-linux || use x86-linux || use x86-macos || use x64-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	docinto html
-	dodoc docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 39fad3035014..51735588106b 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/libmikmod/libmikmod-3.3.11.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.ebuild
deleted file mode 100644
index 1e5e9284220d..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.11.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libmikmod-config
-)
-
-src_prepare() {
-	# USE=debug enables Werror, bug #621688
-	sed -i -e 's/-Werror//' configure || die
-	default
-}
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use amd64-linux || use x86-linux || use x86-macos || use x64-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	docinto html
-	dodoc docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.8.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
deleted file mode 100644
index 59cf8cf14b14..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-	!${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libmikmod-config
-)
-
-multilib_src_configure() {
-	local mysimd="--disable-simd"
-	if use ppc || use ppc64 || use ppc-macos; then
-		mysimd="$(use_enable altivec simd)"
-	fi
-	if use amd64 || use x86 || use x86-fbsd || use amd64-linux || use x86-linux || use x86-macos || use x64-macos; then
-		mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
-	fi
-
-	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable alsa) \
-		$(use_enable nas) \
-		$(use_enable pulseaudio) \
-		--disable-sdl \
-		--disable-sdl2 \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable coreaudio osx) \
-		$(use_enable debug) \
-		$(use_enable threads) \
-		$(use_enable static-libs static) \
-		--disable-dl \
-		${mysimd}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-	prune_libtool_files
-}
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index b3201e2de370..58c0784ae992 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,4 +1,4 @@
 AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
-EBUILD libmng-2.0.3.ebuild 1171 BLAKE2B 2c698f9b5f7b0e7d08a0fe0fa91b0d4036972eb66818f752b0d5b0cdada6bc727d1e6b3972f130f25113d744664c3e0ac53095e215d8e09f9c0e39fcdae36f31 SHA512 4b5bbe4ffb5163e8ae03884f770302dac29d69d47b6b424c670832cc18f8797e8c33e50360adb6704cc9af4b57e6b243d5a176517e76357a56b1b902d2edb187
+EBUILD libmng-2.0.3.ebuild 1170 BLAKE2B a45699461cc634933191ea2aa1f1bc2ecce7c56fc98ed62a8a70ed4209d1fda71beaa2ef28b11d93fb6255ebc1579b4e530065ea402e8d65c4de8f6761a25738 SHA512 759ef1d46f734efb332d4ca12b87b498f551415d51549a7107fad491a41b9e4ce4421f7f2ae6a57d6773e759d91e78c1e86e376096d42cf9b55a87e0233d7d1b
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 1194f2098055..5d30d4adf54d 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 2e3a9f14232f..a6d475e7f9a3 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,5 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1498 BLAKE2B 4653b884c8ff713d9f0668da4ba9adf98b619fa2ec5b9230abb5637c2bb5d3083e0d0e6ea336e7b91a25c2d6c39c51eab7753a65db13d0f732937033dcc8115f SHA512 246df2fc5c129fdfcb7967412ae282ec798b63861a26a64dda5d6285e2972033813f85ab323e39ec0330b38900dedb59104b5e3fecda8c061f83da664cfe741b
+EBUILD libmpeg2-0.5.1-r2.ebuild 1494 BLAKE2B 3f841df84a9883be9b40931612d11e2d797dd99debfbee40cc9b006de7d591d213a76f0e55e742b2bfb7bd65f1f0ec34db28bcf07cf52efa9879197a5dba4cf6 SHA512 e9c7206c92b242945e3c2137cb7d8a7be4b0a0b5361f6c63e370151011f3168e39f2d2d0ef833c1241fff2ddd7b36de2690f5f265965095f8077e10a104e96bc
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index a894b9e8eea8..1595b7ed9cfe 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
diff --git a/media-libs/liboggz/Manifest b/media-libs/liboggz/Manifest
index d2cbb481ee49..ce1bbe087908 100644
--- a/media-libs/liboggz/Manifest
+++ b/media-libs/liboggz/Manifest
@@ -1,4 +1,4 @@
 AUX liboggz-1.1.1-destdir.patch 550 BLAKE2B a8823cc2159aa869fb1f6888be83819407bcc9832cda8ed0b43d5b3292914ef1e9fbf2737814904650423df8e60f7e0b2892a5862494b8a9c9b6d63e64e280ae SHA512 e988d3eae103874b905929f749687eba6e539b06ba4d4a4963e6030ede04cb86af6a9dcf84bf7456a25d267fb02a3b55ccd20bb907c3cb7e5e19049f05a78fdf
 DIST liboggz-1.1.1.tar.gz 702261 BLAKE2B 0631d1c30a045c67b38b9de107a97dc8963890a867262b01271adfb4483c77f8d14e203dffd057194b19b4e6cc28169a3a085fbb79d683a48ee091316cca8a4f SHA512 8f5fc8ca49cb6f7a1160a9c1932876b771d55985d59ddc1f48497dfc08641414a58244d7a7e52bfcecdb69f52913d0123efd8f92513f8b9064e4abe1442f2cba
-EBUILD liboggz-1.1.1.ebuild 946 BLAKE2B 52fa60f73699b044080f0d2d3a4d7aff7e7de215e8d759d52356614053fa58db30c8b0962840423a0fe6f6c34f2af35c62f1460158f7b0ff67fa36e0636e32a1 SHA512 1cd0bf158a4c19f2753a14f41054f455db961010d6ea401cb6b5097895bd80ee66fe912273271bade3169214b3a3c0624c7d6062032041c044f6f020e257690c
+EBUILD liboggz-1.1.1.ebuild 942 BLAKE2B 26163a6c849bd393d9f9eb8f072a56410fc8b033ca3d61ec6dfed4897375987372dbe4e26fb59a3733baf908f863bf9b26759942877ba07205c15f460ff29203 SHA512 2aa07ffc79bca53748d83e5df1bd4ea7f379d90fa552286d9540f34208ae222ef6a335b49b416702cb8c705dc299d06ef82469fade38dad4960bb4dc3ca708bb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild
index 3c249eda6279..2e299bd0605c 100644
--- a/media-libs/liboggz/liboggz-1.1.1.ebuild
+++ b/media-libs/liboggz/liboggz-1.1.1.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=media-libs/libogg-1.2.0"
diff --git a/media-libs/libpostproc/Manifest b/media-libs/libpostproc/Manifest
index f33744edb61b..8b2b6ef85ac0 100644
--- a/media-libs/libpostproc/Manifest
+++ b/media-libs/libpostproc/Manifest
@@ -2,7 +2,7 @@ AUX libpostproc-10.20140517-support-MMXEXT.patch 976 BLAKE2B 529f8770ea4424506d1
 DIST libpostproc-0.8.0.20121125.tar.xz 65376 BLAKE2B 7745fc0d495a3a6ea45f4e0b012f343d8db0838f7b26f778a646011e3ef01cdc8b7b37b1148b3ea4d838b3a51decb912a6b4328559929f6d38ab01ef8453f990 SHA512 7f1451dbe822d143793c12bb7c18fd9eeb98b5347bbfc54172f0aceb2f18cf31b2c0c888c33a9ce2e9f519b4bbb0a900b729188ce83cda9ad5499a8f6ea2d62a
 DIST libpostproc-10.20140517.tar.xz 65556 BLAKE2B 374dc84fb52f32958bcf9daeaabf2be1405d444f72d1f1ccb22e42b657489adad55199e5be27fa80cdcc21ed4480bae901925fbd833bcd30625d82720d481800 SHA512 0d6dca077c99ac569d892bc92cd08c6bf3e3a5e30e623ced20227b5bd1bd1aa3ecd150bfc900659accd77b997eb64b4d6f0538f9b6161d190ef6c69dcaf47893
 EBUILD libpostproc-0.8.0.20121125.ebuild 2331 BLAKE2B 8561815d2f54feea81ecec29b9080c3d20416ad62be0dc44d4131052095cce339a1c2590433b8d778663841aaffa4dd489a5d8f1987ec3bb57362997bd833c23 SHA512 d95e666bb622c2a60b582199eb7e2e8c33a6ff1e1a346c69a6a64b8eaf17957abe9ee01c33c32771dc9ef6a546dd1e14f0cf6d623cbd8bd0c14dc7f171fe3a96
-EBUILD libpostproc-10.20140517-r1.ebuild 2369 BLAKE2B 323f6744a1e110d0cda256499eb7caff589427a8bce449a6961de6613e5e184317211835fdd2a6b6cab0a2f966396011e121d7e6f1f57edb8d9555004d98903b SHA512 54911dd231d84f2beee948084f701a86961e3cf5c9eb0dc2034d72aa15cc62783bd6ab24af2335326e5860a94f29352549c57f826b9ad227b9cddb7519564cb0
+EBUILD libpostproc-10.20140517-r1.ebuild 2365 BLAKE2B eace9e22fbeb32af50a8043d643df33e14cb67fc8e7f396c61a497d2e58172dca768b24f46d04cb9775ad80ec6d41ecc7092eb12634064ffc341b5b279f328bf SHA512 b6f5bcc654573c7bf0c039c7e6677707c3a4f930c042884f8a737b8e6f79b2fc34efcb68cd7bf634daf18ea421b7077bd2a33d5ffb337a3167e858f3b17b937c
 EBUILD libpostproc-10.20140517.ebuild 2335 BLAKE2B f7f97bced80be871c8036bb3c7ec60e027c29610dadc1bd84489755201ed69e7ce1b2eb1d33ab8aa5c1cb8ef24bbb9c1e83275b0b082b5d816791871df82229b SHA512 16d3c875f4239d8f7e476031397cff007ed5cf7a254f3dc957121715c2bc2df78055fedbb18baed06dff440d629b51ea4bfca162d3a45d8673259edb10c9681a
 EBUILD libpostproc-9999.ebuild 2304 BLAKE2B 10648a622982411f1cc1f1f8b7e65a39d58116acc8cc7b500d8c1bd4814af38d48b800d948d10273c96741598e6807f8026c5de5f309414d8a634716aa5caf5d SHA512 31565525f5c0da1585fb8318f742de382c95fa6650ec5f84fbb7129ef6f3bf3b261beff11c0cc85def19385a9b7b61a8eb0b74ffe109dea2136403ff718ac04d
 MISC metadata.xml 405 BLAKE2B 5249780527d1e7eb098411f01da236035ae3d9459da2fb7c69194a758e84a92bd02338e5d23490f310b1b59eedca9b2e7333d96d4cd18a055da40da1bcdaa2c3 SHA512 f6a4bb0b0fe497133fe3a1d4781472ccbdf30ab5e9c9aabb272b990bd7c5f048da8c430212dfb3b0f41f2a5ad5ebf3c6ae774474601e250444324ef4faf9ccab
diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
index 2327601f0746..80721f40f19d 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index cfe1ca230b45..7bd893dae939 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -4,7 +4,7 @@ AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf91
 AUX libprojectm-3.1.0-datadir.patch 6569 BLAKE2B 08dc8a6fee7ad8560a7b6c675b2fd5ebb8562fe2e59dfb29bff17646a85c70e65b510b5bc817c7954b7a9f6f3f88f915f6df6814de52a15450e90f3f6e69ffc1 SHA512 ffcb7401022178311844f6f87aef488995b06e83d9f7b82ed4d943d5531252767075b1c8412e55521fb079d303027d178c2cd795a1ea70f7b86959e82b13dcf1
 DIST libprojectm-3.1.0.tar.gz 52123464 BLAKE2B 9027adbbbd3458b0ac6c2a822b06d25965ee90f6764095d7f509a578c52127899caf886fd2eea5cec1c3f566580766442faade8f8964fb1cfe2abf8d41ffc547 SHA512 79216b227808d14ca3f897fd33247ead27c48b734475dc507272ba192b8f239683a28cbf89b5c4fb420ed2b90f936c8dfddd545ee000caf2471fb596f867ba66
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libprojectm-2.1.0-r2.ebuild 1491 BLAKE2B 080aca7bcfebd5b2555803ba5d6482612c564c790dba661cafef7af8414209f5896a5113f9d37719cc9937c3535b4dccffa890f4607e3301899bf7c1573b72d6 SHA512 9cd52fcc3df6926b9ff315c4f077f6fee597c35a75903f136e91c5091e4b37fbed9f6fed341af6d105eb8a857e0a236c3bf20e2b4511e22902d98fca6b361c7d
+EBUILD libprojectm-2.1.0-r2.ebuild 1490 BLAKE2B df81e719ce1539346edf2725fbd78094ab3e104a9754e0b30cf37a5a480cd8f9a805b9bdc66c4ec9c177d815f273f3c91f39b08277dae419cca699adb426c969 SHA512 8c18bdd26e192508eefa50e13e75b93beeff6d1d64ca96fc36e85c8bbd2b33ecdbdeafc1b023e52f46daa44f0e203f7f9baddc7867f1045ad1d58dc42eba28b3
 EBUILD libprojectm-3.1.0-r1.ebuild 1123 BLAKE2B 60dc5c75530f3bd25bb46b98ec9915639eae685b256a565cd1fd2a57c220ba0b4e7558addb45793612e8b186a0ae5cd43df835052f8971593551f2ae71cd1a8a SHA512 8f5715322dfb210858949adc0c045e85df98ac7665546ab16db4b3002fd7e4b77232fd51b6ddf338646fa00140130cfbaa2794b4120f83c17e35e6c5398ee982
 EBUILD libprojectm-9999.ebuild 1081 BLAKE2B 1ea51cf766d16945340bb93f297ee726932e99f5c8ab1201871e009109c861f5acc1086404ec2c09dc44d0fcd6031b46d6b38f4195cfec57ef0befe8ad0a87be SHA512 5d744f41a29111f47dbd483c0f0d436b6a9bffb8b1586acee8150292b19865d4a8a9c5a75b9e14de3d6805a65c39909f388a33059819d8619b1f2aa560a5fb68
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index bcdcf33bd42a..92450c70cc2a 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 59bcac085ac2..cb1f01e0c526 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -3,6 +3,6 @@ AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe
 AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f0771d64e644fe9884202d63bf198a0c3627e4dc5912258c45c9b5fc0143c9fe956ba0adc47dbc20744417d031175a3bbe6430f0fbea967f4fc0b1a4 SHA512 973a96892244934143f901d4469036ffe5fef46ea4e44d1c321d9ab888cb7865d59546aa6211b3268672355491d6876faebe57bb8cb1c0915cc692e66958cf0b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
-EBUILD libshout-2.4.1-r2.ebuild 1422 BLAKE2B 2c9b7ecce83ae62e785938cb85ad900b1d520bb6db20ebd6c92f4d140c8cea405a3bd78d1630b040c1117eed42f9b14ef6bf80c9319a132a0eabc82e0bda486a SHA512 042e66ae246f32c88c40ff6e5768ad9f1cd03473a286d0ec254a94f26c838766550d1dba9d5053f4e92cce09d06410d970bb0fec3f7ec29fa0cf068281b6c67c
+EBUILD libshout-2.4.1-r2.ebuild 1421 BLAKE2B b814eab2c4ae2e3b6b2b7a82f1185ba6ea9e55a0d984910ea9b4810d6a93ebe070ff31de5adba3b6c153958d0db467c57f719f1a011852036077d1297a00b672 SHA512 aa3401795a97f89075b00515aa33ee9b8a2ed681aec0197bcc4a70b87d3570c2686b56881b20b4e452bfacf7e2068fcb2ca1fcb328f9783ba5bf8f9d5d87681d
 EBUILD libshout-2.4.2.ebuild 1408 BLAKE2B d326f61d38ddd063bd728a735ee5a16b51d968ed847f51152c7c70beefa4539cdea2bd404ad2ec789f96e2819bada1ffb92d39fd8903a9476be830ed23c4b966 SHA512 f63419d790238f0e50ba5d9e0a1e92e0d2a377d0716b4be0f9eb05c2ced2b0ba295a6122f142c05e2faa47940b6b693da2777ca3da7af9de314e3c8ba1d1ce78
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index e30940ddffb8..74a48b8d3e35 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest
index 3102b447979f..c77aad13ad95 100644
--- a/media-libs/libtiger/Manifest
+++ b/media-libs/libtiger/Manifest
@@ -1,3 +1,3 @@
 DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d
-EBUILD libtiger-0.3.4-r1.ebuild 889 BLAKE2B 74e113baa32fd4832d5719d0c2bddf22c2b747b0a437416e4c4c65fed6359e9afcd472d4e820dcffabc8530ea25a4049ec066214394a12ea36390ba3d7e12ab6 SHA512 4504c1283780f21ecfa5cc97ab1b9b34300edd24c94fa5b3e366689fc1f4b95c730b819efee811a957353634c9b89ac84b11c4715c7f3f0a4d1b4c25ae07ecd0
+EBUILD libtiger-0.3.4-r1.ebuild 885 BLAKE2B 3bef64ed9041b18566ecba0db0b9ccc6886f0c4b12c033f7824f6071d7fa365fae734b8c7f73ca65456b91da9d822b4db93211d47ef8f93a986828c387855a03 SHA512 8be03794d2ee0b123578d08eda9465ed771827da5f6da582a4281fad777b728e57cff66d892e6d836fa071c10ffecf59cb8fe8a8275f288f74628a702879c9ba
 MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500
diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index 2e938f8e1e1a..d39f030f2840 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.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=6
@@ -10,7 +10,7 @@ SRC_URI="https://libtiger.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]
diff --git a/media-libs/libuvc/Manifest b/media-libs/libuvc/Manifest
index 5aa737b63cae..88389569fe24 100644
--- a/media-libs/libuvc/Manifest
+++ b/media-libs/libuvc/Manifest
@@ -1,3 +1,3 @@
 DIST libuvc-0.0.6.tar.gz 95598 BLAKE2B 8c317068629512a699536d218401a4ab05925e43bb867ddd0c1b3c06f5b26e0291ad4c486a04f16f76ee03cf5d576b7387d4bde726acf105f7297372ec14b1ac SHA512 d8e52f5d062d2b4561562c9dc017d7f8d9d6734c4284e54b7bc58f9fc968cc8aec51dde938e8911a5c71d0c49fca4478c2fe08c9b7041d4fa26d7c6e1e653f1e
-EBUILD libuvc-0.0.6.ebuild 786 BLAKE2B 05fa4aad03557e42bf894f21f59ccc2e0d0f7f0d1aa893ddf1ed9f3fe42fe91bf2fae98f2cb03d82cd25942b99b387b8b9fd64d58ec1be37b4a453c747990b54 SHA512 2b3b6a6606b6e7eb4f9232191bf4a4d9d3a3524f047584dee8a30d16c06a62b9352fb9dad5be5ff7a5b5915f8b03cf9234a85ab4860597b2b6f8a3f651725d1b
+EBUILD libuvc-0.0.6-r1.ebuild 782 BLAKE2B 70e17b7095036c1beeea530888486fa9aea46ece43b84c93479b2c6f7242c0fb365b85a8b4a3f5d08da904e20c2b7d7ddd93d107db22bd6967ebabed5a61631e SHA512 3df82eab14ab458ec028bd11e9024ca4bb19f2d8f698d5fbee3b663387c6fbdb7724cc8d2b3679f600df437b5a26412aa7c50a62dc43153907204303f4923625
 MISC metadata.xml 446 BLAKE2B 1c36e6c623d067d28deaec19f5d5b07e7c6509fe7ec3c3a1955c5edc863c38ec6974b2c5c80487b929e64f8e3c03275e708c9a0151151b3f06f1a988af5d9714 SHA512 19c938d7b3f171395552c4758f86cd6d80941e428967c14490d8ef09f0d48b215b8458d1695f390c257e81cc376f7c401e8405f8103c6c68c2b744cafbdb4eb3
diff --git a/media-libs/libuvc/libuvc-0.0.6.ebuild b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
index 80fde0f10f9a..31fa1cec60f5 100644
--- a/media-libs/libuvc/libuvc-0.0.6.ebuild
+++ b/media-libs/libuvc/libuvc-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	virtual/jpeg:62
+	virtual/jpeg:0
 	virtual/libusb:1
 	virtual/udev
 "
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index fec14a260e2e..7ea99216f72e 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -9,7 +9,7 @@ DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d6639
 DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
 DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b27d32778c38fe902c62a4415a17e857868bfcdcbdcab528617db89e9f57449a486333feccffc4a250bfe79fc460c790071ed SHA512 991066467121614106455522b3651f194b45a37125c1b4e6bade59044756f26d914c95388e3c0bd3dc22159525aa6478df36801767bb7506fa7e77b93c6c2ede
-EBUILD libvpx-1.5.0.ebuild 3956 BLAKE2B b4d01e2117eb2d6f4bf2712d226e617746b855070e49a4cfd5292aaacec0749b19d741ac18702bbf3c00378c2aee212b0f33eb8d2afa894e8fa8f1160a8c67ef SHA512 5d6f3930dee0abf3354bdff7a07a6b4d4872bb7db022eeb7169cea86fdd69e12dd750b4bb0c221e8eb7011bc186a91fa6ccd6e0bd2e3a95dec3a34ea55fc836d
+EBUILD libvpx-1.5.0.ebuild 3954 BLAKE2B f83ffbdd1a1f157f57f28184e1103bc172d6330d6e1146ae6014fe7792a118d8c7a4237ad638af4b4e441c81a6d0dc9e1edb0e430eb5155921c77d6f2c39283a SHA512 ae28b6eafcbb42b447a715236594c0cd72665925cf763c8579a668d0424ec86f6258ec10a8bdd0baa0ce332f792e9cb919223e5e4b1fedd2fcd49dce14b15c1c
 EBUILD libvpx-1.6.0-r1.ebuild 3566 BLAKE2B a3d55b41879c3b407bc8fdda418574c4d4a3bb5fc4cd6000af3841c28384f50e8d5f2faf72d33cafa65c6a3037876c471b660e6d48d0de26351c9d038555e1c2 SHA512 8b69bee233977ba30075c2330c0713f9e5615a4bb4c6668af182eb622a1cdb6aeb8318659e1fb397330ebfddb096bd158fddfecf8b6680aabb146a69f173dee6
 EBUILD libvpx-1.6.1.ebuild 3920 BLAKE2B e1350052f0e7542d4e5458305eb7b93b8e9f2399894ca52cbdad78145189429b338deafdfd63b5ef42c55a3e0da9d8c6182113e65cdc60f5608e0bf39ada8abe SHA512 fe68cbf448458d1b36434e5ecc5902577d6e557c06a090cb5695360cd32795052d74ffc1994e6e263c896fa463097224d9ec8d6b08f2a187efa6664b2a1f55ad
 EBUILD libvpx-1.7.0.ebuild 3884 BLAKE2B c6dbf1dc57c1a7e667e21ab1f9e95d191b18efc1b25d1dc76960151f5db2c2ce21ad6e150e78c503966956dff17ea95b31126295edd76ed2a1e6277ce644afbe SHA512 2b9c5422a14f74c827742db43e32da8a8d572624be28ed0d6e652fd9416dd5981daa67b4b01790655bc4d965adb5c38613937dca38de11cf851a2472c34b33ed
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index 80a751f1eef6..b3650dcdba78 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
 elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 # generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
 # it.
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d2206d3a3c7b..3fba6717cacb 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,7 +1,7 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
-EBUILD lilv-0.24.2-r2.ebuild 1488 BLAKE2B a49966c50b2545d8d9160112b91563985d50ec858308fee5538e9d8ae2b2c3d8dff7b02107e907abca0fdb5c8075e1803d6d75d9ef220d3031af3255b2e9ca08 SHA512 0a529fdb2f0567266675ca2b9b533854560a6c1e8714bdd1195f18bd82c8c21913c3ebe9dd34d8adf14b1047320b2541734178152967ecced3efdd1a7685cf5e
+EBUILD lilv-0.24.2-r2.ebuild 1491 BLAKE2B 4dcf0a2b5507c3ce790895a917a265ed09f2edef915bae07691788e19b83a34b2c75f7e98cb3919fe3f71d566f6fa736ef8ba2ea490ab0f2ab77390ea2f990bc SHA512 756dfb6db0cfb30532125b9e033d68f12df7eae31ac6f5c7a50d83375f16160321217aa7d78b960cfa8b2e6af6f41e24f0953d6a3cd9a21d81d647cddb2df85c
 EBUILD lilv-0.24.2-r3.ebuild 1600 BLAKE2B 846b39c71656e873d1f526e8daee94bf582e988fc28a11a6d8f7a3e4c22e9e42d5d3db843af73668d40d305bd8e5cabc93f9581dcf65e1ec9d7e8b2cda54564e SHA512 872d49474b3e2f9fedac162d9feeba0650f7c057e8aafe2a68d5ae20310b5d935f3ae409359477653caf5ec187398bf1923ab74c01dada377815b9e677a60b6c
-EBUILD lilv-0.24.4.ebuild 1607 BLAKE2B 2d6dc550f657183747a895e519aa26a3e6b9d1003614a80896b000176ba72c883ce41e1a46381c9342ece1c16cfaadc3188bdcc571bc2182dae58e9871406170 SHA512 fae06ea7bfdc32b185846404cad9683e79becb7b57e9e39bcd5f26675c574485fe93310295bbef501ee88b0d3ee1b0351ed966645fe3ab9e1070cda890999751
+EBUILD lilv-0.24.4-r1.ebuild 1601 BLAKE2B 16ea39c54407f547bbc6ae16e6913e125993b40d28285ddc1f8e78894cf533fad081e07c7733739b1c6119dcd9049d6df63a787b15f821df168f3d0d864a8148 SHA512 bd6116788162314ca7060c8427d37c536d88fb073b4dcb328e0bc63d723c140f5a15b612ee85c79209b5032a97610e2cbe134d416e600c6357ef148276a901a0
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
index 6f7029f64c58..ca54e0e874c6 100644
--- a/media-libs/lilv/lilv-0.24.2-r2.ebuild
+++ b/media-libs/lilv/lilv-0.24.2-r2.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=6
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc x86"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/lilv/lilv-0.24.4.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
index 19de278eb55a..54877d5c31b2 100644
--- a/media-libs/lilv/lilv-0.24.4.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
@@ -14,24 +14,27 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~x86"
 IUSE="doc +dyn-manifest static-libs test"
 
-RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+RDEPEND="
 	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
 
-DOCS=( "AUTHORS" "NEWS" "README" )
+PATCHES=( "${FILESDIR}/includedir.patch" )
 
 src_prepare() {
-	eapply "${FILESDIR}/includedir.patch"
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	multilib_copy_sources
 }
 
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 4dc03e5f00b2..b949989695bd 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,3 @@
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
-EBUILD lv2-1.14.0-r1.ebuild 1325 BLAKE2B c374bff768ae6cb3e4f7edb5069690b36d556711dfd32f6d687e0ca3d49906a4589067b2caa2d8e0b5977b9a97ccd04ddf46de3cb0328d33ef06758b0df2ec0a SHA512 c024d967536c125254a24ef9c77cba3a71394507b60d0ad2d1cbab3f106fe895be470f2217c1c9fc8f6aa9ff6e6fb01bf1be98622dd04c6912a9d883014101f9
+EBUILD lv2-1.14.0-r1.ebuild 1322 BLAKE2B 684a2df3e27b4fa888c7218a258d55c5a3b4fd34718cc6ed4d05851e6a503b1808038cfbf4fac3b94712f2ac3a2377c2bdf49b888ec1b4c437fcf1bd175812e8 SHA512 8a1dc4d2e4b2d01f6e344fe8eaa4b2df598e9d300ac2fce40b24e13dbac4f6cb2337464b258de3d96d50393e96e23b4c1ad02b3dc29914e50c806f5a502328a7
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
index e5aff379a1eb..6c55e7291059 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5f80e07442d7..6a8434002fe7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,13 +2,19 @@ DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d0
 DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f36cb265421453a5fde5086ee05f83962fde49113f34917f750cfffb40c8bce84bd003fe9d7c1e6900c52dc4d66 SHA512 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51
 DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0
 DIST mesa-19.0.4.tar.xz 11964060 BLAKE2B 5c0d0c6e019792ff6cd195f3b59303e2230fa32c24aa1524c3cccddc56ef6634732e79ff03c7bb20055c0489dbdd7cc103b27989179602f3c9ab332afd531d1a SHA512 431cd9360e1f6376e0966daf82322877b3833032c800f2d86816b37a6f3978d76294a01c3905a01af610582c9541c2a8b52b2e89c56cc954651aa7a790e84ca5
+DIST mesa-19.0.5.tar.xz 11967816 BLAKE2B 941f99194492fcdf4545d06d4f2d576a1a2b206aa9211dd8c3a018877a42dfac4a6d7b4103e781e4c4211661c118b663225252567e22226a866386a8e242f177 SHA512 aecd5ee54ac0316d5e318dbea0abdc06f23e67d75d36eb82d6cf6a396c9e850e1ccf4fa8815f8c4097b6039ebb1524673189350cbfd4b766ce75ce17c26d9d8d
 DIST mesa-19.1.0-rc1.tar.xz 10877180 BLAKE2B 1ea358595875fbe46b58f5445762cec0c0bd6ee087ce9819237373e2b41aacb64365ac9832b20b9f5fb8838c3d2c6c929cd642bba18b99c7ef153ca124135918 SHA512 a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1
 DIST mesa-19.1.0-rc2.tar.xz 10876808 BLAKE2B 2da9603ea7ec5c1de94ee24c3200f570e4ea127601f370230dc1bf1b64167c6d405fbd6bdb4cdae6be46ed0ff1610f12c0445c3f5a65dd6559e91b6f664872ca SHA512 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1
+DIST mesa-19.1.0-rc3.tar.xz 10878280 BLAKE2B 0b95b82d46a2c72185652fef76a50ec82b51a2f8efa9ca72e2c10eb0443e9ba43c5906de37d2479dc97ed48a8932eebea27de7e08321d7d3205b188af9f64642 SHA512 740d5d13458b54e1942bfe7165938ec414aa7949aa60109ba872236f3b483c7305ac76b1b48c38dc6fd7691748106447757ac081f364952cc9e00f45fa9e2ea5
+DIST mesa-19.1.0-rc4.tar.xz 10877676 BLAKE2B 7d9237b56c74d72c3cf6a218aa3c72e7c3cefe2511a61a9c9a16dcab306a567ffdeb2d4745dcb4113667ffa4ab5b806677e3b065d8574c1cb44419b99d193569 SHA512 04cc5a537d803359b9eb3207f7b7ab1357126fe78ae0a0ba24df51d2fbbf4e0cf1815a60f99a10b33c822c08af0c84adef44849e73c883f5ce30fdae142c5b61
 EBUILD mesa-18.3.6.ebuild 13688 BLAKE2B e8738fc05efad0af1f627af3339abcb609d55bc656402f4a7cd10d0216a0bfd067ae401c357ce4d9bb7b82d81fb8df5129025840d557863a04f183c38a299ef1 SHA512 9a99c7afc94de3e259156b7e48a8059a90bf8069684ba3354e83aa599e50baf6e63ea6c87fbfd672e0f97bf8383cabe93b193d56df840d586929301fc920ae10
 EBUILD mesa-19.0.2.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.3.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.0.4.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
+EBUILD mesa-19.0.5.ebuild 13837 BLAKE2B 3add45d862939caa95daf019edca4417c63b9e7d995b01f1ffec5d1ad2d918cb272d0136f357dcb65285ccdaa20a900a246760d56a6f56e0518d5bf32ef99718 SHA512 312e014c322297e5ad3438255689a10ef32c0bb3bcd379aef5f3187648e8d7a2e17587cda27f731f6e3dd9d5bb0719a4c590b6ea1b09b1bac8c54de36f553ce8
 EBUILD mesa-19.1.0_rc1.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-19.1.0_rc2.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-19.1.0_rc3.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
+EBUILD mesa-19.1.0_rc4.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 EBUILD mesa-9999.ebuild 14245 BLAKE2B d4b326ae22614a1433054829ac586b31c616b6142a2054e1202ce442835b56b05b7227d2fce08c7ab3007dbcc82b8652ed4fefa2201b04958791468f04bdecfa SHA512 ffcc6eae28666708750fb807ea96346275f5302a50f5c2f1d40026b8683ad85db381ae62a56449fb510724cd0d8218f28090b300efc52bdc7b0e4b150ee4ba56
 MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-19.0.5.ebuild b/media-libs/mesa/mesa-19.0.5.ebuild
new file mode 100644
index 000000000000..6e5cc0499b8b
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.5.ebuild
@@ -0,0 +1,525 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.1.0_rc3.ebuild b/media-libs/mesa/mesa-19.1.0_rc3.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc3.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.1.0_rc4.ebuild b/media-libs/mesa/mesa-19.1.0_rc4.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc4.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 95fbfc52ae1b..ef03ecbfe098 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -11,5 +11,5 @@ DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10
 EBUILD openimageio-1.6.13.ebuild 2374 BLAKE2B 673c04d398240d55fe684085300b47af5addea2ba60ae26538fa9af51ee7d3f5465a4155a29568b4eb3e33b260e89b48e4fcd9eea22f0e202b3e417b6f4ab729 SHA512 873b3a91ef4b5e521cf6b84daebb653854e589184ebbf12f3e6d9cd7bb43742bacdca3cd7b4b12cad3841c21435f0f6c7a04d8dfb848a78b94772b6641402cd2
 EBUILD openimageio-1.6.18.ebuild 2877 BLAKE2B 80de70165e8db192ef9749f2cdf305ea23d8bb902d8fb099ede3ccd9b7ebb02ced99f3e24262818ef0f9300459e3edc114bdb5472a4deab2af16d88ecea69a82 SHA512 bc90dddc03af90704d0c13f1f21db3825a0d20d0da1d01696313514ffbf1f846bf030a618fa22a4c11b6f79428ca0946ad2318d21039cd70f1c14c27294a87c2
 EBUILD openimageio-1.7.17.ebuild 2992 BLAKE2B db39f2b797e3b0ec9ffcc9825b5a854f1deedac007a25c5e1a3ed0de5ee976e777238975935a99f6d52e71f24634897bd0673da10f22d42588408c051f07ca8d SHA512 e80ec5440f7f9544d3ece54920d72a42bc751028c1b9ac7876e03012d0009a26612f1031e8dba5622fdef902591fe92872218f45c514f3b61b3c34eb9039d910
-EBUILD openimageio-1.8.17.ebuild 2934 BLAKE2B ac536446a34d9723883192a04fb8dbc551ab8a48cb7e9f4f3168e96181e73e17915961a8f7c7b09a2c92d42b237ac8652f23cbe66b6ab085286dafb435a7fde5 SHA512 5e5f253a0f63c34a07b85cdddc7a9559eac48230627d6fe686e6a1fcbea68c49fa22c64c83c31c3f0f7d25c1159a8f9f66f2621aab3cc90925a2ee90d72900ce
+EBUILD openimageio-1.8.17.ebuild 2933 BLAKE2B 20b7b4389878b57e1258d3bac400817bcc59103d0c951fc0ef29eda569ce87a976dd50814bcea1d40ff5f097480ab4102ef87ecb16a8a5ece001080c4f8d43ad SHA512 9389b99e3664d31ce57b20225fe8c3a26cb75e12b4f463f26da6bd2ac6b28562a8a78ef9974b3a06422b576b5fdee4c28c7e8085e7e6aca7b42c577c03408720
 MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17.ebuild
index 0dee277d54f6..f3c032132eb1 100644
--- a/media-libs/openimageio/openimageio-1.8.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 X86_CPU_FEATURES=(
 	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index ca994274d8e2..d7440d622952 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -4,5 +4,5 @@ AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82
 DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
 DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
 EBUILD opensubdiv-3.3.0.ebuild 1642 BLAKE2B 934fe6e9f491dbb4ba0e36bacba6ad2bfae774e33099ef3b966573288e1479452bb769ad9c6619b4e859feba89963348d56cd45aa5aa761399dadc485895bc7e SHA512 0bae40e658414b4cf94750fa2b680069be3e63b9a03880a01454db0eef78094ee2d726f12bb967de33003814d6c0241c832158fef7f32402ecceb7adb8bba189
-EBUILD opensubdiv-3.3.3.ebuild 1602 BLAKE2B 5c4758c2b2c89ac6c10f0bf07a32a20b4ee9ff6bfc0d4de292e3d32dfe06103cb5a8fbbdbc86f61096f9d946292b4c4b827ec2285242ffe9110bcd794773b3a5 SHA512 ade1a653e9d368b35bbc1b2ffeb0ae85c4bbb7c057911b2e6fe19899ec8907bb4b36e21077cd3615431d0e3ecbd1d2515cc44d5bf37dd8fd8d918e15fe365b58
+EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B c61ed763e2567b091e040097605cc646d80c48ce70842e816bccd3acfd03c9c36fbe6577229067e8a06720ce474c1ce650ce64c3b40d49a034c54c17cc231e82 SHA512 ab2e4725f77f7ef0cc804382af8616d06009c16d252c8fb9a880a8b8a8dfa87912436cc861652f31582ca374e7043dc28960cb6c6bb80fd098a382f7adf02cb2
 MISC metadata.xml 1145 BLAKE2B 21093cf63091de9706146ce01ddacd277ac425d947260ade355825eca4b0aafd0d0c487c8f85c66e3d455b766d4c566f01dac3ec0275018fba37bc30b2bafce8 SHA512 c9dc92192cf95c30f14516635a3e656a09f080aafc4404cf506e012e8d32173fdbdca63edef8f0c2769928eb62c9900ae810cfe4e64a95a735da5744c502ceeb
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
index 043b810269d4..eedadea99852 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index cb4324cb3cce..f278cf85bdf4 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,6 @@
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
 DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
+EBUILD opus-1.3.1-r1.ebuild 1076 BLAKE2B 1c000ae3c6c4b41f2248b691deb56f372c1edc1927b0e08762105ba2e21ef4d01aa28531f8a5ff80b5b1b3bb8877ae221658710908f8a568820350bd40ef5d4a SHA512 c230cb39ccbec327464687d9b4b97ca206a7626cffbbcbb317df282c42be54b29b0e50072f9f421ffeb590d82569e5a34b5b185b5ba8a6cd7b7d74a17d44dcbe
 EBUILD opus-1.3.1.ebuild 964 BLAKE2B 82538fba16a8dee170c25bc980d1bb1ee7f385a5c3cab51189e9f5f99bfc0415f4c556df33867c2ba97918e8742e17eea128abda22fda92b5b0620939198b03a SHA512 715f7aad4d3abe10b3dde5bf7c5010f3a9d0eb12c5b6ccd819ce754633089c3b35cee2d51bf366ea879e22844c2c25b29128f1828b836b00dff43cef967e70ae
 EBUILD opus-1.3.ebuild 1180 BLAKE2B 1765b021157f54843049a524b645eb65b1b2d2cea298447c281a89e8c60bfedfed3197695b07b9c5f950bb1707a35c3d1dcc121a29923731410a2eacf3830db2 SHA512 d601b387e877d1b72a1672a9cc5eab1b650e595f6cf7010676e57250fbfc2a8f9a157a562cf52a8cf9ec1ef197a318e76e6e61a797ff2606f725d07c43c2820a
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..6658b6af7997
--- /dev/null
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
+HOMEPAGE="https://opus-codec.org/"
+SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
+IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
+
+DEPEND="doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+		$(use_enable static-libs static)
+	)
+	for i in ${INTRINSIC_FLAGS} ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics )
+	done
+	if is-flagq -ffast-math || is-flagq -Ofast; then
+		myeconfargs+=( "--enable-float-approx" )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index f290a7bfceb2..064c50654b30 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -1,4 +1,4 @@
 AUX opusfile-0.11-libressl.patch 6273 BLAKE2B d4868792619ce83d01994c034f9605a86929e52879a22010c0cc00c512a5b8c5abe2261e406616c04475307b7f9d16a5bc57281304d9462b0317849e7ceda922 SHA512 1eeb55595a125bd43469f47073f78bf392bf70ff5e1f94192bf9a5cfad0fd3a3887d9b38b10290cd32d357d8c6c1e00feddc4f6fa14f652ec56a7d365280d812
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
-EBUILD opusfile-0.11.ebuild 1017 BLAKE2B a7990aba568dcd9ba45948d658d101b568f3dc72464e91d64a0d25460dd4eb3c575dbd46f90d6f8ecfd1459a25d7692139703137a5fa3df9e56b3e2c6a807df1 SHA512 07f8e3aab8f9dbbf911b926e0d3235ccfb8b95f4ccf74e8e8d7c0a353a1037a3c37f44a451f49dfb3df759b11733bea7f2cba5d60f9fcb4561cf9c8a311ceb43
+EBUILD opusfile-0.11.ebuild 1016 BLAKE2B 7f55b954fe3c86b2c04d2dca463fb5383f3cda1d722fb7a1486e8766ea154f5b76920627a35fa898e695d2e5423715c6866fea158154d370311c18b0f0a18304 SHA512 b82e7d9905522a76ef6e89efb838de195cfd772bcaf5bd2ce5ad997e45aec8512807af9ae42a8f6bd31473ec7f2455383c10ebc5a13dc2261da1934b6bab4c5e
 MISC metadata.xml 574 BLAKE2B 67bceafd9042cb07a851772ca2b78b542783c6fd4e9bdd5e44643a36652e24907692465390b33ceddd44d37be297b096129ecb92940fe5d7ec5aedbd709c8cb1 SHA512 12eaea9edb76ed36ac8cd60af4b14cf395b4fcb81f4d3dabb1020a0139f05e05fe80bc800080913e66fcb967d4ed1de6b37238a7b0d72dad69de505354aa3830
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index 949489b0f499..2803e3398d14 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc fixed-point +float +http libressl static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 33a33e218452..16aceb61e155 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,6 +1,6 @@
 AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1263 BLAKE2B 154bac0b193f03e113c557a30354197dd8c6546672c359a02608234a84994caf9aa57a3684acf5d89863f773e9d2d0b884ecadec9be66154fad143b6886d7d30 SHA512 1d4e74536fd35e1a04746fe6f9c9c50457ce19ec0cb056b9896a15613135ebb9d4235444dfd46fe98a612e5276e0e3055fb46f6291c1bd0b59637cf1bb59692f
+EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1262 BLAKE2B a3b5ea35d373f02fae13ab3461f31b12a629e3017375de6ec7112686d11b8b87aad215377aa26671fbbbd16a33cfa94d517874101195123a2b1b689fb5f46f80 SHA512 1aa2be3410239b3549cac802f74f61309a6a06cd01bbfcb5e805e8e012ebbb945e1e4a0d24fd0533a8e8cc3395df212a65a7f850f5710b7480e573e3e4d31b1f
 EBUILD phonon-gstreamer-9999.ebuild 1170 BLAKE2B 4490f89a367ac96fcebef6a32dbcee91aaa693066d744bed8d37540a0ff6acb4c8476d3e50f3bbb248f627179d8d79817c956539266265f3767a5a0dcdf6ade5 SHA512 3ab9128e35376d87edb61cf8bd616b7af43503781a3bbb2b1f79ed03b35139ba3c6cfabe8e57d83f49ba54492bf86cce12d21b21db66ea99af1f6df38267805e
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index c80af05ae4f4..17981927f53d 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 1a5fb6c44ab6..0970e4075eff 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,5 +1,5 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
 DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
-EBUILD phonon-vlc-0.10.2.ebuild 888 BLAKE2B a6886cc21e6937c26ade888dc11bfdc4b01772920e804646f5eebcfcb1bfa8c924dd66da919276574fb07a82809d1669c967d9ea19e0fd6e0a2cd413dd678081 SHA512 ef63ea128df69ac4f75a3b79f445293a3c10f9fc3622debfc0f431b7ccf3dd21128b48e606577609abc8c1952a83d6f91defe3483086353defccd22ad31f42e3
+EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
 EBUILD phonon-vlc-9999.ebuild 805 BLAKE2B 68dea701bda421326ea0b2fadd1c8b212442855e9c4a4fbd12d43e058dcb823a04b53b13a654102e58df26877dfea82cbed1c6735e78bd1076992ac5d83ff2e9 SHA512 608dbbd83aba883b269ea53ecf7eb816cd5bc9fa482c4bc9759f19cd7f51cde1940c3b9b157323b413eede37a8a1a9c458a0cdac0fd4ad5bd177486e0e23c172
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
index 7e86137ac367..9480384f2a52 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="phonon-backend-vlc"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 8bc50ff363eb..2e7a50bacef1 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,4 +1,4 @@
 DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
-EBUILD phonon-4.10.2.ebuild 1324 BLAKE2B 6ef0d20a4dbb85e7a3e79dd79912bd9cf1fadf976299b6da7d5afc99435bc887daa72dc454b7bad35380e616593527e67966bade83b8287781c1484e309064b2 SHA512 d2ec58720805baffc45efd4eb073e2237a04307a3131c87b000421b2f322a315d820b47f3e88c207dcdb6c0e1e107f229490323a16bb93f40c8988f477598d1f
+EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
 EBUILD phonon-9999.ebuild 1326 BLAKE2B 7c6d2b1dc638e0caaa10c788fcb50a56f2aabbcdf1ce4107713b5aac3b89efdbb49fdaebbd18f8c6e6728751db0387bba79f3df91dbee99d503308d83d97bf97 SHA512 88475f68ad0c6ebee1cea8783990d1bd3d269ac4834495094773dca906bb094e37c37abeb64b300584baa6049d273e73954f7e2009d36c2257e67736807275b0
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
index ba2947c3d6d7..fb59dd89f044 100644
--- a/media-libs/phonon/phonon-4.10.2.ebuild
+++ b/media-libs/phonon/phonon-4.10.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index dea76764011e..3d0d49f3ced3 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,9 +1,11 @@
 AUX ptex-2.1.28-20170213.patch 2324 BLAKE2B 1536d8b2f8c6c28718ae81a04e3041d5c25f562647e84a098500ca523cb2c4f0743b812e3a1fb9838604752a41b07d1dd41f65d7a9c2bca7a84cc25eb312f3be SHA512 dcdad0e6b2b37c523b5b54c4d885cd99facd7d50733150b2c75fac3b600010c61d2c219a14aecc24a86ff869b62a962e975dd5790228112fe004aa2d8b2fa51a
 AUX ptex-2.1.28-allow-custom-build-type.patch 1410 BLAKE2B 9d1bd1b41752bc3d8c21f72505dbc7c2bafccadcdb1ace339a8f25045f4e2b527af0b3263d4be2f5883912eca733d74cb20aa10eff6792ff89f288e34d27600f SHA512 fc51d24895c7624ee610f5f8537bacc15903816cf4cebb2c32f15afa6c9ab4dd087e21018a81e4d032b37735bf4fba73a406acef8e0c88cebfd6606ba2b11b24
 AUX ptex-2.3.0-cxx11.patch 399 BLAKE2B 482ff38239256f3195d13478a461c45eb812e1f4f047dbbebd275d77edca71273978c183360a6428ca411029be4174637bc591846554ad37af58cf64ee80d6c6 SHA512 9ab265f7d330142453b8b135ee32fde20b70ce6b17266ff61051682d6ca620a9d55c40f199c52feb807372cc64c21e1905907c10b609d2e5f07e572451c9b1d6
+AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
 DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c54432289d88bdcf3a01c8ae1ef752ca88869357ac1e4657d59f1ca73d311a3fb9a08efe4e145ca259eff93d8a3b6a SHA512 2d9d320e4205236a4eff05ec3c67d085624809ebefa89fa3b943d18a8b2b6a5f61c022a4cc4363a7c6ceccfb9eac4f8738dff2e90a3355814f2c4ff096c09992
+DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
 EBUILD ptex-2.1.28-r1.ebuild 575 BLAKE2B 5ec37846a07464082c8863b53e523f1b046151f14cccb7b19672028560072703b303feeaac156c78c6a7006d79bed649e9a24d5dac6f2e81985e57077595850e SHA512 0289b417671552ad7400b5784f985d1b3d405b07d10e2101a06289292249d67ab88ad1c041f5641ea724de59a0285797fc7435cc68ad9f3c550bbb30b55bb967
-EBUILD ptex-2.1.28.ebuild 544 BLAKE2B 60cb8bb36eea64f38f892a91bd270eccfaae2b8f409a319688e491069e7c02739977f95663b7eb4aaadbe368ef069d444902dbf3acb13d4f256c4313a5a0fb51 SHA512 546b82932cdb673e44b6aa7e843e8f96564cb22436e274678c0910d4beda2cd483812cc5a6b4b03bab8c2dcdf028ea3ac62bcffd088bf1f51c8a974e9e58f39e
-EBUILD ptex-2.3.0.ebuild 663 BLAKE2B 6ff6a2c7e2668e6ce4dc60e666f5ed32024d9864375a27c8c060fad2baeed6c7105dbca800ed04846ef017f5042e4e75e2a6e6a072c694dc78e4ea6165b4bd81 SHA512 8d280943a293511704d4835c97f75451fa02ec0ebc4b4fb386b948a903e8c8dd7e7679264e64d0700df3cce3e2ae0973da7cef567874001f17dffe8a4520fd7e
+EBUILD ptex-2.3.0.ebuild 659 BLAKE2B 22ebe67087dc4ce5549dd32b35becb3b2606ae7a9c86ea19b29bf6f9a2165c1648b10f7970b3be9fadf2449d71a78b24232155d038036e3cdbc91be27ab33ce8 SHA512 e6ba1ca758119dca0e886a7988dfdff81ea1dbed0a0e84fffeb13bdc1cc140781250f6515cb8a568f5000383b01b2435caf2907d8116e50034418c8108447ede
+EBUILD ptex-2.3.2.ebuild 793 BLAKE2B 4e038fb24bbe5c65fa973fde8d294a980fa4c04d9a73abdb5e6df43b55529ce7eb853a2fd6132b12324a2f634d7dde11aedb6a6fef0b0a228390d227ea343ef3 SHA512 0c88c278faaa06bd433b12a0e935a0faaad921b2b099b0b74cc811a947ffedf06bf13b1b3797f57ad056217984e6af5fd22dc4f41932f3cc53bd6bf734930a29
 MISC metadata.xml 646 BLAKE2B 443223f4b464d16d2e7b4ea692b080f49aeceb1ef4d599d5dccd5aab6223e8f3a562317f7dda0cddb79840f19270f65af948df153cb2064b903f80e00580ee8e SHA512 ec1b3e3f8b15023413723136125ad6a92b7a509532824fcc547bcfe147e63a60e072496cbfa2337bb180e9c718fbe9e49c198f469a9e41a252b1706cf6cd461f
diff --git a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
new file mode 100644
index 000000000000..f35372b7c636
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2019-03-08 18:39:47.000000000 +0100
++++ b/CMakeLists.txt	2019-05-21 23:20:50.964082298 +0200
+@@ -5,19 +5,6 @@
+ option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON)
+ option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF)
+ 
+-if (DEFINED ENV{CXXFLAGS_STD})
+-    if ($ENV{CXXFLAGS_STD} STREQUAL "c++17")
+-        set(CMAKE_CXX_STANDARD 17)
+-    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++14")
+-        set(CMAKE_CXX_STANDARD 14)
+-    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++11")
+-        set(CMAKE_CXX_STANDARD 11)
+-    else ()
+-        set(CMAKE_CXX_STANDARD 98)
+-    endif ()
+-else ()
+-    set(CMAKE_CXX_STANDARD 98)
+-endif ()
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS ON)
+ set(CMAKE_INSTALL_MESSAGE LAZY) # Silence "Up-to-date:" install messages
diff --git a/media-libs/ptex/ptex-2.1.28.ebuild b/media-libs/ptex/ptex-2.1.28.ebuild
deleted file mode 100644
index b766367ac446..000000000000
--- a/media-libs/ptex/ptex-2.1.28.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
-HOMEPAGE="http://ptex.us/"
-SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/ptex/ptex-2.3.0.ebuild b/media-libs/ptex/ptex-2.3.0.ebuild
index b3cec3d387bf..ce1f9fd9c98e 100644
--- a/media-libs/ptex/ptex-2.3.0.ebuild
+++ b/media-libs/ptex/ptex-2.3.0.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib:="
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
new file mode 100644
index 000000000000..b9d0f650ba96
--- /dev/null
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
+HOMEPAGE="http://ptex.us/"
+SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="app-doc/doxygen"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cxx11.patch" )
+
+src_prepare() {
+	# https://github.com/wdas/ptex/issues/41
+	cat <<-EOF > version || die
+	${PV}
+	EOF
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
+		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/pyliblo/Manifest b/media-libs/pyliblo/Manifest
index 07fe7f70cf10..49b4207d0bbc 100644
--- a/media-libs/pyliblo/Manifest
+++ b/media-libs/pyliblo/Manifest
@@ -1,3 +1,3 @@
 DIST pyliblo-0.10.0.tar.gz 29702 BLAKE2B 6120003aba9990a4c9d84050a3501e4f2bb345d7b454f47ca2689091c3dcfa1c59c85ff8c2a7b7d0e7a6b9ee87c291ebceddf09cd9a1a39a0706ae463394e407 SHA512 d2a3d47f6c52d310104256d33fbd5d652ae6bc8cde32c2d3b2f3f407b8a4aba99028e57cd466804d266f63468a6c792760f28a43dbabcfa3330e0a852ee4d4e3
-EBUILD pyliblo-0.10.0.ebuild 526 BLAKE2B f66b2141b74f72002529fe53928ad8241727640a507fa4cfccae0718ae5b9d65f0dbb72106911afc026c4fd30de3ea83465c37b90e54dfa96bce2a011a54816c SHA512 80c6b9eee1e19151df6404a9e56bef0993c840862125030ed5996189b32097262de705c9bec8e3de49c2a539f6ce94424aaf75dc3499f4f86ef6ea28d4469c17
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+EBUILD pyliblo-0.10.0-r1.ebuild 525 BLAKE2B 70f86ab9c9431ce5ef0946b704602d0f9887618b20530c40b05eafbdd1561fb37ba16ebb3193f163a4c8a0983d2de0d1ba3dcc15b52a3b36fde5072c6b9f32e5 SHA512 d90afe286c0f6255ba1a7e0d49f1b7ea3ea8269154e25943250ede7e584e3cec3004077bcfb34280ab79e9cb89208225203f9d0c3cc5692ac783fc6fd94b88a8
+MISC metadata.xml 443 BLAKE2B 0f5ca85fdee859d34612857810740cc23f7e82c757596afbcf33b4825908295d2d49f93ab27acf2e5ce66a1999deded0c30a7d90d2fdf88a609ac19e7d073bea SHA512 258fb4656807e957ee2172da4cebc2533e8367ccad076cbebd6e221cf76df046b748711d4d7abd73bb3c76e13102710beae0eb2ce74378bf1f15a2b8e9f41d2d
diff --git a/media-libs/pyliblo/metadata.xml b/media-libs/pyliblo/metadata.xml
index 1b2becffa26c..511c25a14265 100644
--- a/media-libs/pyliblo/metadata.xml
+++ b/media-libs/pyliblo/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dsacre/pyliblo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/pyliblo/pyliblo-0.10.0.ebuild b/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild
index 7a81790300a4..1ec36208367a 100644
--- a/media-libs/pyliblo/pyliblo-0.10.0.ebuild
+++ b/media-libs/pyliblo/pyliblo-0.10.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
@@ -10,7 +10,7 @@ DESCRIPTION="A Python wrapper for the liblo OSC library"
 HOMEPAGE="http://das.nasophon.de/pyliblo"
 SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 7e126539cdeb..2ccbb714e2e7 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,5 +1,5 @@
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r2.ebuild 1666 BLAKE2B 78585fc28baf38b7cb5e0dd8c1e68bec829b76ce162dde1eff8838199707cb7e04610c5558d4bca7f5db17f8c311e07a0cb2f500a71043df73bb95563e8cc0da SHA512 4d4dbffb61dbb1569fce9f899ded5d085a4b4fef2a581525cbcc4ebbceb2847b31ebf56393e6699a0a9cd4c076a09bf5dca7dc7991d5a49fd8b994ecc2c00769
+EBUILD raptor-2.0.15-r2.ebuild 1665 BLAKE2B a91c0579e0565566258a27c9fde285cc4fd03876739fb80b2936d26f43a9e35c378f406d92ad81a9220a6f9c6ba0d357372d73d5f77950d3b4787f5f237b9002 SHA512 0d699a6893b536d287aab45638c57440903b48bc94504001c9ab3076f36f6a3f7e37665a10b7b7d31ebaa62f2a1ec7e46b7a26a8968927a738fe886d6f2ca7a2
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 2f77ba341816..d5f5f8bf1681 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index efd23662402a..0d974208237e 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
-EBUILD sdl-image-1.2.12-r2.ebuild 1571 BLAKE2B 92b4f2bc93405c473d994dff82967804a8c88b6ed55df5fd7a5f9ea58cedd9f666480e354e180a88566b8847c0c0ecfdb9a2159c1e150da1cb362db2a886c5ef SHA512 8e1a1ebc29e9bc250c819707afcdc38cbee4ad10f5e79e207db677dc6745529e53456fb34d30de0ea61678fc04d0b17bfc4f17478eb1911f389ad27956edb959
+EBUILD sdl-image-1.2.12-r2.ebuild 1567 BLAKE2B f82c035c4dcb6e0fea028f51de86af261a9824b2880b64aad9d2bff24f62c9097f6ad936a7acc777ddd60555a4f63b4d12938b62d7f72574fb6b112068909a15 SHA512 7f1d37b4667404864b5baac84c94b417e21e996f557261b96f3d0d0b2a6bebc131642123009efa81bcc68492a440bb16f2fc747a13b96a977c01a136b04f48f2
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index 6a9bc4aa1f1a..d9578965e6d6 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 6e0d678e7956..145de0ed9585 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,3 @@
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
-EBUILD sratom-0.6.0-r1.ebuild 1211 BLAKE2B 65ab9257c47779f14a6f581b642c7a8c298de6fac338d2d1118f332afe29250a8ca44245e49c8dcd6aa5618a85f505cf6a7063fc11d53346ee11293be993ce98 SHA512 a2c3415150c0726c2cd57b90060befc756b8a2918adb871ee41520ffcadd84d50e208ed9dfd4d33f5cf3c8ded45a32ec08859cd909d1a6c7da47761e7a3f620e
+EBUILD sratom-0.6.0-r1.ebuild 1206 BLAKE2B 95cb41aa86be6f6c56be7375f6c9f5d6439d00aa7493a94577dc3cd4c8ea300dcf4d32ce27fce739ed7cefd4c8344d853ffc24e3f8116e64f6081ef5ce44d61c SHA512 58e56be4c0b43f0d29efd4fc75dece7f2b057e99c6cdea793e1109391a6ab91395e7bb624f8a3ac9b6de77b63fb725991ffa394a127b504bb17241c325de63dc
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index e82dc65f00e5..5e284d8928ad 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 2d3c8cc0432a..b35030029d69 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -5,5 +5,5 @@ AUX t1lib-5.1.2-CVE-2011-1552_1553_1554.patch 5085 BLAKE2B aa10c8ceaffe6d827c38d
 AUX t1lib-5.1.2-format-security.patch 1357 BLAKE2B ba340f40284dd24b5e49ef9aca1a8fa3773d547e382cf5abd5e600ee696e615d050f69d1b974a7e442f70cc3cf80fedce6d55c6e40d12170a60376a3ebdb0a47 SHA512 7c7ecc3851c675780b15b185db1b6c0b412fc1eef7505c822b75163ebdf14762ba999486db3238adbefe1571b762e9014669a585a886e537068b8a38bdb85ec1
 AUX t1lib-do-not-install-t1lib_doc-r1.patch 522 BLAKE2B 37989b16132d84d67b5692fc7c15654f28156fb3162ba4c545ab01e238e95c60e422aa1b86d34d2c160600f0f55728ed637094a2b8fc951b7d338594510c104a SHA512 d77beebb581739f5646137d5c1aa5cf3d9906a010f07e3822040812822782db7712d4d18d6235dc22da6e4531daf81fa891db4c1047ad95ee702da88cb01688b
 DIST t1lib-5.1.2.tar.gz 1872534 BLAKE2B b6f2c17b8009feef3c0ab3a8314e89e421d90349c4465885c3478a9493b30ada9ad0a2f58e70ba863d91e305fbb52f90e6a42b492a0239e5245ff9132c2ba92d SHA512 9f424b19c6f35cc4f194ff7351a4c2352216462c7d1b1d9650ad3a05cf48c6e90c89ccbcda5ecc47a4169a39a850cf84a1fcbf88b3b15614860c27364b631ae3
-EBUILD t1lib-5.1.2-r2.ebuild 1835 BLAKE2B 6704f2fbf193ff10161019529217baf6d83aa5bda1132bba56fed3f26fa2ee6daf0f10e1413ad70bcf36880a8b3fe0e02ec851949134708a3598350833d02ada SHA512 28dedca5bf8f7c66cd6053c55a2038c1ad82d26dc50f069fd900fdeac172e619b568a46a8bab90c5fc2b629a47138539618df6d5ae9c24410310918c4420ea0a
+EBUILD t1lib-5.1.2-r2.ebuild 1831 BLAKE2B 9cfc9594e9026da63d6aacf49be5d547528a755e720959eba20f1713669fdf21e55db723239d4c63dea1da0ac0b7692d42bc9e30690555e3bd17435b598c6695 SHA512 873abde5b9ebe02bf7965eca48e336aca2fa56b6a9fcbf43547c54d2b8569562f364cee536d9a2ed00ea107cce447a1d65558e13cda902d5e70e44e048a326cc
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
index e763c5eb15a6..73c4cebaad8e 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="X? (
diff --git a/media-libs/volpack/Manifest b/media-libs/volpack/Manifest
index da98b148835c..fef0ed293b23 100644
--- a/media-libs/volpack/Manifest
+++ b/media-libs/volpack/Manifest
@@ -1,4 +1,3 @@
 DIST volpack-1.0c7.tgz 1218492 BLAKE2B 8aa0e76da81a3c7a5050a42b9a16780e90142c0e9318021652b86473f2832cf6f88771c8bd461457ad07c85a9bd1d7723e46c283ea66227290c54d9339abca62 SHA512 1328918bb62e81a0aa9eb26d9b0cff98081518b0fc6c3457413870bb68c793d0d9bfe42d977fa5b5a7ad110358b736ce0d0aff8825333e32e37436d9dba3114a
 EBUILD volpack-1.0_p7-r1.ebuild 672 BLAKE2B be312bc5320ba58e0b10c27be211fcca474937233c12d0b0b6b64750e2b551ee9c0097974f490e32cbfd5635b83daf21703a46a1868fc6bfbfb77694ebbab05d SHA512 b83e161838144a016d45647859411a95fa668a9f76c5693166575e4ccab54b86c6460514935f59015a1f11910b369b1c072a575c388d32c4bc8019601fb7bb63
-EBUILD volpack-1.0_p7.ebuild 674 BLAKE2B b6ffa0087b0794f0baef431084a18ba6b09dbf1b733c2a38ade0838c228ea7de1f583bf3e4890c059043e5f2936bf360710d5f022a1ef7a3bd0d67848f74fed5 SHA512 29b0c08af2e942490f7a5fbd027a5725f0d33f67c9d131695e807267145bdd5c0ae6b68ac215ac40c75ee1f32b119dd969638cae659b4169b655ea8ac5aad8c6
 MISC metadata.xml 602 BLAKE2B 0c84144abaedf91f7ea53cf6e14c7b4e3c0b1b2cd49f641e4d1f816ec3443961ba2d0a5bd075694dc05e17aa3028a3a9eca82d04702963b84ea38bad397547dc SHA512 847fa128baf525bd7027a8f9c0ea6bc2d7210d488097759e74a51eb3d59dfa10fda597c6555b2d4cf8dc9edeec3d96ed249888d082ad4454a03d8966194488c7
diff --git a/media-libs/volpack/volpack-1.0_p7.ebuild b/media-libs/volpack/volpack-1.0_p7.ebuild
deleted file mode 100644
index d1467b65dbd7..000000000000
--- a/media-libs/volpack/volpack-1.0_p7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYP=${PN}-${PV/_p/c}
-
-DESCRIPTION="Volume rendering library"
-HOMEPAGE="http://amide.sourceforge.net/packages.html"
-SRC_URI="mirror://sourceforge/amide/${MYP}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/*.pdf && dohtml doc/*.html
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-}
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 9e6353aecb31..7d70a1c35e97 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,8 +1,11 @@
+AUX zimg-2.7.5-sse2.patch 9349 BLAKE2B 2b1220d747919074d400dc35d5a23d53be800071d386801c737faeeebf3694925c20de6e0198ef8cbb143580da46e136b24ad39831167440e6ad7415adb76a04 SHA512 c8f27676c441a76dac56b1d8e11229b6b5b9d515a99082d15af9a173b7570becb03961384c64ad62c908e1d64a4427e2b838836c65c1fd687773e6a2da5d6e38
 DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fcda5d9bf491fcebe7e8be538041cc536e40bc110e438370c8599ce0be35f71cea00429b16c6eeb680cb86 SHA512 7fc48c704b434d837c36d4bafc51b35789eaf90fc81a68dcd7ec546f1e82a3e41c53263f8d381541d5c0ce58e25dddf0adaf1c3575512842ae633b5581778938
 DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a619fd0ac412b1e441fe2d8892f64826666fbdfa48ae441fa5a21512b5ba0977eeaca7dcb7e0fcc43447f6e4 SHA512 adbb525b2611ef5267a4c0d4e8c6dd164c2814241c4d58d5356545b23dcf0cbeabb140141ae6ff0e70ef8e0741e351cbfadbadd60923061ddd693a2c3d9e5fde
 DIST zimg-2.7.5.tar.gz 246416 BLAKE2B a0ce1497356238aee5d3965a7ec57f1591d51c5df2475fb05d208a07f1431f073f8caaac110775fb17c6df8f887ed974b53f262e01f5532de13dc4c539958c1b SHA512 600139f86b074f2ed9614daa58d969465fa3d1578d8165bd2f841193f7b793c4b36389064dd4eee8e01e66a745d1c71c62e5bdb0b5283e54c435ed4a130a5b3b
+DIST zimg-2.8.tar.gz 265363 BLAKE2B a8982c64325e0089617136fcd5d6ee429ab861e3b9445b9cc0292bd3bbd3abb5783e94983e3e802fd9e59c2c7089eeea176d1eda4f3a850379cfc4fb36cbc408 SHA512 1e89087a756798a7ae3bfae3bc8244b29ae8ae7f04f53bdf6c4d4de3cb11412dc1eecd95a4a121bb9077437e633f8fbb665522ff8112ade806d9191ea4b5f7bf
 EBUILD zimg-2.5.ebuild 825 BLAKE2B a44868a6c09dde69f9a14d88e292816982efe3d2a710be81eba6d6ec5879c23b2ffb24ca55015550854e10956efcb9642257889867e0d206302cf1897d472e3f SHA512 5630c26971ac2075b4ceb82f615b818d6c2a53a273258ad4a08bf154239ff552220bfdb7104f94e6a1c69e0e4ff17d0be7dda56c98fcb5fb99cbe44509efa42f
 EBUILD zimg-2.7.4.ebuild 841 BLAKE2B b4db5d33a6bb06230ffe472d9286828bb65972c230a89de9b5e32d3e862a3e5b090ba4e1b153c8282e7a570771904fafedf5a7411c3beed8d0634bc51f4e76c5 SHA512 e1ac5be82ea15245df6f1922b38422cf9162b05a6ab27e3a79290c0aebc51b4bcb7a379f38a5235ddc1f02a412142bd5b68ddbf6c4fa3a773d265cb52845ff81
-EBUILD zimg-2.7.5.ebuild 839 BLAKE2B eba010daef304ddef00bb8b47ee26e717fb0dcc55bf4368d0af1452cc918ef1e79ac7a55c1b39cdbf1d5a3fe69d845b530fef45e1ed93ab4cd82b176b0d09be3 SHA512 4886609730700a7776882df463c66b80ca8cc5bd9b1304454afb29173e4c382f61e11bb2f74b8e8c7df3960ac6bac40f6d472544eef9a39bf731ca0546e64c0e
-EBUILD zimg-9999.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
+EBUILD zimg-2.7.5.ebuild 819 BLAKE2B 971193910a769767c6793d576a7c15a1f39c9dc86609e3c5f6ef61716aabbfcf5b7cc8837c383d3d36a8f6fdfc504337e29bffa13b0810d270aba16d264d1655 SHA512 4bfeecc8a61a0c158397a4f84403ec2ced106573df74c7cd7b8518dfb934e4932646760a9ec56d7f91b38b7ec01087d8f9b400e468231b36b580835203e1d4bc
+EBUILD zimg-2.8.ebuild 778 BLAKE2B c272141d31c5e83e6a467c93804a25c78a40bfce9f0ebb57fe4205d049d1cab1216428a012a46f4a05010901236668c6c8441228345acb1cab7102a98b035f77 SHA512 d13477c97f3c807ea8ef7f3aa88d007dc818b851f9affc81ff204e96d07caa5953169b6bcb5f0ffca9466cb9eade87d5cd544ca298faf406173751a817c9d017
+EBUILD zimg-9999.ebuild 778 BLAKE2B c272141d31c5e83e6a467c93804a25c78a40bfce9f0ebb57fe4205d049d1cab1216428a012a46f4a05010901236668c6c8441228345acb1cab7102a98b035f77 SHA512 d13477c97f3c807ea8ef7f3aa88d007dc818b851f9affc81ff204e96d07caa5953169b6bcb5f0ffca9466cb9eade87d5cd544ca298faf406173751a817c9d017
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/files/zimg-2.7.5-sse2.patch b/media-libs/zimg/files/zimg-2.7.5-sse2.patch
new file mode 100644
index 000000000000..77483ab59e73
--- /dev/null
+++ b/media-libs/zimg/files/zimg-2.7.5-sse2.patch
@@ -0,0 +1,231 @@
+From e30112df0ca703be82ed2c852511916fc46defbd Mon Sep 17 00:00:00 2001
+From: sekrit-twc <noreply@example.com>
+Date: Fri, 22 Mar 2019 18:51:14 -0700
+Subject: [PATCH] colorspace: use bfloat16 for SSE2 linear-to-gamma LUT
+
+On Skylake, processing 512 pixel array:
+
+direction	cycles/sample	cycles/pxvector
+     g->l	         2.35	           9.43
+     l->g	         2.49	           9.97
+---
+ .../colorspace/x86/operation_impl_avx2.cpp    |   3 +-
+ .../colorspace/x86/operation_impl_sse2.cpp    | 104 ++++++++++++++++--
+ test/colorspace/x86/colorspace_sse2_test.cpp  |  14 +--
+ 3 files changed, 100 insertions(+), 21 deletions(-)
+
+diff --git a/src/zimg/colorspace/x86/operation_impl_avx2.cpp b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
+index bbbbf896..f0e7f792 100644
+--- a/src/zimg/colorspace/x86/operation_impl_avx2.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
+@@ -114,8 +114,7 @@ class ToGammaLutOperationAVX2 final : public Operation {
+ 	{
+ 		EnsureSinglePrecision x87;
+ 
+-		// Allocate an extra LUT entry so that indexing can be done by multipying by a power of 2.
+-		for (unsigned long i = 0; i <= UINT16_MAX; ++i) {
++		for (size_t i = 0; i <= UINT16_MAX; ++i) {
+ 			uint16_t half = static_cast<uint16_t>(i);
+ 			float x = _mm_cvtss_f32(_mm_cvtph_ps(_mm_set1_epi16(half)));
+ 			m_lut[i] = func(x * prescale);
+diff --git a/src/zimg/colorspace/x86/operation_impl_sse2.cpp b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
+index 48645031..da9d4dbc 100644
+--- a/src/zimg/colorspace/x86/operation_impl_sse2.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
+@@ -3,11 +3,13 @@
+ #include <algorithm>
+ #include <cstddef>
+ #include <cstdint>
++#include <type_traits>
+ #include <vector>
+ #include <emmintrin.h>
+ #include "common/align.h"
+ #include "common/ccdep.h"
+ #include "common/make_unique.h"
++#include "common/x86/sse2_util.h"
+ #include "colorspace/gamma.h"
+ #include "colorspace/operation.h"
+ #include "colorspace/operation_impl.h"
+@@ -20,14 +22,25 @@ namespace {
+ 
+ constexpr unsigned LUT_DEPTH = 16;
+ 
+-void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float prescale, const float *src, float *dst, unsigned left, unsigned right)
++template <class T, class U>
++T bit_cast(const U &x) noexcept
++{
++	static_assert(sizeof(T) == sizeof(U), "object sizes must match");
++	static_assert(std::is_pod<T>::value && std::is_pod<U>::value, "object types must be POD");
++
++	T ret;
++	std::copy_n(reinterpret_cast<const char *>(&x), sizeof(x), reinterpret_cast<char *>(&ret));
++	return ret;
++}
++
++void to_linear_lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, const float *src, float *dst, unsigned left, unsigned right)
+ {
+ 	unsigned vec_left = ceil_n(left, 4);
+ 	unsigned vec_right = floor_n(right, 4);
+ 
+ 	const int32_t lut_limit = static_cast<int32_t>(1) << lut_depth;
+ 
+-	const __m128 scale = _mm_set_ps1(0.5f * prescale * lut_limit);
++	const __m128 scale = _mm_set_ps1(0.5f * lut_limit);
+ 	const __m128 offset = _mm_set_ps1(0.25f * lut_limit);
+ 	const __m128i limit = _mm_set1_epi16(std::min(lut_limit + INT16_MIN, static_cast<int32_t>(INT16_MAX)));
+ 	const __m128i bias_epi16 = _mm_set1_epi16(INT16_MIN);
+@@ -73,16 +86,61 @@ void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float presca
+ 	}
+ }
+ 
++void to_gamma_lut_filter_line(const float *RESTRICT lut, const float *src, float *dst, unsigned left, unsigned right)
++{
++	unsigned vec_left = ceil_n(left, 4);
++	unsigned vec_right = floor_n(right, 4);
++
++	for (unsigned j = left; j < vec_left; ++j) {
++		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++		dst[j] = lut[_mm_cvtsi128_si32(x)];
++	}
++	for (unsigned j = vec_left; j < vec_right; j += 4) {
++		__m128i x = _mm_castps_si128(_mm_load_ps(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++#if SIZE_MAX >= UINT64_MAX
++		uint64_t tmp = _mm_cvtsi128_si64(x);
++		dst[j + 0] = lut[tmp & 0xFFFFU];
++		dst[j + 1] = lut[(tmp >> 16) & 0xFFFFU];
++		dst[j + 2] = lut[(tmp >> 32) & 0xFFFFU];
++		dst[j + 3] = lut[tmp >> 48];
++#else
++		uint32_t tmp0 = _mm_cvtsi128_si32(x);
++		uint32_t tmp1 = _mm_cvtsi128_si32(_mm_shuffle_epi32(x, _MM_SHUFFLE(3, 2, 0, 1)));
++		dst[j + 0] = lut[tmp0 & 0xFFFFU];
++		dst[j + 1] = lut[tmp0 >> 16];
++		dst[j + 2] = lut[tmp1 & 0xFFFFU];
++		dst[j + 3] = lut[tmp1 >> 16];
++#endif
++	}
++	for (unsigned j = vec_right; j < right; ++j) {
++		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++		dst[j] = lut[_mm_cvtsi128_si32(x)];
++	}
++}
++
+ 
+-class LutOperationSSE2 final : public Operation {
++class ToLinearLutOperationSSE2 final : public Operation {
+ 	std::vector<float> m_lut;
+ 	unsigned m_lut_depth;
+-	float m_prescale;
+ public:
+-	LutOperationSSE2(gamma_func func, unsigned lut_depth, float prescale, float postscale) :
++	ToLinearLutOperationSSE2(gamma_func func, unsigned lut_depth, float postscale) :
+ 		m_lut((1UL << lut_depth) + 1),
+-		m_lut_depth{ lut_depth },
+-		m_prescale{ static_cast<float>(prescale) }
++		m_lut_depth{ lut_depth }
+ 	{
+ 		EnsureSinglePrecision x87;
+ 
+@@ -95,9 +153,31 @@ class LutOperationSSE2 final : public Operation {
+ 
+ 	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
+ 	{
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[0], dst[0], left, right);
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[1], dst[1], left, right);
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[2], dst[2], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[0], dst[0], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[1], dst[1], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[2], dst[2], left, right);
++	}
++};
++
++class ToGammaLutOperationSSE2 final : public Operation {
++	std::vector<float> m_lut;
++public:
++	ToGammaLutOperationSSE2(gamma_func func, float prescale) :
++		m_lut(static_cast<uint32_t>(UINT16_MAX) + 1)
++	{
++		EnsureSinglePrecision x87;
++
++		for (size_t i = 0; i <= UINT16_MAX; ++i) {
++			float x = bit_cast<float>(static_cast<uint32_t>(i << 16));
++			m_lut[i] = func(x * prescale);
++		}
++	}
++
++	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
++	{
++		to_gamma_lut_filter_line(m_lut.data(), src[0], dst[0], left, right);
++		to_gamma_lut_filter_line(m_lut.data(), src[1], dst[1], left, right);
++		to_gamma_lut_filter_line(m_lut.data(), src[2], dst[2], left, right);
+ 	}
+ };
+ 
+@@ -109,7 +189,7 @@ std::unique_ptr<Operation> create_gamma_operation_sse2(const TransferFunction &t
+ 	if (!params.approximate_gamma)
+ 		return nullptr;
+ 
+-	return ztd::make_unique<LutOperationSSE2>(transfer.to_gamma, LUT_DEPTH, transfer.to_gamma_scale, 1.0f);
++	return ztd::make_unique<ToGammaLutOperationSSE2>(transfer.to_gamma, transfer.to_gamma_scale);
+ }
+ 
+ std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFunction &transfer, const OperationParams &params)
+@@ -117,7 +197,7 @@ std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFun
+ 	if (!params.approximate_gamma)
+ 		return nullptr;
+ 
+-	return ztd::make_unique<LutOperationSSE2>(transfer.to_linear, LUT_DEPTH, 1.0f, transfer.to_linear_scale);
++	return ztd::make_unique<ToLinearLutOperationSSE2>(transfer.to_linear, LUT_DEPTH, transfer.to_linear_scale);
+ }
+ 
+ } // namespace colorspace
+diff --git a/test/colorspace/x86/colorspace_sse2_test.cpp b/test/colorspace/x86/colorspace_sse2_test.cpp
+index d5130868..ecaa05e7 100644
+--- a/test/colorspace/x86/colorspace_sse2_test.cpp
++++ b/test/colorspace/x86/colorspace_sse2_test.cpp
+@@ -53,9 +53,9 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
+ 			"162687e701627cdc17283a32c36ea711d28a953e"
+ 		},
+ 		{
+-			"492587e7ed75b7e3ab868bead6ade7a4137c6ea1",
+-			"3b0694e9fbce61466cb5a575f300d784089b6cad",
+-			"b68f103f52ccafae867d664d7f27fe56ae9208af"
++			"95f2715bd0d417028bebd5c5377180fcd5b01119",
++			"76f7c88b198f1ab08167f8162c1237b54f22007a",
++			"1099c3ae187c0a9f79acb9445761b6056218c779"
+ 		},
+ 		{
+ 			"4c0b5ffe768a7812d1ef102b4d8d52614838bc8e",
+@@ -63,13 +63,13 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
+ 			"85a277a80dfca2e21789cedd76aaee307dbc4562"
+ 		},
+ 		{
+-			"df546ce0ad6f859499a96d2d697d896067e60e38",
+-			"f0041b8a008ab45f0ea1319090ac7e8be0990d92",
+-			"06880efb598e41f96fa79e04dbdfcccd50d6dc6f"
++			"5e35786d313e936566d9873ba7a08a8d6005b2ee",
++			"829fa88acfbbb26801871bf3cadf5cc2eb6830c9",
++			"f82fcad18a19b548d419a1952b6a7a423a684b62"
+ 		},
+ 	};
+ 	const double expected_tolinear_snr = 80.0;
+-	const double expected_togamma_snr = 40.0;
++	const double expected_togamma_snr = 60.0;
+ 
+ 	SCOPED_TRACE("tolinear 709");
+ 	test_case({ MatrixCoefficients::RGB, TransferCharacteristics::REC_709, ColorPrimaries::UNSPECIFIED },
diff --git a/media-libs/zimg/zimg-2.7.5.ebuild b/media-libs/zimg/zimg-2.7.5.ebuild
index 1775f6b60bbb..7bac59befc36 100644
--- a/media-libs/zimg/zimg-2.7.5.ebuild
+++ b/media-libs/zimg/zimg-2.7.5.ebuild
@@ -1,36 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
-fi
-
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="Scaling, colorspace conversion, and dithering library"
-HOMEPAGE="https://github.com/sekrit-twc/zimg"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
+	inherit git-r3
+else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
+inherit autotools multilib-minimal
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 LICENSE="WTFPL-2"
 SLOT="0"
 IUSE="static-libs cpu_flags_x86_sse"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-sse2.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
-src_configure() {
-	autotools-multilib_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_sse x86simd)
 }
diff --git a/media-libs/zimg/zimg-2.8.ebuild b/media-libs/zimg/zimg-2.8.ebuild
new file mode 100644
index 000000000000..d20d4bf58406
--- /dev/null
+++ b/media-libs/zimg/zimg-2.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+inherit autotools multilib-minimal
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable cpu_flags_x86_sse x86simd)
+}
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
index fe1991fc9e05..d20d4bf58406 100644
--- a/media-libs/zimg/zimg-9999.ebuild
+++ b/media-libs/zimg/zimg-9999.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
-
-inherit autotools-multilib ${SCM}
+inherit autotools multilib-minimal
 
 DESCRIPTION="Scaling, colorspace conversion, and dithering library"
 HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
-if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-
 LICENSE="WTFPL-2"
 SLOT="0"
 IUSE="static-libs cpu_flags_x86_sse"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_prepare() {
+	default
+	eautoreconf
+}
 
-src_configure() {
-	autotools-multilib_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_sse x86simd)
 }
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 5072348918e8..e4784a431b6b 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -3,5 +3,5 @@ AUX zita-convolver-3.1.0-makefile.patch 1283 BLAKE2B 14b6b799ff67218b482317ed64b
 DIST zita-convolver-2.0.0.tar.bz2 12858 BLAKE2B 1801681e799a85cd9a5b6d724ea3928e379bcd4cde1e01a39dc714e9480bdc0dfbf777aa4230c42190fc9e98ee3f842f34bf5c65a53744ff6b977c231194bb51 SHA512 5e12e8785e3b3161e42bb3a65e63ec4d4d2d6fa5c11960e0843f3985d76d4f24d7a1d979d0a092dd0c5407b817b66e799da211fa0f7eb96f581ffc56950135ce
 DIST zita-convolver-3.1.0.tar.bz2 21485 BLAKE2B 7976bac136bef04091b76b55fd4afd5a18c7f269c1dbce8875bc7c8a50b652f3c2ddd3c5e71ae26896d906a17b78f2bcfab129c078c1d60f8871c9509bb173d7 SHA512 0003d4fffcc07b3e67d54996a63db35d537d97b26003e06afbeed19fba551d552d4d5a808a86b5c600f5254816c6b26db49f48e13bfa3c77d93d61956c479eb9
 EBUILD zita-convolver-2.0.0-r1.ebuild 958 BLAKE2B 29d71ecce58a60f5ccd52484fdaa6908a7bd0c65f5bb6e6c4b817f713fc49238847e43483e9e614141795626f8d64c0903e22e8cb1934e0cbab299d580cb8d00 SHA512 9a5d86ff5ebac7b440541e5d314c7ee0a87bc17c3a9b2f9c5b454203064cf15d0b4bedac91b1d50211285536391c866bf648f2f4f753557c5aa91ec49b74cbb4
-EBUILD zita-convolver-3.1.0.ebuild 999 BLAKE2B ad058daac14e1207521e1c00c11c246f81d4f4b8909b7d75bd5f83bda380fc4c236ef603cc8b0670d06a845fc29d3ed77e92f9ec64f1488141aa0559cc37edad SHA512 939556a6df4a88960ae18f819a2030acb6d8956bc8d7d6790d0aad31e11b46927e1d01d75daefa767e1399006e06795718687dffebbd2cff9598dfd4fb562169
+EBUILD zita-convolver-3.1.0.ebuild 1004 BLAKE2B 323f97cf35298f0803d54ca880f1ea9579d7ecd5bc5ce691f211188d0ce6405490f24a900c2038f4e6b1a1678e4c592c70965270f7678c2dd739f52331f6c8bf SHA512 8a56f6073c521e046299cb73b9fb6a91e8f4588e7f2b2d55160be83c4f55a09733c86ab847e111d794bc4d960e89e2dc608f206619b972bd9115f0ff72e0e525
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
index b4dbf0668a5a..22c6eb0b7048 100644
--- a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
+++ b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="cpu_flags_x86_sse"
 
 RDEPEND="sci-libs/fftw:3.0="
diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index 4458355d2925..2e480cb6a415 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,4 +1,4 @@
 AUX tests-gcc7.patch 677 BLAKE2B 23258f8fd35fd650524b8b79a324206e73ae8921792898f3b57ad9f2412b79517e4bdd9925ebb997b5066dacdad3d9c480ac8cd54d65b7eba44219ecd2f91f9b SHA512 88e19bbb5e81f506dc031a2d8c2232396840784d3b22cdc67f8358792020c060432881c3a8ca126a96e779f83a12dd8209d7691c14cd2857a536dc0c84f3f074
 DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
-EBUILD zvbi-0.2.35-r1.ebuild 1326 BLAKE2B 3a945e690fd0d86e3bc110da2b8700c0095d9cf6ee493e13c2aae46bc2d2ac37aa9367f2b94fcecfa380b4151f8670ad87114cadc6872e448ec509b6ce9cc793 SHA512 32ec6b24ea5f6d601bbed14d69d4c97c6641025800cf4b4b6747ef1f62643dfa5394cbfacd45d94913b627d10d0712134a37d45700c4d2658cebf5f1504d2d60
+EBUILD zvbi-0.2.35-r1.ebuild 1322 BLAKE2B 05e20cd52c5b3f5071bd06b081cb6ef04bc7bc322ce91ab254a5ae0be94f9153a6daf5ff6aa22d492806277e9ea18198664a162b373a097f2217d86297b6f2a4 SHA512 e4fb50f210d9beee3ec657a4546ba52f61f8c33851a3eb4c9d2c4d79846ccf784285b9c69d043500846a9759f00244d24af8d94f89de9029cd08ec17841af658
 MISC metadata.xml 244 BLAKE2B 55571cd41428f715036d3a2362fed34732d4e7508383a83799d507ec234175db13ca329b3c7b53487a3775149a8f16d26ea027ce67eba4bd8015a74810082cb1 SHA512 af9d2d89aee60846c292c11e0b2615eaedac9dddde3ff9ad6d4869892bd078ee0a16f8b87e17360d2c82561dd36c3c22bcd110e63835f4cba593e4f5f35db1a5
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index 3f634ef235c7..8b2f9be52bee 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc dvb nls static-libs v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /media-libs
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)