From 79599515788b85b18aa655e7b7f8cc05c1bbddd8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 16 Feb 2019 12:59:29 +0000
Subject: gentoo resync : 16.02.1018

---
 media-libs/Manifest.gz                             | Bin 66396 -> 66411 bytes
 media-libs/aubio/Manifest                          |   3 +
 media-libs/aubio/aubio-0.4.9.ebuild                | 126 +++++
 media-libs/aubio/files/aubio-0.4.9-docdir.patch    |  20 +
 media-libs/clutter-gst/Manifest                    |   4 +-
 media-libs/clutter-gst/clutter-gst-3.0.26.ebuild   |   3 +-
 media-libs/clutter-gst/clutter-gst-3.0.27.ebuild   |  57 +++
 media-libs/gexiv2/Manifest                         |   2 +-
 media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild         |   2 +-
 media-libs/giflib/Manifest                         |   3 +
 media-libs/giflib/files/giflib-5.1.6-gentoo.patch  |  16 +
 media-libs/giflib/giflib-5.1.6-r1.ebuild           |  78 ++++
 media-libs/grilo/Manifest                          |   2 -
 media-libs/grilo/grilo-0.2.15.ebuild               |  86 ----
 media-libs/kvazaar/Manifest                        |   2 +-
 media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild         |   2 +-
 media-libs/libXcm/Manifest                         |   2 +-
 media-libs/libXcm/libXcm-0.5.4.ebuild              |   2 +-
 media-libs/libaom/Manifest                         |   4 +-
 media-libs/libaom/libaom-1.0.0-r1.ebuild           |   4 +-
 media-libs/libaom/libaom-9999.ebuild               |   4 +-
 media-libs/libcdaudio/Manifest                     |   2 +-
 media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild |   4 +-
 media-libs/libdvdread/Manifest                     |   4 +-
 media-libs/libdvdread/libdvdread-6.0.1.ebuild      |  44 ++
 media-libs/libdvdread/libdvdread-9999.ebuild       |   8 +-
 media-libs/libffado/Manifest                       |   9 +-
 .../libffado-2.4.0-additional-py3-fixes.patch      |  96 ----
 .../files/libffado-2.4.0-crossbar-router-fix.patch |  11 -
 .../files/libffado-2.4.0-py3-pyqt5-fixes.patch     | 197 --------
 .../libffado-2.4.0-pyqt5-dbus-detection.patch      |  30 --
 .../files/libffado-2.4.0-rme-bigendian-fix.patch   |  50 --
 media-libs/libffado/libffado-2.4.0.ebuild          | 119 -----
 media-libs/libffado/libffado-2.4.1.ebuild          |   4 +-
 media-libs/libggiwmh/Manifest                      |   2 +-
 media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild     |   4 +-
 media-libs/libmetalink/Manifest                    |   2 +-
 media-libs/libmetalink/libmetalink-0.1.3.ebuild    |   2 +-
 media-libs/libsfml/Manifest                        |   8 +-
 media-libs/libsfml/files/libsfml-2.2-no-docs.patch |  15 -
 .../libsfml-2.4.2-no-install-extlibs-mingw.patch   |  74 ---
 .../libsfml/files/libsfml-2.4.2-pkg-config.patch   | 217 ---------
 media-libs/libsfml/libsfml-2.4.2-r2.ebuild         |  84 ----
 media-libs/libsfml/libsfml-2.4.2.ebuild            |  73 ---
 media-libs/libsfml/libsfml-2.5.1.ebuild            |   2 +-
 media-libs/libsidplay/Manifest                     |   2 +-
 media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild   |   2 +-
 media-libs/libwmf/Manifest                         |   2 +-
 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild         |   7 +
 media-libs/mesa/Manifest                           |   4 +
 media-libs/mesa/mesa-19.0.0_rc3.ebuild             | 515 +++++++++++++++++++++
 media-libs/mesa/mesa-19.0.0_rc4.ebuild             | 515 +++++++++++++++++++++
 media-libs/sampleicc/Manifest                      |   4 +-
 media-libs/sampleicc/sampleicc-1.6.6.ebuild        |  31 --
 media-libs/sampleicc/sampleicc-1.6.8.ebuild        |   2 +-
 media-libs/taglib/Manifest                         |   7 +-
 .../files/taglib-1.11.1-CVE-2017-12678.patch       |  30 --
 media-libs/taglib/metadata.xml                     |   3 -
 media-libs/taglib/taglib-1.11.1-r1.ebuild          |  58 ---
 media-libs/taglib/taglib-1.11.1_p20181028.ebuild   |   2 +-
 media-libs/vidstab/Manifest                        |   3 +-
 ....1.0-fix-test_motiondetect-without-openmp.patch |  26 ++
 media-libs/vidstab/vidstab-1.1.0-r1.ebuild         |   3 +-
 media-libs/webrtc-audio-processing/Manifest        |   2 +-
 .../webrtc-audio-processing-0.3.1.ebuild           |   4 +-
 media-libs/x264/Manifest                           |   2 +
 media-libs/x264/x264-0.0.20190214.ebuild           |  58 +++
 67 files changed, 1526 insertions(+), 1239 deletions(-)
 create mode 100644 media-libs/aubio/aubio-0.4.9.ebuild
 create mode 100644 media-libs/aubio/files/aubio-0.4.9-docdir.patch
 create mode 100644 media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
 create mode 100644 media-libs/giflib/files/giflib-5.1.6-gentoo.patch
 create mode 100644 media-libs/giflib/giflib-5.1.6-r1.ebuild
 delete mode 100644 media-libs/grilo/grilo-0.2.15.ebuild
 create mode 100644 media-libs/libdvdread/libdvdread-6.0.1.ebuild
 delete mode 100644 media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
 delete mode 100644 media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch
 delete mode 100644 media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch
 delete mode 100644 media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch
 delete mode 100644 media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch
 delete mode 100644 media-libs/libffado/libffado-2.4.0.ebuild
 delete mode 100644 media-libs/libsfml/files/libsfml-2.2-no-docs.patch
 delete mode 100644 media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch
 delete mode 100644 media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch
 delete mode 100644 media-libs/libsfml/libsfml-2.4.2-r2.ebuild
 delete mode 100644 media-libs/libsfml/libsfml-2.4.2.ebuild
 create mode 100644 media-libs/mesa/mesa-19.0.0_rc3.ebuild
 create mode 100644 media-libs/mesa/mesa-19.0.0_rc4.ebuild
 delete mode 100644 media-libs/sampleicc/sampleicc-1.6.6.ebuild
 delete mode 100644 media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
 delete mode 100644 media-libs/taglib/taglib-1.11.1-r1.ebuild
 create mode 100644 media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
 create mode 100644 media-libs/x264/x264-0.0.20190214.ebuild

(limited to 'media-libs')

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4cb5ecb2f246..7dd06ac2cc53 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index f1d894f61c3f..f9f6541e7748 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,6 +1,9 @@
 AUX aubio-0.4.8-docdir.patch 1022 BLAKE2B 23c1a5060dcfd3e98d5464e50a4828807c482004dbc907fe708748f126b6b0341d98188d3d56dba6fdf800da548af5cb0d770ce8fb3e0fad5f1fb789523fed63 SHA512 1ab8b18daba024e2a2f7e605409176d1380bc3d4b6117ede7b9f480bf7bffa20d79fb2b160c976d9536ff5f57c3026c85a0228e7df63ac3a9b60135e855f045c
+AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316781d3534c63194c9bef214574f195d3dfb949fc357862c7ddab01e0f9bb58ea54a75dac4c90f27a24f0c1cf477 SHA512 dffe872bd5c63eb874f00b1303e63f241d9b349d5f32fbf34b659b6211cc9cc828784bb3f5ddd2210c9e6b8459a73e842988bad4474b19e319145971de138526
 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
 DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
+DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 EBUILD aubio-0.4.7.ebuild 2450 BLAKE2B 975c2121ba3b505134e3b079e8654f77d16902e2fe6c31b158577922e3a2332909ff78f3eb04e16eef14039e1fdb4ead67a949eecc6f166f5efaf69a17bfc5c9 SHA512 7f26d97bf9de42e2429f797c3af73079a3105822ded2550fcf2852c5e6807fc4b60e9dd1688ef97aed1389161bde2544c94360f9fb82dfd92ba23d072ff90f8d
 EBUILD aubio-0.4.8.ebuild 2521 BLAKE2B d47d0ed05b3c03db6aa943ade15fa1715fda088e206d958ed257f451373353fa7d802dc3ee8c4223e3b16bd6151641d917af1faf32e125c8e12c47575b62073d SHA512 31883798430b6682e73f1ca2d05c5214aa54b0eb39f10886dd78278541487d6e610865af14509ab6621f87940e129894fd8229303b0c1f748b1dc2ada3222b5d
+EBUILD aubio-0.4.9.ebuild 2521 BLAKE2B 1d9eaaf1a7eea1666cd8c643a79d371010af0810643013a99f8d533ae0655cbfea7677c1a374d5eec919e45211f54610e7a238b4f84e7937bc2c03fd6419658d SHA512 69a9185e4db7f174e7a8c5c5035ca95124fb8922c3a49965e31dfce113ddca1342107eaaa88626fe15a675f4beab402effbc6c0604f6e795666c1d0f435ea5a7
 MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
new file mode 100644
index 000000000000..89c6112ddc2c
--- /dev/null
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1 waf-utils
+
+DESCRIPTION="Library for audio labelling"
+HOMEPAGE="https://aubio.org/"
+SRC_URI="https://aubio.org/pub/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test"
+
+RDEPEND="
+	ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-2.6:0= )
+		libav? ( >=media-video/libav-9:0= )
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	jack? ( virtual/jack )
+	libsamplerate? ( media-libs/libsamplerate )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	sndfile? ( media-libs/libsndfile )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/txt2man
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( double-precision libsamplerate )
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+PYTHON_SRC_DIR="${S}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.9-docdir.patch
+)
+
+src_prepare() {
+	default
+	sed -e "s:doxygen:doxygen_disabled:" -i wscript || die
+
+	if ! use test; then
+		sed -e "/bld.*tests/d" -i wscript || die
+	fi
+}
+
+src_configure() {
+	python_setup
+	local mywafconfargs=(
+		--enable-complex
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable double-precision double)
+		$(use_enable fftw fftw3)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable sndfile)
+	)
+	use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) )
+
+	waf-utils_src_configure "${mywafconfargs[@]}"
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	waf-utils_src_compile --notests
+
+	if use doc; then
+		cd "${S}"/doc || die
+		emake dirhtml
+	fi
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	waf-utils_src_compile --alltests
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		distutils-r1_src_test
+	fi
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use examples; then
+		# install dist_noinst_SCRIPTS from Makefile.am
+		dodoc -r examples
+	fi
+
+	if use python ; then
+		cd "${PYTHON_SRC_DIR}" || die
+		DOCS="" distutils-r1_src_install
+		newdoc python/README.md README.python
+	fi
+
+	if use doc; then
+		dodoc doc/*.txt
+		docinto html
+		dodoc -r doc/_build/dirhtml/.
+	fi
+
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/aubio/files/aubio-0.4.9-docdir.patch b/media-libs/aubio/files/aubio-0.4.9-docdir.patch
new file mode 100644
index 000000000000..258e56a29b1d
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-docdir.patch
@@ -0,0 +1,20 @@
+--- aubio-0.4.9/wscript
++++ aubio-0.4.9/wscript
+@@ -557,7 +557,7 @@
+                 target = bld.path.find_or_declare('api/index.html'),
+                 cwd = bld.path.find_dir('doc'))
+         # evaluate nodes lazily to prevent build directory traversal warnings
+-        bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/api',
++        bld.install_files('${DATAROOTDIR}/doc/' + os.environ['PF'] + '/libaubio-doc/api',
+                 bld.path.find_or_declare('api').ant_glob('**/*',
+                     generator=True), cwd=bld.path.find_or_declare('api'),
+                 relative_trick=True)
+@@ -582,7 +582,7 @@
+                 source = bld.path.find_dir('doc').ant_glob('*.rst'),
+                 target = bld.path.find_or_declare('manual/index.html'))
+         # evaluate nodes lazily to prevent build directory traversal warnings
+-        bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/manual',
++        bld.install_files('${DATAROOTDIR}/doc/' + os.environ['PF'] + '/libaubio-doc/manual',
+                 bld.path.find_or_declare('manual').ant_glob('**/*',
+                     generator=True), cwd=bld.path.find_or_declare('manual'),
+                 relative_trick=True)
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index ab2ebce30efd..441cbc66439e 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,5 @@
 DIST clutter-gst-3.0.26.tar.xz 402976 BLAKE2B 41a8da175c7b99e9072e76cd0fe8c89050a3b8a11c6c3e7887c1fc466e57d9e9a4f3c2efbc030dc3da51eebc54d56ec1702298bb04081f0a6a169f4f94fbb01c SHA512 c1dca7b6fb7756dd1642e176b2d26f28330388283623c46350a8c979f3dd4af916a9807dfe4937ebd9f747f781a7dad4f0f8eea74ba8423c32bd92610eebcbc7
-EBUILD clutter-gst-3.0.26.ebuild 1449 BLAKE2B 487d89353835d667e0cafebb30a4d1fbae7578e8729ef1da573707791f2ce1362bff6661cfab5fde273abe005b3e826ef8b7818224f4e270f60ee1b2ab566781 SHA512 0342b96a22002ba8a57be7a714e29fc8dbbeb80793b4203d4aa7b98e3f0e20a93ab50d68a0857a2eef848222f12aba38a1389c2f502601ee606dccc08385ac8e
+DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
+EBUILD clutter-gst-3.0.26.ebuild 1467 BLAKE2B 5433ba13390dafccc72989838ee5a991f935e473e932e1a045536ef7a79518b5cb40dea9411fa321088054974a132e85d214e6b3e223f764b5830f8c366c6120 SHA512 a6df80f8d18e661ff98aaa715c961beb57f0f7815e4a7750eb7aa2311568745c8d2b59673a6eb7f0cc6df7abb1c7e34928228af755f9fc06398ccc4ab858bd1f
+EBUILD clutter-gst-3.0.27.ebuild 1469 BLAKE2B f17ee323129f81c22a85baa95a7ed9bb3dd21338cc4652bc7cf14af25c7f40bc02bdbaf0b1ed03aff5597ed18ff3b6dc8038d08d23057902f76b55a9e6c3b2ae SHA512 039c2a7b90d0ecdfb436ad5ea29ad8c2e5ab82dcdd15ff340196ba11be29e25e077d63b1d19819cdc81eb83f67f4d78b646c6ba4f6784f8ff3a63c5d2a6b487a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild
index 9458d0f7985a..0de022907bbd 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.26.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
@@ -33,6 +33,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 "
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
new file mode 100644
index 000000000000..8d47b7020034
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X debug examples +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+COMMON_DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[X=,introspection?]
+	>=media-libs/cogl-1.18:1.0=[introspection?]
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+	udev? ( virtual/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+	!udev? ( media-plugins/gst-plugins-v4l2 )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# --enable-gl-texture-upload is experimental
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/{*.c,*.png,README}
+	fi
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index eb30bb772a0b..2525972cfe16 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -2,7 +2,7 @@ AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5df
 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
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.10-r1.ebuild 1849 BLAKE2B adfd16f0b6544c6338e79e3ff4861d7b0a4cebf4e8a4f3723b46f1d520ebfd7023fba9e288e9522386b360aa16baf418f4f5ea0b37ddd7cf3a5ca82d51322ef9 SHA512 8ce9769bfa7ac10146b408ca5425b27face26449c1e455e9019445e85aa3e46e3a9415e7f3a77e091540e01dd9e85295bf45c23fe67ec8bb053e3d4106e29b63
+EBUILD gexiv2-0.10.10-r1.ebuild 1848 BLAKE2B 5890b17d9026c3e76d817c1fd185e1cc1fbf963fb0be48d883c03020a66037cb5d5ef624b8f2ac4e6f412bb7af8147332982f87a291a1e591cdcfe085098744a SHA512 f346d86d6d13d8cb5c7f6ebfdea7077c0efa3b3d3e96b54d9bf16959eada3a862e3a1ed432a604af0ebfda3fdbb031e7751c932cff8e2eecb05161edb5eed879
 EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
 EBUILD gexiv2-9999.ebuild 1652 BLAKE2B 5a00ff2ccdd58025bdc614384e70975f871ea4c861ad7ec91ccdc5b942dc621ca4fcdbcefcf40e2016c548bd0874b168609dc1939ec54d4a13be163872f70bcd SHA512 b5d591aa541ec76e8aff3372b28815500815ca686ddca872ebbb3c6a082077e285a69b37794f676cb7b83dae5fe3a24531e35141b2f166ffd5702be2c0151a73
 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 9105b1a7b0d5..27e708f9ab3f 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/giflib/Manifest b/media-libs/giflib/Manifest
index 4b649e45cda9..3e8516945204 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,12 +1,15 @@
 AUX giflib-4.1.6-gif2rle.patch 764 BLAKE2B af377785f83dcd5c2c4382eb2d490ccc01000aa2a1ef8f306c7e0284857de02765a714fea73870ac6226331a88e422bd8afd3b0ec90b7f3e225bcabf079dc32e SHA512 6714906d49a0c285c1fb642a81c092378042ec06be6c4d7c586459e80bb010423fe4b9801124b71c945fd118d99432869bc180bfa32a6c3c29bcfb6b4c5a027f
 AUX giflib-4.1.6-giffix-null-Extension-fix.patch 693 BLAKE2B b0faee004c9cbb95839cb047de902500b1c46f6d3185fc061fb99b0759a57512cb030ca965bb927c68c642ecd72a714260c288b19d24404a6b4cb022ba41094b SHA512 9006c85529735a84afaddddbb06b25cb2b7eff64574edea693d75171c6b2bb7a666e498920a9abca2b28290e4c601b6eb6eecc6ea1b0e6b8602fd4a55863338f
 AUX giflib-5.1.4-reallocarray-export.patch 5668 BLAKE2B c2dc8b1f9ffa5ba5e3f50bd71ecb098331a97737e20f71ae88fa2b3a0aa27c9d3a83d72654692ad71edb7eb03aac00f7af21088eded85c3a0126e6893a4f583c SHA512 3635efc2b10adc01bb0ac70a99e8ac7dbe3dc1b2f03060ea449777078da2a1eb731f17299a9e239afb55e25777cae54de6ca12d9d069e513b03a9eb6402a6658
+AUX giflib-5.1.6-gentoo.patch 424 BLAKE2B 2d244e7e5311506a03dde36d83f14c9ff75533b60ac8be470c73786acf652d07774d7756bb342bb5373a515db090c3a3bab3abb10a87be09e97eb81cfe59e38a SHA512 88f133e4fabcbbca9151812f9a6e1676c41301175b6637502c5c2a2b888ad31975ebf4d28d77c0adaf7a854860f9979b7a45479542ed91fa72e97c3f705f2da4
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
+DIST giflib-5.1.6.tar.gz 391894 BLAKE2B e961236459d7312b41668f19cfb26006af0f0dc1a9741abee3f00d8eeba0dceebe5b03709dfc8170c1b73a6687dd926c5ef92ac2817fe78ab65160e8012d9044 SHA512 a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be
 EBUILD giflib-4.1.6-r2.ebuild 1383 BLAKE2B 564dfc8776afe92c076aa5bec6c8f58b985bd8b8c3b14621c9946aa8984047a6cf4ffe776a803199ac0417615dc2df270ec8b4b35683f3a657d92f4ccbd415a2 SHA512 71a6621273dd6341e25de0150aa7b194a1143b6e344ba2a77317fd72394f585fe232d9eee5dbd28242773ebaf26072119d5ebe93ae540d4054d7e1d64410059c
 EBUILD giflib-4.1.6-r3.ebuild 1482 BLAKE2B 98f35d4ceb7bafcc67b9d66d273ca0362a49e0be0e804c4665c9c723d7e04689429362611b35cf37bd2c9d5df29f422be541ef796f4cda58ec0e6877aa23f5c3 SHA512 752ba45f1c9650a9268c5c9e555f239ec8302549573f508d5c9ce0ba9a1461b8497cde8dfabf180cc6ad8aaca420931b9025188d4743c526c3bdceaa93c1c1ae
 EBUILD giflib-5.0.6.ebuild 1060 BLAKE2B 9ee4bc54795eeef8850a5a94129dfb8c73b979d8b1e2f827fe434bf5c9966b5580e4ff0d7946fab757bfcfc18bce87368c2f8ca903e4dfe6c927281c3535041f SHA512 7c0abe0f1450dbdb2b72239e7876f3d2b3e13292c0883c92af6f85a764dd4a14f3391d55b2a21313041f07eebcb086f3fb28141093794b9fbb501c650a59f5a0
 EBUILD giflib-5.1.4-r2.ebuild 1473 BLAKE2B d2b40ef189f9edad3003bbb734b056bdf50bfa626386efee79a7181c578dae4c3080739a8bf012e3a72d779fbc454f2609b46b6273b791fe6b844d2fc1128efa SHA512 d9a4bc42cdb3f8c5ddd47dae36eebbcbb488f4df2bf364c332dd8b576952c26c1fd241d2fd40df5af7938d15afeba4b5b73a41447f0c10795c80afcf4f0fe763
 EBUILD giflib-5.1.4.ebuild 1390 BLAKE2B 5e1719539fb2ee35bfc86c64c651534bf72057080c2f7d38e15df4ed4f6d5b7c91cea3ba55a47054455f9953a25c110733bb05e5b75da793c005d779a5dd3373 SHA512 f86b46958b2e977c56dfbd8df548d540a4b1873254abf4c6e1a69c24e696b4928a8f3d56145a545be3528497965e3e4898ab56fbdaf6b9d1c88d8066c170774d
+EBUILD giflib-5.1.6-r1.ebuild 1918 BLAKE2B 7a0219fd96c2862eb8b4087e25a03983c0f1abbfeb8321871ebc487c106b9d88a338c69231efd4561030f58c82dc65fed31b6a5204e48c86094d41f027e6c133 SHA512 b926b6da59cdbd55e3e741d808b11ac5ddc62b2756596349a1a800463e0c772baa7b36a1234591ba75b9d760abc16b1663fb70eaa5b32d57024dd8651c853d20
 MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
diff --git a/media-libs/giflib/files/giflib-5.1.6-gentoo.patch b/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
new file mode 100644
index 000000000000..c8432c205845
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
@@ -0,0 +1,16 @@
+--- giflib-5.1.6/Makefile
++++ giflib-5.1.6/Makefile
+@@ -61,12 +61,11 @@
+ LDLIBS=libgif.a -lm
+ 
+ all: libgif.so libgif.a $(UTILS)
+-	$(MAKE) -C doc
+ 
+ $(UTILS):: libgif.a
+ 
+ libgif.so: $(OBJECTS) $(HEADERS)
+-	$(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so $(OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
+ 
+ libgif.a: $(OBJECTS) $(HEADERS)
+ 	ar rcs libgif.a $(OBJECTS)
diff --git a/media-libs/giflib/giflib-5.1.6-r1.ebuild b/media-libs/giflib/giflib-5.1.6-r1.ebuild
new file mode 100644
index 000000000000..9f1609ae182b
--- /dev/null
+++ b/media-libs/giflib/giflib-5.1.6-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="https://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-text/xmlto )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.6-gentoo.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	# Use reallocarray() from libc if available.
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then
+		local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY"
+		sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
+		rm openbsd-reallocarray.c || die
+	fi
+
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
+		LDFLAGS="${LDFLAGS}" \
+		OFLAGS="" \
+		all
+
+	if use doc && multilib_is_native_abi; then
+		emake -C doc
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		MANDIR="${EPREFIX}/usr/share/man/man1" \
+		install
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+
+	if use doc && multilib_is_native_abi; then
+		docinto html
+		dodoc doc/*.html
+	fi
+}
+
+multilib_src_install_all() {
+	docinto
+	dodoc ChangeLog NEWS README TODO
+	if use doc ; then
+		dodoc doc/*.txt
+		docinto html
+		dodoc -r doc/whatsinagif
+	fi
+}
+
+multilib_src_test() {
+	emake -j1 check
+}
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index a7e1c613ef81..d13df54df4a8 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,3 @@
-DIST grilo-0.2.15.tar.xz 627196 BLAKE2B 3277f2588413e364835954f971c986451837b6992858d48273280d511a4d1ef4a8075924aaa3d4426818952e9f4d65c1b2dff7d3e255b2cbf30a8f73f740f91a SHA512 ac0a76d9075e5383fe1a56277b23986a8ec8e86f01f3f782ac7dc79539904712c22295c679243604b619f24088a1210622e0699b5601678264bd7651012ded3e
 DIST grilo-0.3.6.tar.xz 653864 BLAKE2B 58570975b2c4623b2a43b441c60d88146080327a86018bfd1a37967d35b6389e5102915296ceba1a8ebf23d27a3e4f8d23eeb59555a6c5cd0ca596b5ab674878 SHA512 175cf61a43aea8456a41f4dce7694fac50e854cf6340ed0671f233e6188fa34347c1e7308aac99bc49d081c36747776b9a8c1c5cc7c0be00a1df2c9d015d8849
-EBUILD grilo-0.2.15.ebuild 2168 BLAKE2B 194275416887ac3e9d0c02cc68bac9945f3d0b7b35967ea0322a8b3ad6fbf962feff735f02c761cf02eb89c2215880eda473bab60a87345ddd795374a1dce12a SHA512 a3c16193769a111bf219382eec548de6bde3088646c02c579a553f5adad9e8949791fb9d06547bb58aab1b67505965c39bb8063cdc708b549779fed31c7109d2
 EBUILD grilo-0.3.6.ebuild 2362 BLAKE2B 1e99d886f7a4b334366f0b579763e1ce0654a19fe80f410910e869b5698ce7534b776181971108327e7f1636c99d6cd1929c737d3f4eaae3d524a60956b75d32 SHA512 b7703ecad923fd1411e2be10596b028e0226b4d7e8fe1ea01c277aceb4b8c36ba29408a15b8b030967b4babb14b05015f5a3cf3c66013034d70d65a7af49f879
 MISC metadata.xml 484 BLAKE2B 56ca18d39e67d361c060c6b08bb8da562257cdf8a3f8ca208a745cc628ebd4607bb3bd84f2269d54c914fcd83123b152258ed888691c510b856d8f16f3eaf2ab SHA512 b72030308a92f0c105f71df30321e2aa52d7e7bedcaaa8a2ddc9eb42e4e70981f6015ee8d00c81e50ce6460ab91396742619b8962c95cf664125f283ecc4e229
diff --git a/media-libs/grilo/grilo-0.2.15.ebuild b/media-libs/grilo/grilo-0.2.15.ebuild
deleted file mode 100644
index 46a92486b6db..000000000000
--- a/media-libs/grilo/grilo-0.2.15.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.28"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 python-any-r1 vala
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk examples +introspection +network playlist test vala"
-REQUIRED_USE="test? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/libxml2:2
-	net-libs/liboauth
-	gtk? ( >=x11-libs/gtk+-3:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9:= )
-	network? ( >=net-libs/libsoup-2.41.3:2.4 )
-	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pygobject:2[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		media-plugins/grilo-plugins:0.2 )
-"
-# eautoreconf requires gnome-common
-
-python_check_deps() {
-	has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't build examples
-	sed -e '/SUBDIRS/s/examples//' \
-		-i Makefile.am -i Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		$(use_enable gtk test-ui) \
-		$(use_enable introspection) \
-		$(use_enable network grl-net) \
-		$(use_enable playlist grl-pls) \
-		$(use_enable test tests) \
-		$(use_enable vala)
-}
-
-src_install() {
-	gnome2_src_install
-	# Upstream made this conditional on gtk-doc build...
-	emake -C doc install DESTDIR="${ED}"
-
-	if use examples; then
-		# Install example code
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.c
-	fi
-}
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index aad0b16ee3a6..9b0913d64914 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,7 +3,7 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 EBUILD kvazaar-1.1.0.ebuild 1512 BLAKE2B 4f8f062035d7fb2fb5ecaafa6e76cfc7fae234cabd9cb572db8cb13c7fa505d6b46b8899656d35574af17f15e81bcf051f8d18e1be0faa12b1891209592e3ba5 SHA512 0f973ad261941f971e12a93dff71f9af57083657dbe666245cd11a004041f889d829e6a6af9a83b6ac176e7a285dfcd29fd41eb09eca6d6e2c0de6426ec2420e
-EBUILD kvazaar-1.2.0-r1.ebuild 1834 BLAKE2B 4663872f73d44e9dd504562db314ed947910165b0a86334949ac5d9b50bc334b60cb0d27dbcfb6c4886fd067a9e8c2942a86c1785e9a9c12c438a9af7ed8000c SHA512 3c1ab131fea7522c5aca42203e4a5bc21596c559b68983a6805c51c93d56f3625d7eab0490f37e2b56f661c22ddfc8b016c83c662f2c71d46d69d036fd07f013
+EBUILD kvazaar-1.2.0-r1.ebuild 1832 BLAKE2B 0b2871bfa3063a967b31e8b43f4fbc347fb8275e7ca7ee8afd1c966d74680da09667b8ee0d3baef1ec00ac2514d69cadc01ee13e01cdf30782455371467b3639 SHA512 42ef6a05a979d34d94845673f92d5da73b20fb566ba0b98409a11cefa91c32a9a470096baad397ec9992b6937ae09eae163c98233d978cb63f489fb4b46942d4
 EBUILD kvazaar-1.2.0.ebuild 1512 BLAKE2B 2796d4ddea69e3cf86892691aae9d908855b56a8149bf1684df9ffcd79a91fb00fc1db4c256dd1979255ef583eecbb948d3bf41dd936a95a39f4cfb8f929469a SHA512 f9acf71e411c915d7ef5192a49d0cf54e3a170a1f67e8aefd547e95f376e9465133959aa263a56bffd76aa45f38dfffdf3bcc8a3672fbd424d29f652295fae0a
 EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
 MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
index 0bcfc82138fc..f094a8160a9b 100644
--- a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/libXcm/Manifest b/media-libs/libXcm/Manifest
index 50b63641254d..e06bc29c8929 100644
--- a/media-libs/libXcm/Manifest
+++ b/media-libs/libXcm/Manifest
@@ -1,6 +1,6 @@
 DIST libXcm-0.5.2.tar.bz2 301813 BLAKE2B b8823058a44cf8f1800e9f451d3efc641f6f66e059511b03c61c980426995fcc2fcd30df2bea9c601784c823e97f60b3bd026643b461f876fd69e2314c4f5477 SHA512 4d67218206ba319cb768c055c44a0537468232c12fa463525993c578b5a5a8ee82fc55463ef5e34e85dda221facd2517372bc1920bd025e951337fa84c72f6ab
 DIST libXcm-0.5.4.tar.gz 397552 BLAKE2B 73fb9aa2e52f1b0a26108d6e07fc66afa9da6503aedd49a140692a467bf5665c4551ac34224f91305debb5e15384e29b93fd4a2ef9f233e0b4f5c6c0ab1bce27 SHA512 96d279aff907bbbe4e38d099b79ebbc3b3beaf242be296d10a16e36e721669086ae0b5252f5abc629cc1fd65e595e2eec70bb890ea6ca4bbd08e8ce91cb05b53
 EBUILD libXcm-0.5.2-r1.ebuild 749 BLAKE2B 10ff2e93e6ab4f85c029372ba3174ce1f59ca8a514b219e389e882ca10bcc994b23eb694a3ca7dc9663c0da8f1579afd8df9beca83f2af2af73d37f1f814fc5a SHA512 e1d56e7924177e9a512aa37f5253ae42f55d282be9d4c0f11572bf1fefa2db761d42f63435d724393eb70d5e50c78b90ee8ffaceb7d129d6289e0f707de85918
-EBUILD libXcm-0.5.4.ebuild 1053 BLAKE2B afa15538bb8aa8df441f9c65e1229db697143d9fa796aa78b9f342b9fd3187231a4f98784595155972bd195990edc3287179051a08444ad2736e0e4b811f337f SHA512 98a1fccf557135ea14f533222a7a09b767111e5dba31e33cdc2a3e0d0dee0c9b689dabcf7c67f79a5d1e50ed8fbb913c8c0c6e9169daa1ad3b2747efc9a2ead2
+EBUILD libXcm-0.5.4.ebuild 1052 BLAKE2B c1679da44d33e3fee75568fa4c95e294ba6b3e5d84507e1cec1d73e614d1a6d0d29099ad2a392291f5e8167080df61a82e25150f49077f99b92e0da791732874 SHA512 16db8efc5a49bd2e7ff988fa91e229f82744ed8f1973c4efcb0579c64150d2a51ff54784cb671dbcd4dfade1a2b4fb7a7df92e3b03a29a0e27bbd77a2d0c0edf
 EBUILD libXcm-9999.ebuild 1041 BLAKE2B 1ed9d2b456497ef69475c45cad8890fccbad63ab4cdb6fcd9b210e0c19290b2ea382344289138ed2f16f02fe6f77642f5f478c3ba66c267347113fd4d701e055 SHA512 0bb7a0c19467c9546624c9e4f279f00b634317b748a93aa2e1f316284f42e8826686d3e4aeafd453e1f56d3472d6a78486fff00e5e2a000d82841511767d4c6e
 MISC metadata.xml 302 BLAKE2B c089ace165b933d9f27e066196f28ed5b5cfad718090384a2bb49c7872f3cb3b9af85d4944b4ec9af0f596daf6fd172963ba797fc57eda5573548d74cce8bd90 SHA512 5d4afa6ae4e9df290f007c047159be9103f78e839ab183ee77b87784a3ce78ddaebb11ba8d8e29b65fd2ec1d65b0900a1162178acdd1ab796024ac06f1e60282
diff --git a/media-libs/libXcm/libXcm-0.5.4.ebuild b/media-libs/libXcm/libXcm-0.5.4.ebuild
index 108151718e7c..6b32b12415f0 100644
--- a/media-libs/libXcm/libXcm-0.5.4.ebuild
+++ b/media-libs/libXcm/libXcm-0.5.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="static-libs X"
 
 RDEPEND="
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index ecbd56bc086a..6429bdad3736 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -3,7 +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 2459 BLAKE2B e48e2f0bbfd18308ab35b03751a0c12890f627f249009f6de28e3cb05b5ac68b8748d8afd25b7b9b5f5df25a27d35e99799c07cd133c60b719a6d3197f21b321 SHA512 d4f283ae4754be5fc4d21cc084c3cf0df8999b58220445665b1ad9a3ebfbe0fdafd73e727d6ceb64136901f6dcc8dd2ebf134e0b4e90723ac44073102be816f7
+EBUILD libaom-1.0.0-r1.ebuild 2466 BLAKE2B 5ed688c58047191f2bce0c78b8edb0875eee61abc6014c4a6aba8cbb3ed9e3912b40b29db24a200a5c7570e36cde4e0b4f3ffe64a779004601be23ccdf38ba9a SHA512 43b7859a4beb1d3db5524d3d1fa831499199a8a6ffd344ee19409dfe632b73e661bfe44bb8256c77ded089467ea24a8f1b7d5ad4e522d863925b5f287abf8295
 EBUILD libaom-1.0.0.ebuild 2383 BLAKE2B 6974b5229b63d0960b99f95f74c4c59fc927d54864a8f61776b647119de2cbba586de0d370a173569b78b00ea6cb212a66ec05293b8850e4bcc605bdf48e486d SHA512 e583e80d48afeee67d889a5fec76a850f7554937d480159f9746378ba2b94f8553735431fd874dccb75fe7c9c4e03e716716a4c7c4887c6c57871eb75ba24508
-EBUILD libaom-9999.ebuild 2369 BLAKE2B f3fab7bda7c1aaaeab7dfb6cc3da7ddec3e1176e48a48a912b0e11a8206ce3ee3200993b94fb00759f3b75e701659157f15b7fdca2208d7d1d07a59f75969409 SHA512 7f7d1450f4f7c1bd605c86f0d0900b50d1773a7f19b2da3efb6f1077f46acc1912c7c5635010ba57661cacf5cef436040f3257d817812ce538b3f5785d03a965
+EBUILD libaom-9999.ebuild 2373 BLAKE2B 6ff9a52b932ea269cc2b3a81f13c5826b900f4f0d88b0e30f3d0b2ea71245076ace4eee21611cc709caac4ca7adeb4e4c87cdbc3e1610a24cc386b18227349bd SHA512 665b627406b26f0d21b955cc36939d2c38231fe17a16f9567a3dc5311bdc567cf744b0fc7d0b1447e640ada532738e8aa7910add47161db68f0e457f86dbcda5
 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 d29476c90dbb..33f1019f49ff 100644
--- a/media-libs/libaom/libaom-1.0.0-r1.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-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=6
@@ -16,7 +16,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~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-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index eaba897ff301..e0f9c64ac4f3 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.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
@@ -16,7 +16,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index a65b4c498743..f89d3f2433f4 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -2,5 +2,5 @@ AUX libcdaudio-0.99-CAN-2005-0706.patch 457 BLAKE2B d1bf9fdd84e8fd66e4e66383c69a
 AUX libcdaudio-0.99.12-bug245649.patch 307 BLAKE2B 690a57ec23e24040b590b93cbff6d443f8d34a273fdb63b9aa0487cc2d3b787c6ca06294641cde3dc669dd26bf4eeda70c8e979b0400cb63793c40d59f49b3ef SHA512 693a43f3c09fa09425f06103cf2d52fbc2351fee1d37948f725103768f7f063384339e518a81be10e71d0e275582daecf5ec64aa12f12f72f370e46e4437bf33
 DIST libcdaudio-0.99.12.tar.gz 357150 BLAKE2B 406dcdeb801237e9aa88934bd7ca39bad0b121641de198b65a4137ff1d25500954f12f7f86b78912098a7acda3afb188a5965b69e99ccb0a84441b3bf1931327 SHA512 c00fbea7776e847da93bfbf4cbe74ccb3ee826da80e74eef84575fc211729e6a09599f5bfa332c91d678a31f9de5e5b333bdafe51438f266f6dea519652f5247
 EBUILD libcdaudio-0.99.12-r1.ebuild 731 BLAKE2B aef7f96f1d14a2bbf52c08f8021465a8b0853bf966ceb93302d3e3db714c11b8240b5f626b9c70563985401eb8d89c963164ce333533ff8cb003a72d8f5b7c93 SHA512 31e1a6c552b11db011297bf2da756996551beca58d117383241abc96ad6bf68d0f4390a5f2b6ea7477e4979133723634261d0a9b9fa488138921f043b4902e2b
-EBUILD libcdaudio-0.99.12-r2.ebuild 523 BLAKE2B f457d7002c73c0700a2e959154fac404cf445b8357b92a458576b6c0b21cf0f13cfef6a71bea0f59466ee68d172a932e9520de94d3d330ca440f294466720c68 SHA512 de11c25e776565f185d32afb2553587af2db815fdc6b91e47abd3ae2b728d3a26d66e02a3de6b2deaa74e1156eb3265f1261094ab6b5fbc4d70edbf131002127
+EBUILD libcdaudio-0.99.12-r2.ebuild 514 BLAKE2B db7dca1e534517d6cd0218a4a863b8e4ccbc439dee74c02a83e8f46bc726bef1914bf0c3168c5ea1d09b84511163372dc029e9b70cf085685e101a49c66c8300 SHA512 be3c0974d481f6d29eb3294e2766c9556bb80e740effcf7652295d4e266f09fad21691b5122989bf5895661b7c9ec99c2c11cc93461829535c8d6807c2a84e7b
 MISC metadata.xml 333 BLAKE2B f6d68462d464a5a381a3a09aa96646ecc510b0e0ddf855588b94ca2662caa4bf17112d57741d5e4b013b43ea621d856bc000c62477cc9c3273f23a6ffe2de7e8 SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
index aab9132c9198..5b1ff3330177 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.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=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 PATCHES=(
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 316902d96c34..1fac022194d0 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,4 +1,6 @@
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
+DIST libdvdread-6.0.1.tar.bz2 404512 BLAKE2B 7db1d9ef6b728ba732d9f3c9e5aef6da5b8a70ee0ef95902c8de231ad64c7ad39a9ff1d01169688d197094b2755e34b1416b9f2d063566cc89984cfd86483a26 SHA512 550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b
 EBUILD libdvdread-6.0.0.ebuild 1148 BLAKE2B ec06c3c7f0e6f7272473f6b2df07d6457e17135828e74252e16dd1c22bb13ef6bf0d1462a90174fcd24ca077e842af8233dc5548d21e0a4a1cee6f173ee6b2ed SHA512 b0ddbdab2d9f0d3515f6133e43847abc71b71bf4d9443dc8581336eb7766507105963d2c8bc1c00359626d46e39387ed75aa1688cfb60e5249535609d820c119
-EBUILD libdvdread-9999.ebuild 1156 BLAKE2B ffdc1f7a0f7fd5e2a8e17e64a18f7a6df2f93cb305b5851251ee2c494dec221dc8e50e8d6d69b8a8e7be56b042d7ba36496b7f7c05bed189256bc309d0b02008 SHA512 193e1c2ece5c75ff5e326ee789fe493a5e42ccb8f8afa311edef85196e6dd32506d1443489e6ae5b26edc86d135aa662de84bdb609fc8249b8a068bbd6a7729f
+EBUILD libdvdread-6.0.1.ebuild 1162 BLAKE2B 4b8308822337313a32e016441ab17f1eab9681adc280a316556a749306f2c74cf349c9958537b9b6f636ab993e76ef1c0e8b01877e99e91714f885b152db5b2e SHA512 9113cdf82860b9d09cd49b3ba7b30cc3ebf067c33ad8b037ab9397ea2c65bee7678422e5552d94ac008d4f8b3ab528734bdadc7a8c51b8b2dfb260746492e339
+EBUILD libdvdread-9999.ebuild 1162 BLAKE2B 4b8308822337313a32e016441ab17f1eab9681adc280a316556a749306f2c74cf349c9958537b9b6f636ab993e76ef1c0e8b01877e99e91714f885b152db5b2e SHA512 9113cdf82860b9d09cd49b3ba7b30cc3ebf067c33ad8b037ab9397ea2c65bee7678422e5552d94ac008d4f8b3ab528734bdadc7a8c51b8b2dfb260746492e339
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.0.1.ebuild b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
new file mode 100644
index 000000000000..eabac94a68c8
--- /dev/null
+++ b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for DVD navigation tools"
+HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
+else
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+css static-libs"
+
+RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS TODO README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_with css libdvdcss)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 3a46c0663f6a..eabac94a68c8 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.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 autotools multilib-minimal
 
@@ -20,8 +20,8 @@ SLOT="0"
 IUSE="+css static-libs"
 
 RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS TODO README )
 
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 3f665ac5585e..047289d1a965 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,11 +1,4 @@
-AUX libffado-2.4.0-additional-py3-fixes.patch 3657 BLAKE2B 8bb214f90fac168c682119d8758efd67812da784770684e7ff47c1d64146da79346d61dfe5b17c0d5e23700f04605d073147a1dd335f0a1da72faf68418a5cd7 SHA512 feb6cd85ee487182b56f003ddee1fc7a1aa3aa07d6d1f3ccbd2ab3735e5d756e836062789a71248d6a16f7377d9d76645c0a17ab76a8d9178b1154cd67783be8
-AUX libffado-2.4.0-crossbar-router-fix.patch 496 BLAKE2B 7a2b88344c319eb5c1da7a4430600843e57eccc6b96d833b7dfc17ca8f63fb22ff50d959ad06c4c8d06036a96412064ce5630f4a26b53fa0b5eb2e392d8ada66 SHA512 5f31f7db57cf54c05dc00bb00f5f0a5e1771dfd2cd716d9bc56788c24313d14d26fb0ffc7865acb5b55504592929a6b271f657e25971eee37c4aa0a7cc03c382
-AUX libffado-2.4.0-py3-pyqt5-fixes.patch 9119 BLAKE2B e1b4ead17535e573bfced949652fec2418b0236b4ab3146f45f6931b0d80f5c1af86f17247e931baf07d9efd3c3726e0d9a0cc42783fd9053464073bdc233577 SHA512 26f34e318040e3fb9066424538d4ad7dd41e49e93c5f89161cd460bce862d3e2a25e0a2ffb6c28beb1f91fdd00a146f7d33930242e52e5148a7d1a0fb0e1ff28
-AUX libffado-2.4.0-pyqt5-dbus-detection.patch 1503 BLAKE2B 448eb997454a72f9d55722462dbe696d293b271002acf205c73e5fb59690ab7ae622830e09ab05def50d73d3fa1bc62076ead695a7d79335b75a00d3a4f1ce73 SHA512 29a44a73786256e8aec380e4e68df9f6de3ceb1d7bf1d4f1565585418ab4167ac2d16b85958cc1acfa60906b384445bd82866d05d3c3f3bdc517ae424d83e559
-AUX libffado-2.4.0-rme-bigendian-fix.patch 1618 BLAKE2B db8969797d9f8bdf4aac9a1e8474ad7d84428ede18788746b885ed037dcc71798a348bc86335dd72083a3937ad00170f6bbe412666f3109395642186b0fb4e2c SHA512 0ecb20c21858df87f53c0033109a4b736e1a38dc8a2b0ed00660cd3b80f74ce7b4cb87438ac5a37e11f0d4650166b3519e163f442d27a7822a24f4485626d776
 AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
-DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627
 DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
-EBUILD libffado-2.4.0.ebuild 3194 BLAKE2B 57fc39ce908391aa991a5dc87d90cc9d709320c65c32eec065fb236a8cc3b5cf6b713b3e97bba0d4de1f96bf9dffb7922b8b8b33d6c31fe3608cba9a00a0b82f SHA512 54574ea4a2baa8a18d4dff29972c96cf94401af1e76afb52271358a0d353e51e4aa589bf590534eaf289998c72e3ee36983a55b77cb3b9969fe480a570c290f3
-EBUILD libffado-2.4.1.ebuild 2805 BLAKE2B 8e7742c0eb46f970945cd9c95f6407a844ce5b59c6b61e28997eda0e1600ae95a34e248b60a87ffc5204d6ea95a5274c1c817daa9788c12a67512382b83475ca SHA512 008724139623e65f92d75cc6731ed1d38c1fb78c8e55dd84e96cea9c26096d4c37baa9d8241857745bc178ec63020a51c81975b4dabfe9fcd56436404887314a
+EBUILD libffado-2.4.1.ebuild 2807 BLAKE2B 9e7a07ea267bbb3dc1d7e894b49696752b727c343bb30061f09e502ccfc7c17f02cde8b0085efd5f832ded7a594299f8a44b2b36ca214626b17cf5d19b51a9eb SHA512 321ed77cd069d7d415054614b491c5d10ee26d153f801ac67ed8d4bb5b42f96c51d0f0ae3ee20e6b3897c10bf9f4439486cfc41b75aacec75182a2d1f1dac144
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch b/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
deleted file mode 100644
index fd5d2f44babd..000000000000
--- a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/support/mixer-qt4/ffado/panelmanager.py	2018-01-11 12:27:20.518923209 +0900
-+++ a/support/mixer-qt4/ffado/panelmanager.py	2018-01-11 12:31:03.956299962 +0900
-@@ -38,6 +38,7 @@
- 
- import sys
- import time
-+import importlib
- 
- import logging
- log = logging.getLogger('panelmanager')
-@@ -302,20 +303,15 @@
-         #
-         # Specific (or dummy) mixer widgets get loaded in the following
-         #
-+        found = False
-         if 'mixer' in dev and dev['mixer'] != None:
-             mixerapp = dev['mixer']
--            global mixerwidget
--            exec( """
--try:
--    import ffado.mixer.%s
--    globals()["mixerwidget"] = ffado.mixer.%s.%s( w )
--    found = True
--except ImportError:
--    log.debug("bypassdbus set, %s module not available: ignored")
--    found = False
--""" % (mixerapp.lower(), mixerapp.lower(), mixerapp, mixerapp.lower()) )
--        else:
--            found = False
-+            try:
-+                mixer_module = importlib.import_module("ffado.mixer.%s" % mixerapp.lower())
-+                mixerwidget = getattr(mixer_module, mixerapp)(w)
-+                found = True
-+            except ImportError:
-+                log.debug("bypassdbus set, %s module not available: ignored" % mixerapp.lower())
- 
-         if not found:
-             mixerwidget = Dummy( w )
---- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:34:10.200777889 +0900
-+++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:45:13.278911705 +0900
-@@ -194,7 +194,7 @@
-         #log.debug("Got %i peaks" % len(peakvalues))
-         for peak in peakvalues:
-             #log.debug("peak = [%s,%s]" % (str(peak[0]),str(peak[1])))
--            if peak[0] >= 0:
-+            if peak[1] >= 0:
-                 self.switchers[peak[0]].peakValue(peak[1])
- 
-     def updateMixerRouting(self):
---- a/support/mixer-qt4/ffado/widgets/matrixmixer.py	2018-01-11 12:54:27.545361864 +0900
-+++ b/support/mixer-qt4/ffado/widgets/matrixmixer.py	2018-01-11 12:56:36.899124318 +0900
-@@ -512,7 +512,7 @@
-                     self.rowHeaders[j].lbl.setText(row_name)
- 
-     def updateValues(self, n):
--        nbitems = len(n)/3
-+        nbitems = len(n) // 3
-         for i in range(nbitems):
-             n_0 = n[3*i]    
-             n_1 = n[3*i+1]   
-@@ -951,7 +951,7 @@
-             return self.interface.setValue(In, Out, val)            
- 
-     def updateValues(self, n):
--        nbitems = len(n)/3
-+        nbitems = len(n) // 3
-         for j in range(nbitems):
-             n_0 = n[3*j]    
-             n_1 = n[3*j+1]   
-@@ -1406,7 +1406,7 @@
-     def matrixControlChanged(self, n):
-         # Update value needed for "per Out" view
-         #log.debug("Update per Output( %s )" % str(n))
--        nbitems = len(n)/3
-+        nbitems = len(n) // 3
-         if (self.rule == "Columns_are_inputs"):
-            n_t = n
-         else:
-@@ -1420,7 +1420,7 @@
-     def sliderControlChanged(self, n):
-         # Update value needed for matrix view
-         #log.debug("Update Matrix( %s )" % str(n))
--        nbitems = len(n)/3
-+        nbitems = len(n) // 3
-         if (((self.rule == "Columns_are_inputs") and not self.transpose) or ((self.rule != "Columns_are_inputs") and self.transpose)):
-             n_t = ()
-             for i in range(nbitems):
-@@ -1512,7 +1512,7 @@
-                 log.debug("Number of stereo output channels must be specified")
-                 return False
-             n = int(readMixerString[idx+2])
--            if n > self.perOut.nbOut/2:
-+            if n > self.perOut.nbOut // 2:
-                 log.debug("Incoherent number of stereo channels")
-                 return False
-             if n > 0:
diff --git a/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch b/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch
deleted file mode 100644
index 99861abe284e..000000000000
--- a/media-libs/libffado/files/libffado-2.4.0-crossbar-router-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:34:10.200777889 +0900
-+++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2018-01-11 12:45:13.278911705 +0900
-@@ -98,7 +98,7 @@
-             self.combo.setCurrentIndex(self.combo.findText(src))
-         else:
-             self.combo.setCurrentIndex(0)
--        self.combo.activated.connect(self.comboCurrentChanged)
-+        self.combo.activated[str].connect(self.comboCurrentChanged)
- 
- 
-     def peakValue(self, value):
diff --git a/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch b/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch
deleted file mode 100644
index f0937559b8e9..000000000000
--- a/media-libs/libffado/files/libffado-2.4.0-py3-pyqt5-fixes.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-------------------------------------------------------------------------
-r2726 | jwoithe | 2018-01-05 18:56:40 +0900 (Fri, 05 Jan 2018) | 13 lines
-
-Further Python3/PyQt5 compatibility fixes, enhance "About" dialog box.
-
-This patch was prepared by Orcan Ogetbil on Fedora and tested on that
-distribution with PyQt4-4.12.1 and PyQt5-5.9.1.  It is primarily concerned
-with additional compatibility between Python2/3 and PyQt4/5.  It has also
-been tested under python 2 with pyqt 4.11.4.  Further testing under
-different python/pyqt environments would be welcomed.
-
-An enhancement to the "About" dialog is also included which adds version
-strings and updates the copyright year range.
-
-The patch was submitted to the ffado-devel mailing list.
-
-
-Index: support/mixer-qt4/ffado/ffadowindow.py
-===================================================================
---- a/support/mixer-qt4/ffado/ffadowindow.py	(revision 2725)
-+++ b/support/mixer-qt4/ffado/ffadowindow.py	(revision 2726)
-@@ -22,6 +22,8 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
-+import ctypes
-+import datetime
- import os
- 
- from ffado.config import *
-@@ -92,7 +94,8 @@
-             self.menuTheme[theme].setCheckable(True)
- 
-             if (ffado_python3 and (self.style().objectName().lower() == theme.lower()) or
--                    not(ffado_python3) and (self.style().objectName().toLower() == theme.toLower())):
-+                    not(ffado_python3) and (self.style().objectName().toLower() == theme.toLower() if ffado_pyqt_version == 4 else
-+                                            self.style().objectName().lower() == theme.lower())):
-                 self.menuTheme[theme].setDisabled(True)
-                 self.menuTheme[theme].setChecked(True)
-             self.menuTheme[theme].triggered.connect(self.switchTheme )
-@@ -174,9 +177,11 @@
-         QMessageBox.about( self, "About FFADO", """
- <h1>ffado.org</h1>
- 
-+<p>{ffado_version}</p>
-+
- <p>FFADO is the new approach to have firewire audio on linux.</p>
- 
--<p>&copy; 2006-2014 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p>
-+        <p>&copy; 2006-2018 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p>
- 
- <p>FFADO developers are:<ul>
- <li>Pieter Palmers
-@@ -191,8 +196,17 @@
- <li>Stefan Richter
- <li>Jano Svitok
- </ul>
--""" )
-+        """.format(ffado_version=get_ffado_version(), thisyear=datetime.datetime.now().year))
- 
-+def get_ffado_version():
-+    try:
-+        # call the C function ffado_get_version() to figure out the version
-+        lib = ctypes.cdll.LoadLibrary('libffado.so')
-+        func = ctypes.CFUNCTYPE(ctypes.c_char_p)
-+        ffado_get_version = func(('ffado_get_version', lib))
-+        return ffado_get_version()
-+    except:
-+        return "libffado"
- 
- def get_lock(process_name):
-     import socket
-@@ -252,6 +266,7 @@
-     logging.getLogger('global').setLevel(debug_level)
- 
-     log = logging.getLogger('main')
-+    log.debug("Using %s with Qt: %s PyQt: %s" % (get_ffado_version(), QtCore.QT_VERSION_STR, QtCore.PYQT_VERSION_STR))
- 
-     app = QApplication(args)
-     app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) )
-Index: support/mixer-qt4/ffado/logginghandler.py
-===================================================================
---- a/support/mixer-qt4/ffado/logginghandler.py	(revision 2725)
-+++ b/support/mixer-qt4/ffado/logginghandler.py	(revision 2726)
-@@ -28,7 +28,7 @@
- log = logging.getLogger('logginghandler')
- 
- class QStatusLogger( QObject, logging.Handler ):
--    log = pyqtSignal(QString, int, name='log')
-+    log = pyqtSignal(QString if ffado_pyqt_version == 4 else str, int, name='log')
-     def __init__( self, parent, statusbar, level=logging.NOTSET ):
-         QObject.__init__( self, parent )
-         logging.Handler.__init__( self, level )
-Index: support/mixer-qt4/ffado/panelmanager.py
-===================================================================
---- a/support/mixer-qt4/ffado/panelmanager.py	(revision 2725)
-+++ b/support/mixer-qt4/ffado/panelmanager.py	(revision 2726)
-@@ -378,7 +378,7 @@
-         action = self.sender()
-         # Extract the action data and store as a dbus.String type so 
-         # it is usable as a key into self.panels[].
--        panel_key = dbus.String(action.data().toString())
-+        panel_key = dbus.String(action.data().toString() if ffado_pyqt_version == 4 else action.data())
-         self.tabs.setCurrentIndex(self.tabs.indexOf(self.panels[panel_key]))
- 
-     def displayPanels(self):
-@@ -515,6 +515,8 @@
-           saveString.append('</device>\n')
-         # file saving
-         savefilename = QFileDialog.getSaveFileName(self, 'Save File', os.getenv('HOME'))
-+        if isinstance(savefilename, tuple): # newer PyQt5
-+            savefilename = savefilename[0]
-         try:
-           f = open(savefilename, 'w')
-         except IOError:
-@@ -526,6 +528,8 @@
- 
-     def readSettings(self):
-         readfilename = QFileDialog.getOpenFileName(self, 'Open File', os.getenv('HOME'))
-+        if isinstance(readfilename, tuple): # newer PyQt5
-+            readfilename = readfilename[0]
-         try:
-           f = open(readfilename, 'r')
-         except IOError:
-Index: support/mixer-qt4/ffado/widgets/crossbarrouter.py
-===================================================================
---- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py	(revision 2725)
-+++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py	(revision 2726)
-@@ -168,7 +168,10 @@
-         self.timer.setInterval(200)
-         self.timer.timeout.connect(self.updateLevels)
- 
--        self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False).toBool())
-+        if ffado_pyqt_version == 4:
-+            self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False).toBool())
-+        else:
-+            self.vubtn.setChecked(self.settings.value("crossbarrouter/runvu", False) == u'true')
- 
-     def __del__(self):
-         print( "CrossbarRouter.__del__()" )
-Index: support/mixer-qt4/ffado/widgets/matrixmixer.py
-===================================================================
---- a/support/mixer-qt4/ffado/widgets/matrixmixer.py	(revision 2725)
-+++ b/support/mixer-qt4/ffado/widgets/matrixmixer.py	(revision 2726)
-@@ -200,7 +200,7 @@
- 
-     def mousePressEvent(self, ev):
-         if ev.buttons() & Qt.LeftButton:
--            self.pos = ev.posF()
-+            self.pos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos()
-             self.tmpvalue = self.value()
-             ev.accept()
-             #log.debug("MixerNode.mousePressEvent() %s" % str(self.pos))
-@@ -207,7 +207,7 @@
- 
-     def mouseMoveEvent(self, ev):
-         if hasattr(self, "tmpvalue") and self.pos is not QtCore.QPointF(0, 0):
--            newpos = ev.posF()
-+            newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos()
-             change = newpos.y() - self.pos.y()
-             #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change)))
-             self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) )
-@@ -215,7 +215,7 @@
- 
-     def mouseReleaseEvent(self, ev):
-         if hasattr(self, "tmpvalue") and self.pos is not QtCore.QPointF(0, 0):
--            newpos = ev.posF()
-+            newpos = ev.posF() if ffado_pyqt_version == 4 else ev.localPos()
-             change = newpos.y() - self.pos.y()
-             #log.debug("MixerNode.mouseReleaseEvent() change %s" % (str(change)))
-             self.setValue( self.tmpvalue - math.copysign(pow(abs(change), 2), change) )
-@@ -257,19 +257,19 @@
-         if v == 0:
-             symb_inf = u"\u221E"
-             text = "-" + symb_inf + " dB"
--        if ffado_python3:
-+        if ffado_python3 or ffado_pyqt_version == 5:
-             # Python3 uses native python UTF strings rather than QString.
-             # This therefore appears to be the correct way to display this
-             # UTF8 string, but testing may prove otherwise.
-             p.drawText(rect, Qt.AlignCenter, text)
-         else:
--            p.drawText(rect, Qt.AlignCenter, QtCore.QString.fromUtf8(text))
-+            p.drawText(rect, Qt.AlignCenter, QString.fromUtf8(text))
-         if (self.inv_action!=None and self.inv_action.isChecked()):
--            if ffado_python3:
-+            if ffado_python3 or ffado_pyqt_version == 5:
-                 # Refer to the comment about about Python UTF8 strings.
-                 p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, " ϕ")
-             else:
--                p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, QtCore.QString.fromUtf8(" ϕ"))
-+                p.drawText(rect, Qt.AlignLeft|Qt.AlignTop, QString.fromUtf8(" ϕ"))
- 
-     def internalValueChanged(self, value):
-         #log.debug("MixerNode.internalValueChanged( %i )" % value)
-
-------------------------------------------------------------------------
diff --git a/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch b/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch
deleted file mode 100644
index 9064a59a6bcc..000000000000
--- a/media-libs/libffado/files/libffado-2.4.0-pyqt5-dbus-detection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-------------------------------------------------------------------------
-r2725 | jwoithe | 2018-01-05 18:40:19 +0900 (Fri, 05 Jan 2018) | 11 lines
-
-SCons: fix detection of dbus on PyQt5 systems.
-
-The detection of the dbus python modules was qualified on the presence of
-pyuic4.  On systems with only PyQt5 this would obviously fail.  Patch from
-Orcan Ogetbil via the ffado-devel mailing list.
-
-r2724 inadvertently included a change to SConstruct to import sys.  This is
-needed since sys.stdout is referenced in some situations (in particular, if
-jack is not installed in the build environment).  This patch was also from
-Orcan Ogetbil, via the ffado-devel mailing list.
-
-
-Index: SConstruct
-===================================================================
---- a/SConstruct	(revision 2724)
-+++ b/SConstruct	(revision 2725)
-@@ -396,7 +396,7 @@
- 
- # PyQT checks
- if env['BUILD_MIXER'] != 'false':
--    have_dbus = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ))
-+    have_dbus = ((conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) or (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' )))
-     have_pyqt4 = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'PyQt4' ))
-     have_pyqt5 = (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'PyQt5' ))
-     if ((have_pyqt4 or have_pyqt5) and have_dbus):
-
-------------------------------------------------------------------------
diff --git a/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch b/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch
deleted file mode 100644
index 8e0158a03c5d..000000000000
--- a/media-libs/libffado/files/libffado-2.4.0-rme-bigendian-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-------------------------------------------------------------------------
-r2724 | jwoithe | 2018-01-05 18:33:39 +0900 (Fri, 05 Jan 2018) | 8 lines
-
-RME: ensure byte swap macros are available for all components.
-
-The byte swap macros (ByteSwap32() in particular) are required on big-endian
-architectures for more than just the rme_avdevice module.  Including these
-in the RME device header file is a reasonable way to fix this.
-
-Patch from Orcan Ogetbil via the ffado-devel mailing list.
-
-
-Index: SConstruct
-===================================================================
---- a/SConstruct	(revision 2723)
-+++ b/SConstruct	(revision 2724)
-@@ -29,6 +29,7 @@
- from subprocess import Popen, PIPE
- import os
- import re
-+import sys
- from string import Template
- import imp
- import distutils.sysconfig
-Index: src/rme/rme_avdevice.cpp
-===================================================================
---- a/src/rme/rme_avdevice.cpp	(revision 2723)
-+++ b/src/rme/rme_avdevice.cpp	(revision 2724)
-@@ -42,7 +42,6 @@
- #include <stdint.h>
- #include <assert.h>
- #include <unistd.h>
--#include "libutil/ByteSwap.h"
- 
- #include <iostream>
- #include <sstream>
-Index: src/rme/rme_avdevice.h
-===================================================================
---- a/src/rme/rme_avdevice.h	(revision 2723)
-+++ b/src/rme/rme_avdevice.h	(revision 2724)
-@@ -31,6 +31,7 @@
- #include "libavc/avc_definitions.h"
- 
- #include "libutil/Configuration.h"
-+#include "libutil/ByteSwap.h"
- 
- #include "fireface_def.h"
- #include "libstreaming/rme/RmeReceiveStreamProcessor.h"
-
-------------------------------------------------------------------------
diff --git a/media-libs/libffado/libffado-2.4.0.ebuild b/media-libs/libffado/libffado-2.4.0.ebuild
deleted file mode 100644
index 10e673c6113d..000000000000
--- a/media-libs/libffado/libffado-2.4.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt5 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	qt5? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
-		x11-misc/xdg-utils
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<media-sound/jack-audio-connection-kit-0.122.0:0
-	!<media-sound/jack-audio-connection-kit-1.9.9:2"
-
-PATCHES=(
-	"${FILESDIR}/${P}-rme-bigendian-fix.patch"
-	"${FILESDIR}/${P}-pyqt5-dbus-detection.patch"
-	"${FILESDIR}/${P}-py3-pyqt5-fixes.patch"
-	"${FILESDIR}/${P}-additional-py3-fixes.patch"
-	"${FILESDIR}/${P}-crossbar-router-fix.patch"
-)
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		PYPKGDIR="$(python_get_sitedir)"
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
-		# lower versions.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt5 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-
-	# Python3 fixes
-	sed -i -e 's/\t/        /g' support/mixer-qt4/ffado/mixer/phase88control.py || die
-	sed -i -e 's/\t/        /g' support/mixer-qt4/ffado/mixer/audiofire.py || die
-	sed -i -e 's/\bprint \(.*\)$/print(\1)/g' -e '/import commands/d' support/tools/ffado-diag-static || die
-
-	# Always use Qt5
-	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt5; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
diff --git a/media-libs/libffado/libffado-2.4.1.ebuild b/media-libs/libffado/libffado-2.4.1.ebuild
index a9c3d2c6e170..d987a24a6465 100644
--- a/media-libs/libffado/libffado-2.4.1.ebuild
+++ b/media-libs/libffado/libffado-2.4.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"
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
diff --git a/media-libs/libggiwmh/Manifest b/media-libs/libggiwmh/Manifest
index eac1b8db6c10..1b77e2f4190a 100644
--- a/media-libs/libggiwmh/Manifest
+++ b/media-libs/libggiwmh/Manifest
@@ -1,4 +1,4 @@
 DIST libggiwmh-0.3.2.src.tar.bz2 316669 BLAKE2B b14f8df0849bbe6e4a59d2285423238c3409bea3a00ecb066042df095ea8c7c4f75de9c4b3a79f0c1eacd436aae71b67be1e084dd23243dd3cfcaca5dd137077 SHA512 d12a9f158ba76ca8077568cd48f26f0fd8ab561b68cc33e74a8898f7fd594b417cd514806f827a63a4315c546bb35f5b71a5f54f5a2b54562f276e37146224b8
-EBUILD libggiwmh-0.3.2-r1.ebuild 778 BLAKE2B e21c242a10c0c3aa834f1bf40f671331c8f1b0a9db5282dcefb6274c714ba64af60a0a5f42942f001be832c963308c76747475f4032ee9fb321f7b6c42cf3392 SHA512 3cad8908f3b186d14e90dc0726f551a09f44c27987d761b52c5449b613170c6c5e10eddbede34dd65d9403452075a398100466d9eed6e62a4e9e0d3b74307ace
+EBUILD libggiwmh-0.3.2-r1.ebuild 772 BLAKE2B 8c110bd8a02460c2f21bd17ba2a15a944a0d5910fa33cfef8fa9d27cf7b46b31a7f969d54aa782d4d2b2bc07b60d0b39a642a19aa3ce22b23fb5a22615c05487 SHA512 bc2b4405728f886b5f34b481c169b620dc26fbc7acc066ecd6a023face859611884e6e7073ccfa1c81eff45e74095cf6bc5d5150e4c0b9b9e175466bd8529980
 EBUILD libggiwmh-0.3.2.ebuild 742 BLAKE2B 5619df6c6a13d59149d7b3a6f7f8fd14d81841eaca9fe9794c6f7b9094ef4fc32e2c5494fa7b2e2656707a3fae0cacbd49c75d9f28275d621dfc527005c95391 SHA512 ee93e804304fce560d4dddb8fe05f615ceac8150aeda62b802df02da66125f1efdbe13b77c743f322ca3d2ba673d1abadad2d51d15593f990ea328ce668524fe
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
index 67cd8c2664dc..32987db4d413 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X"
 
 RDEPEND=">=media-libs/libggi-2.2.2
diff --git a/media-libs/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index 0525904e704f..9e44d6f75127 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,5 +1,5 @@
 DIST libmetalink-0.1.1.tar.bz2 324472 BLAKE2B 7ce82dd8954c96b31d15633995f5e1cad9e3aa56568241601e3f79c25e217a5ea3333df397bc2ed2e96ca790ae1e187d5ebe32113e11cd43f2ecbae9eb6cdf32 SHA512 9e9a2bf17b3696b199844703377cf6615bab44fd61b89be9afef579c21b0ac462f156719f60df9b8e7f7a9edb259d9bf461f20cd11ad9960d8376bf20e04f62c
 DIST libmetalink-0.1.3.tar.bz2 327482 BLAKE2B 08bf06323e38793a4ecdd3860236fe8a5b97a2deb6d91a63938197fbfc06e38fd6c8fc9968f6fcd883270339ddeba9821711ca3a8acdce5e096c167cec28c9ad SHA512 2c944a00f9460447ecf961685d7cfa80243fec7ad462dc2339fba0e944d0b92ff42bdf07032f2ee0695f0cd004e4c45bfe21e5246e1355a0d43756605894c632
 EBUILD libmetalink-0.1.1-r1.ebuild 798 BLAKE2B c2ccd770a6e05721b42daefd89a9a399eb5b88b86db97aa5bda3ae0518f844075a08129257113179d12a48bc9fdcd231afb94d5ab15fb10a22983d20f71f3975 SHA512 12facd74a93ca688f5f56194ef677e572a91bac2905798f0c4550df76f83a35daf28a1926c4199894a3199bb98ac67cbf0d0e185b1a06af59e2ba711ed36acd5
-EBUILD libmetalink-0.1.3.ebuild 812 BLAKE2B 8a98444b3f7af5d412b81b464f10a5919022a4c7b617e80b42ac3b33699dc466fa6dc2376233a91931249d9fc5ace799d7813c6583c10d403fd976e7a439d907 SHA512 4bb9e65b975af360d8d7dbd19e965bb9bcd5348080e8956da030c7444e7409f49b294ab845404111ace534155e1e65018ae85622a5c7c4336646607065f05dd4
+EBUILD libmetalink-0.1.3.ebuild 811 BLAKE2B bf136f21dfb56561769bd9166a6c43e133f4b05bcbcb4b4ea697cf2d63b881f3827edd12d5098597898f5aa9841701edc26bb1d8e2f69b2c088f8470e0886aa0 SHA512 a8113761434a19c2da55813504e54dc1441d4eaa94b8eef6c7cdb0dd0589886333e2b88b7a3f7e32f2f9d502e129c1ca41f874111c7331e44b1b9e93b8e27710
 MISC metadata.xml 246 BLAKE2B 8de378056256c0217da9beda2aaea7afe4967f48fa4b62cf3d8cdf2428791003a6cf4bbef204342dadbfb05e1be7a8914a637de532ca6f8ea9f4f68273cb6f4a SHA512 c7a53354d3381e820c1a7cfdd90850f45dc034c96006ba7d6c9459727fd0f1adf5473a35ab52de8bde5a14b66099cc67333c75953199bcac9e7567dacea2838d
diff --git a/media-libs/libmetalink/libmetalink-0.1.3.ebuild b/media-libs/libmetalink/libmetalink-0.1.3.ebuild
index aace0d49f320..30ae4d291f58 100644
--- a/media-libs/libmetalink/libmetalink-0.1.3.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="expat static-libs test xml"
 
 RDEPEND="expat? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 111657c23e48..1f7586616bb6 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,9 +1,3 @@
-AUX libsfml-2.2-no-docs.patch 432 BLAKE2B 617c83033c6cafc6455937f1a7a149b73e31e0c3b1430bb471743b04c4f89b604acd1ba67965a3a33e32dfdc2a15e1a374f4e08fd073c26443ca652719658877 SHA512 86c05d82af21ed440e313119d5296097c498030c9aca8f6516a2a47c4913d578064dab9bd1476735b84f00eacf009b21de378e41d1e59615c1098dfeb786b807
-AUX libsfml-2.4.2-no-install-extlibs-mingw.patch 3417 BLAKE2B 4619083ec961ba9da52a3db4d77b157c4bdc1f2c08ccdd3c487e729b14551d0043fcbff3e5dad2d63b269b961f315e2930b082afd5f5c0c7aa372e60391a2bf0 SHA512 8239c021143d7e5ce9ae33d3a3c639b8568fceafe900f0b9d70221402a2f38ff7b5c3a297ffdf8aaaebef7d379b1733749d579f831efa3c85ea252b57721e8cf
-AUX libsfml-2.4.2-pkg-config.patch 9244 BLAKE2B 7b5a2bb09d268ad5b5c9686874bb585bb33e11937b3467318fffa89391d1277d21e66d23ebbaf1690f46316fe0569e4b44f84e3d0e884ad2cfa2724e36852c6e SHA512 6937bcee330961ec578947791142012a9fd4147251a603ec0ee0de47e8dd23122fccc437ed191ccf65a81b385ce275e717c5a524003ad56137a8c787d9c91aab
-DIST libsfml-2.4.2.tar.gz 24576150 BLAKE2B 05d1c06cb360aae6ec8a53225666119168075ab61dd87fe86a105f2c104d21b5897c4b35e66f5c0dae7193697437d168a963c018e3d39bd7b8b6bed957a63d94 SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972
 DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
-EBUILD libsfml-2.4.2-r2.ebuild 1678 BLAKE2B cff23c8ef3b13eca3cc957cdb0265ba80620e6a33530a2bd82d31dce14181ce6e8ec647c88053bdcdefb507faf0adab52a7f29c5af0fa3e90e8c65b8e54947ab SHA512 e12981574f9a6a9969052333854f00f9639ec76b5f13aaefbad7130d68d6f5f1563c4ecf7ce27eff392e84019d91b7706e549381624c34ce49ef502e28c55b7a
-EBUILD libsfml-2.4.2.ebuild 1488 BLAKE2B 7823ad6b11566f9b2587528851067098d504db7d7862d5efe8fb57018fb56ddfe551e5467b057f8f85f0778e700424379b7cf146d1c516f1528e6999df206c7a SHA512 250f27afd60470dc9667a504da415621a63cb9f71c23ec64557c7407f683871681e5e98b023984425ebca57b61583a405281cbbc343dae1210e33b02051c75ea
-EBUILD libsfml-2.5.1.ebuild 1534 BLAKE2B 611b0afc94355789d376d2bc90ba379d87ae610adec428d12d8a04069b67cce71799051e24e5faec12ca2cfb04dfa7bcc1e90007e27744f2633cc15ea6e80229 SHA512 ec1a8bdc2ad8a3ffe6991c9db1648aa50eb49e86d416bfd5b33fc6d3270cd37178dd4dc017f088bdf6e10bce0ca1efe869501cabf66ce61cefe9d04825721e8e
+EBUILD libsfml-2.5.1.ebuild 1533 BLAKE2B 47238e2e11e2341255fb20307297cde704747816c9098ff26155e56981c42b759e9e6a9844697b1bd150d81955e9ce999c60024cd686fd3da81b04a6870ed194 SHA512 ad11e290cc14cb2081a6fae124890e087044664c9faba080b92ba1735dd875f83ecaba58cf59559d8e3dab1c72bd79250aa08711aacba56b5d8b2e3103b16c46
 MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2
diff --git a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch b/media-libs/libsfml/files/libsfml-2.2-no-docs.patch
deleted file mode 100644
index ef69107c56f4..000000000000
--- a/media-libs/libsfml/files/libsfml-2.2-no-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- SFML-2.2/CMakeLists.txt
-+++ SFML-2.2/CMakeLists.txt
-@@ -239,12 +239,6 @@
-             COMPONENT devel)
- endif()
- 
--install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})
--install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR})
--if(NOT SFML_OS_ANDROID)
--    install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${INSTALL_MISC_DIR}/cmake/Modules)
--endif()
--
- # install 3rd-party libraries and tools
- if(SFML_OS_WINDOWS)
- 
diff --git a/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch b/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch
deleted file mode 100644
index b45063160e73..000000000000
--- a/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- SFML-2.4.2/CMakeLists.txt	2017-02-08 05:29:16.000000000 -0600
-+++ SFML-2.4.2.new/CMakeLists.txt	2017-06-05 22:12:39.166300154 -0500
-@@ -305,24 +305,26 @@
- # install 3rd-party libraries and tools
- if(SFML_OS_WINDOWS)
- 
--    # install the binaries of SFML dependencies
--    if(ARCH_32BITS)
--        install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
--        if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
--            install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
--        elseif(SFML_COMPILER_MSVC)
--            install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
--        else()
--            install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
--        endif()
--    elseif(ARCH_64BITS)
--        install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
--        if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
--            install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
--        elseif(SFML_COMPILER_MSVC)
--            install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
--        else()
--            install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
-+    if(NOT SFML_USE_SYSTEM_DEPS)
-+        # install the binaries of SFML dependencies
-+        if(ARCH_32BITS)
-+            install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
-+            if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
-+                install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
-+            elseif(SFML_COMPILER_MSVC)
-+                install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
-+            else()
-+                install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
-+            endif()
-+        elseif(ARCH_64BITS)
-+            install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
-+            if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
-+                install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
-+            elseif(SFML_COMPILER_MSVC)
-+                install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
-+            else()
-+                install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
-+            endif()
-         endif()
-     endif()
- 
-@@ -379,9 +381,11 @@
-         install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/\$ENV{CONFIGURATION}/" DESTINATION lib${LIB_SUFFIX})
-     endif()
- 
--    # since the iOS libraries are built as static, we must install the SFML dependencies
--    # too so that the end user can easily link them to its final application
--    install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib)
-+    if(NOT SFML_USE_SYSTEM_DEPS)
-+        # since the iOS libraries are built as static, we must install the SFML dependencies
-+        # too so that the end user can easily link them to its final application
-+        install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib)
-+    endif()
- 
- elseif(SFML_OS_ANDROID)
- 
-@@ -389,7 +393,9 @@
-     install(DIRECTORY extlibs/libs-android/${ANDROID_ABI} DESTINATION extlibs/lib)
-     install(FILES extlibs/Android.mk DESTINATION extlibs)
- 
--    # install Android.mk so the NDK knows how to set up SFML
--    install(FILES src/SFML/Android.mk DESTINATION .)
-+    if(NOT SFML_USE_SYSTEM_DEPS)
-+        # install Android.mk so the NDK knows how to set up SFML
-+        install(FILES src/SFML/Android.mk DESTINATION .)
-+    endif()
- 
- endif()
diff --git a/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch b/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch
deleted file mode 100644
index a281d46c9ba2..000000000000
--- a/media-libs/libsfml/files/libsfml-2.4.2-pkg-config.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-commit 5fe5e5d6d7792e37685a437551ffa8ed5161fcc1
-Author: Rafael Kitover <rkitover@gmail.com>
-Date:   Mon Dec 19 13:16:07 2016 -0800
-
-    packaging support improvements
-
-    This grew out of my work creating an sfml port for macports, but should
-    be helpful for package maintainers of various distributions:
-
-    * add an SFML_USE_SYSTEM_DEPS option to ignore everything in extlibs/
-      except for headers/stb_image, and use the system versions
-
-    * install pkg-config files if a pkg-config program is found
-      and either lib/pkgconfig or libdata/pkgconfig exists under the
-      INSTALL_PREFIX, or the SFML_INSTALL_PKGCONFIG_FILES flag is set
-      explicitly
-
-    * install pkg-config files for static libs too, add the necessary
-      Requires.private and Libs.private entries to the .pc files to support
-      static linking
-
-    * on OS X, honor all INSTALL_NAME and RPATH related cmake variables and
-      only set the INSTALL_NAME_DIR to "@rpath" if none of them is set, this
-      preserves the default behavior of using @rpath but also allows
-      overriding by the usual cmake mechanisms
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7914ac9..419d56d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug
- # Suppress Cygwin legacy warning
- set(CMAKE_LEGACY_CYGWIN_WIN32 0)
- 
-+# Suppress Mac OS X RPATH warnings and adopt new related behaviors
-+cmake_policy(SET CMP0042 NEW)
-+
- # set Android specific options
- 
- # define the minimum API level to be used
-@@ -130,6 +133,39 @@ if(NOT BUILD_SHARED_LIBS)
-     add_definitions(-DSFML_STATIC)
- endif()
- 
-+# allow not using bundled dependencies with a switch
-+# (except for stb_image)
-+# yes this is horrible, but GLOB_RECURSE sucks
-+sfml_set_option(SFML_USE_SYSTEM_DEPS FALSE BOOL "TRUE to use system dependencies, FALSE to use the bundled ones.")
-+if(SFML_USE_SYSTEM_DEPS)
-+    if(SFML_INSTALL_XCODE_TEMPLATES)
-+        message(FATAL_ERROR "XCode templates installation cannot be used with the SFML_USE_SYSTEM_DEPS option (the bundled frameworks are required.)")
-+    endif()
-+
-+    file(GLOB_RECURSE DEP_LIBS    "${CMAKE_SOURCE_DIR}/extlibs/libs*/*")
-+    file(GLOB_RECURSE DEP_BINS    "${CMAKE_SOURCE_DIR}/extlibs/bin*/*")
-+    file(GLOB_RECURSE DEP_HEADERS "${CMAKE_SOURCE_DIR}/extlibs/headers/*")
-+
-+    foreach(DEP_FILE ${DEP_LIBS} ${DEP_BINS} ${DEP_HEADERS})
-+        get_filename_component(DEP_DIR ${DEP_FILE} PATH)
-+
-+        if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
-+            set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_DIR})
-+        endif()
-+
-+        get_filename_component(DEP_PARENT_DIR ${DEP_DIR} PATH)
-+        while(NOT DEP_PARENT_DIR STREQUAL "${CMAKE_SOURCE_DIR}/extlibs")
-+            if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
-+                set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_PARENT_DIR})
-+            endif()
-+
-+            get_filename_component(DEP_PARENT_DIR ${DEP_PARENT_DIR} PATH)
-+        endwhile()
-+    endforeach()
-+
-+    list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH)
-+endif()
-+
- # Visual C++: remove warnings regarding SL security and algorithms on pointers
- if(SFML_COMPILER_MSVC)
-     # add an option to choose whether PDB debug symbols should be generated (defaults to true when possible)
-@@ -202,30 +238,6 @@ if(SFML_OS_MACOSX)
-     set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
- endif()
- 
--if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
--    set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
--    if(SFML_OS_FREEBSD)
--        set(PKGCONFIG_DIR libdata/pkgconfig)
--    endif()
--    if(BUILD_SHARED_LIBS)
--        sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
--        if(SFML_INSTALL_PKGCONFIG_FILES)
--            foreach(sfml_module IN ITEMS all system window graphics audio network)
--                CONFIGURE_FILE(
--                    "tools/pkg-config/sfml-${sfml_module}.pc.in"
--                    "tools/pkg-config/sfml-${sfml_module}.pc"
--                    @ONLY)
--                INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
--                    DESTINATION "${CMAKE_INSTALL_PREFIX}/${PKGCONFIG_DIR}")
--            endforeach()
--        endif()
--    else()
--        if(SFML_INSTALL_PKGCONFIG_FILES)
--            message(WARNING "No pkg-config files are provided for the static SFML libraries (SFML_INSTALL_PKGCONFIG_FILES will be ignored).")
--        endif()
--    endif()
--endif()
--
- # enable project folders
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")
-@@ -239,6 +251,19 @@ if(SFML_BUILD_DOC)
-     add_subdirectory(doc)
- endif()
- 
-+sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
-+
-+if(SFML_OS_SUPPORTS_PKGCONFIG OR SFML_INSTALL_PKGCONFIG_FILES)
-+    foreach(sfml_module IN ITEMS all system window graphics audio network)
-+        CONFIGURE_FILE(
-+            "tools/pkg-config/sfml-${sfml_module}.pc.in"
-+            "tools/pkg-config/sfml-${sfml_module}.pc"
-+            @ONLY)
-+        INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
-+            DESTINATION "${CMAKE_INSTALL_PREFIX}/${SFML_OS_PKGCONFIG_DIR}")
-+    endforeach()
-+endif()
-+
- # setup the install rules
- if(NOT SFML_BUILD_FRAMEWORKS)
-     install(DIRECTORY include
-diff --git a/cmake/Config.cmake b/cmake/Config.cmake
-index cff54d00..c447113a 100644
---- a/cmake/Config.cmake
-+++ b/cmake/Config.cmake
-@@ -73,6 +73,19 @@ else()
-     return()
- endif()
- 
-+# check if OS or package system supports pkg-config
-+# this could be e.g. macports on mac or msys2 on windows etc.
-+find_package(PkgConfig QUIET)
-+if(PKG_CONFIG_EXECUTABLE)
-+    if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
-+        set(SFML_OS_SUPPORTS_PKGCONFIG ON)
-+        set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
-+    elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
-+        set(SFML_OS_SUPPORTS_PKGCONFIG ON)
-+        set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig")
-+    endif()
-+endif()
-+
- # detect the compiler and its version
- # Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true
- # even when CLANG is used, therefore the Clang test is done first
-diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
-index cd2ca8fc..0f316034 100644
---- a/cmake/Macros.cmake
-+++ b/cmake/Macros.cmake
-@@ -105,9 +105,17 @@ macro(sfml_add_library target)
-         endif()
- 
-         # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
--        set_target_properties(${target} PROPERTIES
--                              BUILD_WITH_INSTALL_RPATH 1
--                              INSTALL_NAME_DIR "@rpath")
-+        # but only if cmake rpath options aren't set
-+        if(NOT CMAKE_SKIP_RPATH AND NOT CMAKE_SKIP_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH AND NOT CMAKE_INSTALL_NAME_DIR)
-+            if(CMAKE_SKIP_BUILD_RPATH)
-+                set_target_properties(${target} PROPERTIES
-+                                      INSTALL_NAME_DIR "@rpath")
-+            else()
-+                set_target_properties(${target} PROPERTIES
-+                                      BUILD_WITH_INSTALL_RPATH 1
-+                                      INSTALL_NAME_DIR "@rpath")
-+            endif()
-+        endif()
-     endif()
- 
-     # enable automatic reference counting on iOS
-diff --git a/tools/pkg-config/sfml-audio.pc.in b/tools/pkg-config/sfml-audio.pc.in
-index 7456daaa..0d7a3ce1 100644
---- a/tools/pkg-config/sfml-audio.pc.in
-+++ b/tools/pkg-config/sfml-audio.pc.in
-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, audio module.
- URL: http://www.sfml-dev.org
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
- Requires: sfml-system
-+Requires.private: openal, vorbisenc, vorbisfile, vorbis, ogg, flac
- Libs: -L${libdir} -lsfml-audio
-+# openal may be a system framework
-+Libs.private: @OPENAL_LIBRARY@
- Cflags: -I${includedir}
-diff --git a/tools/pkg-config/sfml-graphics.pc.in b/tools/pkg-config/sfml-graphics.pc.in
-index d0a88a13..a96b72c9 100644
---- a/tools/pkg-config/sfml-graphics.pc.in
-+++ b/tools/pkg-config/sfml-graphics.pc.in
-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, graphics module.
- URL: http://www.sfml-dev.org
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
- Requires: sfml-window
-+Requires.private: sfml-system, freetype2
- Libs: -L${libdir} -lsfml-graphics
-+# gl and jpeg may not be in pkg-config
-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ @JPEG_LIBRARY@
- Cflags: -I${includedir}
-diff --git a/tools/pkg-config/sfml-window.pc.in b/tools/pkg-config/sfml-window.pc.in
-index b0266e67..93bf344c 100644
---- a/tools/pkg-config/sfml-window.pc.in
-+++ b/tools/pkg-config/sfml-window.pc.in
-@@ -9,4 +9,6 @@ URL: http://www.sfml-dev.org
- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
- Requires: sfml-system
- Libs: -L${libdir} -lsfml-window
-+# gl may not be in pkg-config
-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@
- Cflags: -I${includedir}
diff --git a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild b/media-libs/libsfml/libsfml-2.4.2-r2.ebuild
deleted file mode 100644
index dda2accf7c68..000000000000
--- a/media-libs/libsfml/libsfml-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-MY_P="SFML-${PV}"
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	kernel_linux? (
-		virtual/libudev:0
-	)
-	virtual/opengl
-	!kernel_Winnt? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-libs/xcb-util-image
-	)
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( changelog.txt readme.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-no-docs.patch
-	"${FILESDIR}"/${PN}-2.4.2-no-install-extlibs-mingw.patch
-	"${FILESDIR}"/${PN}-2.4.2-pkg-config.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-
-	find examples -name CMakeLists.txt -delete || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSFML_BUILD_DOC=$(usex doc)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-
-	if use kernel_Winnt; then
-		mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.4.2.ebuild b/media-libs/libsfml/libsfml-2.4.2.ebuild
deleted file mode 100644
index cced9bb41bee..000000000000
--- a/media-libs/libsfml/libsfml-2.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-MY_P="SFML-${PV}"
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="amd64 x86"
-IUSE="debug doc examples"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/mesa
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libudev:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/xcb-util-image
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( changelog.txt readme.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSFML_BUILD_DOC=$(usex doc)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-		find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index 22aac292e478..6da461a12eb4 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples"
 
 RDEPEND="
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 465cb3b11448..d29ec9693f25 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -10,5 +10,5 @@ DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6b
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r2.ebuild 769 BLAKE2B 958c67f849ad398c6f4ea6d685a0b33f924884859a32e199d6dff19d1fb4819403eb3e9455bfaa350864335bc12f51a4a71c748684bf80ff6c4f51dfefad947a SHA512 eb762f63d10c9e4c67b6a51523d8e36bce10a5ee837da7a6841536c9b249a371cb4b1488c9041dbddfa0d04d9adc6508276e8890f57b369eed73ccd3e1d0244e
 EBUILD libsidplay-2.1.1-r4.ebuild 1168 BLAKE2B 8b69bec5f74b52932a64ee8ebaa8195afe5ab5cac8fe899c465f32b125fbaeac0f2d8dc03203e3225aa6ed94cc841124aab4613a71f90e71f95a04f3a35f8db3 SHA512 ee3ef694f09cccc476bf1003441afddadc8f085a311889f6cc6be21414581c833bfad9d898aaf8f92380787e7949899fa07907258ace1d902c1131f70d53a8ad
-EBUILD libsidplay-2.1.1-r5.ebuild 1253 BLAKE2B 61a9722b24a4e3c552d18c978f8500b9268a6b9429b2422a6b85615c330e8f7f724c6befaaaf8ad93ef561785fdbbe05566fcfd1ae2ba3f9eb689ccf7ba1b3a9 SHA512 3719193e11d901d5b77e9e3f7fd5a319f74f350800933e3cd5b1e7201d88bbad286e5cbd898f9fd321a76e8809a7fc44ad2a9a2c5b2233fab22229554b228c95
+EBUILD libsidplay-2.1.1-r5.ebuild 1249 BLAKE2B 60734e118e979bb600f6521afd1c9dcdd3b4e3ee1ab50812d969c00391be53b3eadbb6b42d8a62b9402fd7ef4c6acbf29b558bc1e718163c73389b2aa16d5f79 SHA512 6f749ed376d59435169e1ea33ba493724b967c1c6a2e1535bcfdd43bf29cb43dfc85bcd1b10af67f54831117c7515d42d6625a3e81c819de4c544997e3cecb74
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
index cb385dd5622a..a1a433d21cf6 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index c8679756fed1..31220c1590b6 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -10,5 +10,5 @@ AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
 EBUILD libwmf-0.2.8.4-r6.ebuild 2758 BLAKE2B 3f2da42e0f8619f587962fc64bcfef793e243c478907cf3d5e3a0843a70e7a68e4a17c77ac959220ea340e83c84e4849650ffe0ff7ba66d65ee1e54118ddb2ca SHA512 0ed88a4ac51bf4c8ebca0bba2d43f936b8232b5f367012fb20e8423b2bd729a23c79931906bdc042db1789e4454d241fdca8bf49f99835bddfbeacf6a43da7b4
-EBUILD libwmf-0.2.8.4-r7.ebuild 2486 BLAKE2B ecfb71b311cff38fcb24e96457c8dcd07b6c824fad21e2d4391670ab6059234d84641dc7e677f9397a2071080c090c032f258487361205fe7f27fa48324b5587 SHA512 11219ec98903e7e59228e9baad929a7f4e48bf5defedeafe36fd80b3cf299325f1727a8c79714cc318c8daf8770a1bcef27e55f0a39ffd1ed3fe082ae212e0ef
+EBUILD libwmf-0.2.8.4-r7.ebuild 2573 BLAKE2B 418f303733d1e5571c2d2103bae7b89f9876e755960add15ede3e5adbe27dcfa3f16bb235545257e2b01128895ae43306ebf611e9c7561220f4c56e3cf97a484 SHA512 4de425004e1d8f6766e454b785929f958cae2d942e87897a2c01cd0aeaa56eaceab98bddc54dc7705a552242a0621e221c822432d21cae018d6f689816ce7110
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 49561c022086..7026a0a24733 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -84,6 +84,13 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_install() {
+	# address parallel build issue, bug 677566
+	MAKEOPTS=-j1
+
+	default
+}
+
 pkg_preinst() {
 	gnome2_gdk_pixbuf_savelist
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d68727cfc2f6..ddda52f0ea21 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,10 +3,14 @@ DIST mesa-18.3.2.tar.xz 11868440 BLAKE2B 49612671fd4187e71441bc88094f2cde2057b8b
 DIST mesa-18.3.3.tar.xz 11874468 BLAKE2B 406ec67c998934d5334eaf3c34df3012efdaede1850878c9f003a0f06d9247da733f5efa8b27b47b4cdc29d1e2d677e8345aa67b50c508ff8719e0e90a6a3d2d SHA512 cd6214b8bbeb3e3d187139ae1e949684f32f90152e1d7ba8d81222bd088770e28cff7ff165f2ccc41c068950561fe952420c6e54472f7204532a8d8700ff18bb
 DIST mesa-19.0.0-rc1.tar.xz 11917372 BLAKE2B af8003babd9cc5bf8166e4efd4054690a4cbddb43912b7fddbfea6ca3bba0bcc077bcfa05053b53d4ca3c12d112b0a5d4c6176eda245e5cecd2810c8bac7a6a0 SHA512 23d21d6c4f03a1d9073ecb1f43dc251d581cdeb6b7cc24a19c299571070b4184ad4f22b0ca170ca42e58c62bb46eca0dadc334a952bbb7e0379961a30a6ca856
 DIST mesa-19.0.0-rc2.tar.xz 11921808 BLAKE2B 279552393209ee263dd24a5bfdfa1caf2014d3a14249fc738704593aae92de5094d6aafd1099df3136b0efd7c49923d98243e94492d2cd3d065e649b630c2256 SHA512 208f1f40c2724b34447f70cb97bd8e7072ac27f6de030205aeeb754480ffca0101edf536af3e3a8e7cc2f990ef53f485fe4ad44a495b3c27e5a33e091381a087
+DIST mesa-19.0.0-rc3.tar.xz 11919960 BLAKE2B 24b2b6304cc8332dc5edc8db05e5b09e50c87a935057a46c3e9417ff71e1d6bf6150076be0da024d5e972cf3368856108a6730008dd9cf31842d4247f02ae816 SHA512 adcb4cdcda0ef5c43e2257368a674328cb7533c484e631db6ff80d4a6d15ffba4f3f18a063cb63102a7ae89a5954f5e2f45ac8fe295064513f2656198a12307f
+DIST mesa-19.0.0-rc4.tar.xz 11928252 BLAKE2B 8cf4c2671e3de11e4ed65f0a451dae78bb40bfa32753306060be0d1523ed9f15d0ea479b628b592fcc43927e5c82ea8c68ef02494bb17be58b01ddcd2ea4dc3a SHA512 e17bfc29084a8efa259fcca16374f2f33aa1b62e034a8637fe0c9985410b1722fe68092b6f393fbf23f0db6ec3e1d6a191541d37cee650e42909ec7e0232f5a6
 EBUILD mesa-18.2.8.ebuild 13593 BLAKE2B c2038cc507c1b9447f654a1f3b8f6444993393932a48e347fca854738acf1972a867c313a0c86f9c9b6f484bb1d4d817db548694b998dacd169da773bb672a11 SHA512 5807dd6b4a9685409d6dfd6be5cc468f42a979a1baa3684296032edd13a71660efa9ddf910c6d0adeda6bec956e4a5fb44b6d78ab73c1686e82827f41dd3832c
 EBUILD mesa-18.3.2.ebuild 13716 BLAKE2B ca7196dad29a0b79e4233d54d6a8706d09eac7e282af23f0dc54709ae6c3985ca128775ddd1ee56f96fe455dbe23c3ead519a2b74118128d4f19de222573ecf2 SHA512 22f390c6bfdab7314134a70fb204e4b7fdde72487fd5dc23db85bc9e26a2061092e2f34a0e1a7f5dcbea2744582c2720c8a5419b2245457034685fc282bd98d3
 EBUILD mesa-18.3.3.ebuild 13716 BLAKE2B ca7196dad29a0b79e4233d54d6a8706d09eac7e282af23f0dc54709ae6c3985ca128775ddd1ee56f96fe455dbe23c3ead519a2b74118128d4f19de222573ecf2 SHA512 22f390c6bfdab7314134a70fb204e4b7fdde72487fd5dc23db85bc9e26a2061092e2f34a0e1a7f5dcbea2744582c2720c8a5419b2245457034685fc282bd98d3
 EBUILD mesa-19.0.0_rc1.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
 EBUILD mesa-19.0.0_rc2.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
+EBUILD mesa-19.0.0_rc3.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
+EBUILD mesa-19.0.0_rc4.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
 EBUILD mesa-9999.ebuild 13573 BLAKE2B 803b2486f785f04662e70a11531c6f2a45e42a05f22a5227c3983fbe160899b2a7b24bb7bd08cfb937ae6e78a0a839936b0e973be18f175535d4de7e94c57e16 SHA512 2614fd900da21e0b5e28e2381b355965b6e424d64406fd0cfc4e3347d6c7f68f25d964730349c0876049b91c1d02b6920345df0515619d7b8def0d2885786feb
 MISC metadata.xml 1865 BLAKE2B 5c972239c02d0b4c212306d21326706af866576673802c7e28f28434bf1afe4145e89b7fc26947ba2126ecc9b5e57e41f248c9a23dc3e097efaddee177a4b904 SHA512 11a4e9b63b8d7fa041c76ff39694f138781443f80ae8942f845f6b9c30d560c25de83c62ca53f94f5129e42f2ca11c8478e4b5beae427c8352f7489f66e84795
diff --git a/media-libs/mesa/mesa-19.0.0_rc3.ebuild b/media-libs/mesa/mesa-19.0.0_rc3.ebuild
new file mode 100644
index 000000000000..dd35b9d8a136
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.0_rc3.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 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 +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
+	>=app-eselect/eselect-opengl-1.3.0
+	>=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}]
+	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. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="7"
+LLVM_DEPSTR="
+	|| (
+		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 ">=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 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
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+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.0.0_rc4.ebuild b/media-libs/mesa/mesa-19.0.0_rc4.ebuild
new file mode 100644
index 000000000000..dd35b9d8a136
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.0_rc4.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 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 +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
+	>=app-eselect/eselect-opengl-1.3.0
+	>=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}]
+	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. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="7"
+LLVM_DEPSTR="
+	|| (
+		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 ">=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 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
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+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/sampleicc/Manifest b/media-libs/sampleicc/Manifest
index 2756c34c6b44..3e4b8607914e 100644
--- a/media-libs/sampleicc/Manifest
+++ b/media-libs/sampleicc/Manifest
@@ -1,5 +1,3 @@
-DIST SampleICC-1.6.6.tar.gz 660936 BLAKE2B 0a03255d045561a8705003e90bd09252b4494b557f854cf323a4b3c9df7cb2fe05adb5245e05e9498eebf212eb748628df90c187f07b67f083dcbe1cc6a85037 SHA512 72481a9928acddb28272ff36f62cdbfaa88323f862403475acf56d1dfe500bf255203265e866a69853c05209aafc600dbad94e34775d2f239d87b3dba25da364
 DIST SampleICC-1.6.8.tar.gz 708069 BLAKE2B 96d5c34db8f8c5235b53fd7516125ac359788f8e0cf559f6471f54cd269d917c796415e717522cc53ed64f953b8205d1e11cf4ee26ce8c5a0b0d0199cf5b4b8a SHA512 54d9f1fd9a7606d0c723bc0f86b3d54c4d1a54ecc4a3aeea665cb8c58df6555e65dd3706dee05e4c89e8a4ff7abf9f726c54c572b32db710e5b2c22b124bddc8
-EBUILD sampleicc-1.6.6.ebuild 616 BLAKE2B 65203d8e2ad1a2d30dcc4a99ae0e4b120025ad28df7665227095985a40fd7879988d111165dc9f6d0c8801ff11fbd0d92462782f8e2b8ebfd6902f7110487d55 SHA512 7d7be4de670ff5f9bce1e0706938d870dca65efb30b5e1239eb0abf283c3992716884c1c633fafe9fb65cbe23d89e805632237782ebccc80e5d8346da1f0a99a
-EBUILD sampleicc-1.6.8.ebuild 501 BLAKE2B 16b11ede8987fc4cccca808f9b6b640a9c858a417144a74ff57d7b85581386e9962eb6b200b403d7f8cc9ec7eb764d4342ed16028f76f4a6f0087eda74739756 SHA512 37c09907fa88b64fff49da976643b61d7efa095678f2ccdcb9315e0f4bb281d4f119606a9470c01abc373e384728f1721e25736dcf6a7c257b760ac27df1dff2
+EBUILD sampleicc-1.6.8.ebuild 499 BLAKE2B a02d501efeb97c5668fc99954cd7d263bdc33624e0c2d15f246c4e57a6ee4e9b2cb599248d71e3bbd12d0e93950c43b33c1efa2ff3c9b8bc2328c8ec9c5a1c2a SHA512 9877459c97a42e46e0be2a54b5b05bfa7aed280bb6d14439018afc5839c77fb28c8740f36398621781cf5ca994b73b23d420426ebc42274eacd1582b9b0567f8
 MISC metadata.xml 246 BLAKE2B f3b3c9c701ad58602f628c8f5b05570af41c39c8d178cacd8e1e03442d1aeeac0b7e9e8c422e3e5ad574e17d05353bacfed9f29c7a09f28cf91ed611bf613f32 SHA512 280cb836dc57e47036d50a501f9dd3df4ec84dadb5c96cee06d2b10db1cc208b9bf0f6b23181f6d71af611b5fdf32940f0a6d80a74917ff0b2636af0f122b50f
diff --git a/media-libs/sampleicc/sampleicc-1.6.6.ebuild b/media-libs/sampleicc/sampleicc-1.6.6.ebuild
deleted file mode 100644
index f3b6464f89a2..000000000000
--- a/media-libs/sampleicc/sampleicc-1.6.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="C++ library for reading, writing, manipulating, and applying ICC profiles"
-HOMEPAGE="http://sampleicc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/SampleICC-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/SampleICC-${PV}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}
diff --git a/media-libs/sampleicc/sampleicc-1.6.8.ebuild b/media-libs/sampleicc/sampleicc-1.6.8.ebuild
index c38eb895a071..a7961560c496 100644
--- a/media-libs/sampleicc/sampleicc-1.6.8.ebuild
+++ b/media-libs/sampleicc/sampleicc-1.6.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/SampleICC-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="media-libs/tiff"
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 4419f4c3f488..dd192913c832 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,8 +1,5 @@
 AUX taglib-1.11-install-examples.patch 371 BLAKE2B ee42b80e8c6093dbfc4c89c25bcb6bd25e2f5152c14743fa49c6c44a14f93a961f08a4d53337efe0800d98126a8aa58627a330e19386283cc16d8f20c9637262 SHA512 149ce1256ec557ee1e896b56e361f2fcf69633424f9b125666827eda610e84c35bf28e5c3fe5f38d4d87f1eacf977fc5b8b8c2d9c6634997bfe4e4bac122fc37
-AUX taglib-1.11.1-CVE-2017-12678.patch 1340 BLAKE2B 6940c22df9d4d7969253a8755e8050544d733e33cda8fbc1b4991ab94f879d052de31c140c468125b09859625eea84624d6c340f4385a45ee6ca30d8872a556b SHA512 2b5a8854572c572ebdc2e42cb949069d69ada82ba2bf632f08aadb7f603b86352e13a1da80c0e75a2fdeb5c15bd07aa71f558dba35ae098d61aba5e361c2acdf
 AUX taglib-1.11.1_p20181028-version-1.11.2.patch 486 BLAKE2B a0b9021a01268eaeb32cb7a6b333b54df522aaf9d07d9b89870f0dbc38a9648ab9173a916bd8a29537b454631be5cd32c2dfb256ebf2f2b86000fec8d2f32bb6 SHA512 e5c3d814ae7c4b2cb84eded86e909d2db985ec21409767a9bdd502d562b55edf30c74834e2829199f1fd20ca8b1dab832a78b05246ae82fe6ff94cb1266d98d0
-DIST taglib-1.11.1.tar.gz 1261620 BLAKE2B b33212df2a63d8d6bbca62b175812ec52783fdbfed8fb7bc5dedde845ac01e4f89a64d96b231e1db1e5e609e84dd84d83a2266c1f9ed371f1fad7ffca50486ac SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98
 DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256
-EBUILD taglib-1.11.1-r1.ebuild 1450 BLAKE2B cf7bcbc10d1dd4860d2b86095266fc6b55d8e021edc9a0bd0ae94277b92fe0d360c9937b380a20a9a1c75953c64790ebb46ab6f80a08fddbdc632ac19e982570 SHA512 cc8076635f8c1992d8c27c578336cd96fd502064bdcb9fc21693e966cc79835e96f6b9da72e126c2d2fc87852f38d76f5bf440dc35eb93ba6407afe99004ed27
-EBUILD taglib-1.11.1_p20181028.ebuild 1430 BLAKE2B ade65fa394d6fc063b97990d03db8a85700b87c0fc3dece3bad7df185551ebc8c7c2fee74ee030ea08620d44c222750bee5ce380ce76efa1e64c89b6547f597c SHA512 63697c8ee370e60b8023cabf6780a8f4a9442919d305d01a53ad9d8f1cf242199edee5787c44c353f1140d8bfa527887c13f9452bd342654217f0f6e95ae4755
-MISC metadata.xml 425 BLAKE2B 47fff2e6d248780975e5b7748de1cdce6f09d614b79ee055da57dc9062c7567f46864bc306bfabf17a7c61dbfca0d16df41d9c8a574a8fc220e359d41f247b1e SHA512 31bd061f371cc8f300a22c150b86ef163f0cdd1d5e6b1c0ef0652038a2a1a5372a2910e201df28a70cb57f87945636b1ad352858f75714f3889068f94391c4d0
+EBUILD taglib-1.11.1_p20181028.ebuild 1429 BLAKE2B 38af0c56fe30564d21c0658ac4fa8ccfed00b5dff3170cea2de9637848c442c7dc9864773ed01e2e48333bdcfb4a4e299c3a7d73f365553aa9e8327c2b899c61 SHA512 2f9adede95749f4a7359495f0b5bee05504091c26bb5095bb56594c86383abd8bd75e4e6f79f44ef9c71df961a423ad8efb1edef357e2134bc4a01b875f6db7a
+MISC metadata.xml 327 BLAKE2B 3972cb6de796dc7ba0d48715a30f265c10bfebe2e192d634267ffa0dc2323283b16c38f9bd891dbd1b7c646929e41116a5924d426fb1df46e63f3a4b4f5920be SHA512 05909165d6fff2283a6d55d1c454d97541e4e5ac35a6997123f548b3a86d108231928a4136cea35a323c942a82d50072f66840347fd1b651d4c1f3a53928c721
diff --git a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
deleted file mode 100644
index 4b567da19821..000000000000
--- a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
-From: "Stephen F. Booth" <me@sbooth.org>
-Date: Sun, 23 Jul 2017 10:11:09 -0400
-Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame
-
-If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame
-which causes problems in rebuildAggregateFrames() when it is assumed
-that TDRC is a TextIdentificationFrame
----
- taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-index 759a9b7be..9347ab869 100644
---- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
-+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
-@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const
-      tag->frameList("TDAT").size() == 1)
-   {
-     TextIdentificationFrame *tdrc =
--      static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-+      dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
-     UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front());
- 
--    if(tdrc->fieldList().size() == 1 &&
-+    if(tdrc &&
-+       tdrc->fieldList().size() == 1 &&
-        tdrc->fieldList().front().size() == 4 &&
-        tdat->data().size() >= 5)
-     {
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index cabb8e8cf5a6..0d251d573cf3 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -5,9 +5,6 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">taglib/taglib</remote-id>
 	</upstream>
diff --git a/media-libs/taglib/taglib-1.11.1-r1.ebuild b/media-libs/taglib/taglib-1.11.1-r1.ebuild
deleted file mode 100644
index ac42c4b3bf4d..000000000000
--- a/media-libs/taglib/taglib-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="boost debug examples test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11-install-examples.patch
-	"${FILESDIR}"/${P}-CVE-2017-12678.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
-		-i CMakeLists.txt \
-		-i ConfigureChecks.cmake || die
-
-	# bug 651744
-	append-cxxflags -std=c++11
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		$(cmake-utils_use_find_package boost Boost)
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
index c4e1217ecdc1..39371d8c5f68 100644
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"
 
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index d772c69c0281..1ca686533642 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -1,7 +1,8 @@
+AUX vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch 804 BLAKE2B 69c70f8b9dcefb9f1f4696d7911b34d2a4b9abea43a283cbc66faa923d5e566cf04ec996f7073a2440356a2f5889684cdcae2bb42787695b762045948b58ce18 SHA512 6ff92765e21a9f883d5ebbcd647c17f443fe4e47bda32899c7950a63e74427ffe939021adc1bd74f9fb9c72d7c11300cbe46d8ce4ee662036f93c68ee7c5b934
 AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
 AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r1.ebuild 1661 BLAKE2B b83149cd32ba47faecfaf266ab56a4f4a248b90ab817227b49e7bea7f3174f5eed32fa1ced6a69c1652a4faa85025523dc9f68d1c6c7439d2a0deb649b2ac965 SHA512 c3fe3cf99546c38a65e3b4a17a56d341aba8bc87bdd6e2d81296936550250c7e09f16d49fb076485d304df57e4887b5623c79f031a706d50eebd641e13e7f4ae
+EBUILD vidstab-1.1.0-r1.ebuild 1752 BLAKE2B 79290984b0ab133d9f7d8d0d99e451e54dfed62a949a5e15d95e1f657ac9ef8089cf8f966ab730b11df3547e3171c19365aeaf14a5b95ec1a34d473c200f42d8 SHA512 6ffb9dc71a558d36bcfd7390811cf78775ad674452a4d466c256e057336283c11cb0a11277e188cd1fed7f58cfeb55891ba3969795e3d7a4823e98ec7ff9e021
 EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
 EBUILD vidstab-9999.ebuild 1487 BLAKE2B 48a7211ee43e3f96a97e9dcf23e9781bebeb5da7f70b814d303d9a3effb053569857530edd326c977915ac13fa5697bbca59b6256b94837cd8e1b24aeda3065b SHA512 d1124e1c93b4d50e60a7b65b6046787baa15c3ff3a37dbe5ff06b4a67a0012ead3f9a709de6ebc370582d45bca6d1f45f51811f1bd627219f65a7030175748fb
 MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
new file mode 100644
index 000000000000..88d260f429ca
--- /dev/null
+++ b/media-libs/vidstab/files/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch
@@ -0,0 +1,26 @@
+From a6438c4b3ea5a00f2896b903a4bda0a4efa241f4 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 12 Feb 2019 16:39:06 -0500
+Subject: [PATCH] Use OpenMP only if available in test_motiondetect
+
+Only call `omp_set_dynamic( 1 );` if `USE_OMP`
+
+Fixes `undefined reference to `omp_set_dynamic'` when not using OpenMP
+---
+ tests/test_motiondetect.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test_motiondetect.c b/tests/test_motiondetect.c
+index 0f37def..125f4bd 100644
+--- a/tests/test_motiondetect.c
++++ b/tests/test_motiondetect.c
+@@ -19,7 +19,9 @@ void test_motionDetect(TestData* testdata){
+     int i;
+ 
+     int start = timeOfDayinMS();
++#ifdef USE_OMP
+     omp_set_dynamic( 1 );
++#endif
+     md.conf.numThreads=threads;
+ 
+     for(i=0; i<numruns; i++){
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
index 3c4dc91eba9a..cf1db90cbdc0 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/vid.stab-${PV}"
 fi
 
@@ -25,6 +25,7 @@ IUSE="openmp cpu_flags_x86_sse2"
 PATCHES=(
 	"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
 	"${FILESDIR}/vidstab-1.1.0-tests-use-sse2-only-if-available.patch"
+	"${FILESDIR}/vidstab-1.1.0-tests-1.1.0-fix-test_motiondetect-without-openmp.patch"
 )
 src_prepare() {
 	# USE=cpu_flags_x86_sse2 instead
diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest
index 5d1fc4617768..7799051aa295 100644
--- a/media-libs/webrtc-audio-processing/Manifest
+++ b/media-libs/webrtc-audio-processing/Manifest
@@ -1,6 +1,6 @@
 AUX webrtc-audio-processing-0.3-proper_detection_cxxabi_execinfo.patch 2251 BLAKE2B f534e6f58d86693d257fa653d92ca07db2c1d34b88fda3b112237cff99eed81252f4111d64070f96a4265dc2655896843dbbfa01785ed18c6ea10b0eec74aeb9 SHA512 592345960101a9538c6e1197bc8cb296ca0fb0f8c6b9b64f1f4fd906ae4a9c7e9e92de740bf6e1e38cc4efca7cab8265b59542ffcad5d04bb6f1abb399851f0f
 DIST webrtc-audio-processing-0.3.1.tar.xz 695920 BLAKE2B 833c6d12b358918d95dee5b165308c8cc382f98264349fd38649bfe478557765b85d9112a35194676ee52a8ef297fb7cb7e3a570d9c2295785b6fb97d35be948 SHA512 1c7a2d16f7f6c03cf6d60405d0dcd224caae6e80c9c4d43f8373bad2446affcdf49a02efb0085387328289aa79c8981dcaedff876cde55be9602dbde9c3f440b
 DIST webrtc-audio-processing-0.3.tar.xz 688096 BLAKE2B 063e50ad6690c7b96e577d4a9c378328aafad6fd904ab18283ff2d7f10cc26f4b57f9b6293e880bffc105f7a6c91ec5c7ed9cf7c1aa422c40e64eb0b76dd0541 SHA512 fac99ae0c28290afedce8745bb159af1d375bf17e448a4e020b3b04f4ade24929d1d110923c4363c06a963675a201135621f0d20e57edff42bbcfbaedf91b4d0
-EBUILD webrtc-audio-processing-0.3.1.ebuild 778 BLAKE2B e1d979bea61e6511b386601ca4d2e2eab35d3f299187b7aae45971e22e4554ea23dd47220a7e2781ce604673ff5be14539b8153b89ca290880297306cda2af52 SHA512 c6ddab22620731a8dcab715ea0716f977528eddfcb7a37a6a1080b5b33b120853f24ca74febbcc88fea2b7f432454621a18947f26c8e776c06ab348d9807a7ec
+EBUILD webrtc-audio-processing-0.3.1.ebuild 774 BLAKE2B 6eb9e60997137cf26c4062c93b3e3b5641be2f6bc31481e6a8355a8cab11913f036e51975d8b73c97864eb38ac0622eb711e51c609b9fb88d763d1a8fd093c66 SHA512 b63f9edb709ed91caa849859282343062dd414d3b19d7dee0bdcb551aa654736e5fe66a60befae9fd5c39c6f76e347e21beb7fc29b3687976d3a6755dd29ac26
 EBUILD webrtc-audio-processing-0.3.ebuild 773 BLAKE2B 2c3abcadaf4fddf4f02d226c16d6e0fc89f2556e03f9c37a6491bd696150cd6384a417aea7b9d5323fdf465681165a61d7f64ad7d303985f6a8a761b04fe539a SHA512 ef4f4b71b366f6dc9bf352c618bb1dc33f9b041205bfa0d7356c1da74b196f840837905f06125b988e62916e669c771eb5b18cfe87852ae8461c0d926988929f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1.ebuild
index aa748cab6267..c2a4872e9562 100644
--- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1.ebuild
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS NEWS README.md )
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 1d88a8d54708..8da2cb66d613 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,4 +1,6 @@
 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
+DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 EBUILD x264-0.0.20170701.ebuild 1908 BLAKE2B 0d707b757a65ca4436f04d5cbdbd11682f61496dfe9e19a73079476452e397928313e1ae030db6cb68d0c8fa857ce925a9b7a9b69846fe6147b659ade30e6469 SHA512 4d6505deffec4108071dbbdb0788a0eb59695703890d168bc641e361af2b6c4d05606b415f0bb8a6dd3e6dd629dd2eb8390d3a2f2847369bf7c5d567dff9b105
+EBUILD x264-0.0.20190214.ebuild 1818 BLAKE2B 2f5792963f71ab0041436d84a2ccfc542ff1b020ec43b5933174ca8d79e5f1d7224658bbd6fff89f5e86e077f1eab771207f932704f4e2dedee41563dd9faffe SHA512 d6523f4a919500361cbf4c8f9530de38d9201a903fc8c3b3fc9dbcda22d571b54568a79a0d95b4e88015f44d95987f10aff5d6105bb94ada96b077ff7b13c641
 EBUILD x264-9999.ebuild 1818 BLAKE2B 2f5792963f71ab0041436d84a2ccfc542ff1b020ec43b5933174ca8d79e5f1d7224658bbd6fff89f5e86e077f1eab771207f932704f4e2dedee41563dd9faffe SHA512 d6523f4a919500361cbf4c8f9530de38d9201a903fc8c3b3fc9dbcda22d571b54568a79a0d95b4e88015f44d95987f10aff5d6105bb94ada96b077ff7b13c641
 MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
new file mode 100644
index 000000000000..0128bcd158b6
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20190214.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
+else
+	MY_P="x264-snapshot-$(ver_cut 3)-2245"
+	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0/157" # SONAME
+
+LICENSE="GPL-2"
+IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )
+	opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
+
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
+
+multilib_src_configure() {
+	tc-export CC
+	local asm_conf=""
+
+	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then
+		asm_conf=" --disable-asm"
+	fi
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex opencl "" "--disable-opencl") \
+		$(usex static-libs "--enable-static" "") \
+		$(usex threads "" "--disable-thread") \
+		${asm_conf} || die
+}
-- 
cgit v1.2.3