gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /media-libs
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
89 files changed, 1030 insertions, 646 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0847c281c0c8..08688cc7a6bc 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ampache_browser/Manifest b/media-libs/ampache_browser/Manifest
index d02a0112c348..835d3b0fcae4 100644
--- a/media-libs/ampache_browser/Manifest
+++ b/media-libs/ampache_browser/Manifest
@@ -1,3 +1,5 @@
 DIST ampache_browser-1.0.0.tar.gz 72078 BLAKE2B 1f838594e4c1c00f76c33ed50e644f467affec3d0bb456761e4fe871a876daf99ce9aa0060522ad9a98b8031311f921a101dfd1c47425de76c463a8334108e37 SHA512 9757052a98134177f185fb8214f64c72f601d27c0b5fc924b5ff0fdaac849e188c03f81b4806e14f97c102b1b74791813272aceed97b3f8a5ecfadc374ea0269
+DIST ampache_browser-1.0.1.tar.gz 73526 BLAKE2B 8939712957bacf8e3ed9ed808ada265a4c065e0d983ffb9dbc913ea51325eb61e2fe782a32f1cac5a3cae49207acd9bfc7d61c6c5a4affe448815ff74334cf27 SHA512 1e0100789a63c90f89d24c64bc2b139fbd4ca926f1a5225bc9d4a2061007302dcf6ce26e193dffe4e4f0f965d451e8b7a568ee11fa1d8d29d0dbc4218f51c12b
 EBUILD ampache_browser-1.0.0.ebuild 596 BLAKE2B 3b2993cae10a6172172903aff2864d4e6ca671818972d14a1239a91c9e3c1f958ac6ff71df9c7921e3a2819fe3ba5089c4047988dce03b119ebcc3ed039815e2 SHA512 97fac981636d486e47f84f80871fac21fdbcdff7a0d420368c2fa65a700234ffe534090fd3196ce81b3ff2e8c9b800fb70b33dbb348fdf44bd2446751bbde204
+EBUILD ampache_browser-1.0.1.ebuild 573 BLAKE2B 544aecf7021daa36866b6a54dd8dcb068fae39b5fe0783b05342430c8c038a8b31b5556313c95ae5466113d6f6f55c6ff171229750246fbe5899540fc27db208 SHA512 cc041f7bd684fc4e107a783a90de93b4a4a7fca10d7b46f469e56927fb30d318ef140f3b177d378ce6a43f97859d0753a8b101512f68235864b14c9329ba25fc
 MISC metadata.xml 470 BLAKE2B bd5d864586a58f4f52c781bf056cdfe0f3ba9dee7544c2e89a050b5c07534257b6d464fc5ee85c3da6e8ca3b4ab8a840682e3e3e874c221834fb5921e8a5c2e9 SHA512 08a104211da6abdd2eee64dd4a24647f838a324d3a20a430d9ce676df02e5a0785562c34a06c7d0be43a9e3225ef767ae320d401e2199f0633948823e6377429
diff --git a/media-libs/ampache_browser/ampache_browser-1.0.1.ebuild b/media-libs/ampache_browser/ampache_browser-1.0.1.ebuild
new file mode 100644
index 000000000000..217a76ee6d7f
--- /dev/null
+++ b/media-libs/ampache_browser/ampache_browser-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Ampache desktop client library"
+HOMEPAGE="http://ampache-browser.org"
+SRC_URI="https://github.com/ampache-browser/ampache_browser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+
+RDEPEND="dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_NLS="$(usex nls)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 8acd969c45eb..9efd0e178a8f 100644
--- a/media-libs/bio2jack/Manifest
+++ b/media-libs/bio2jack/Manifest
@@ -1,4 +1,4 @@
 DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a
 EBUILD bio2jack-0.9-r1.ebuild 1124 BLAKE2B 629a4baf8176e3c724e507442eb39836e4fdcf28e2c0d734615e1d66bd9973b9336499355f716f6a1d5f2595a5cd9365342db913d8476c4d8af0f3a0d4c4760a SHA512 247054c9c07e628a71396f69286d240a6d468d566ccc223c2156d8c61658578ba1ae1660ca06b736147c2001cbd563e142794ad19617357ec0da48087b707038
-EBUILD bio2jack-0.9-r2.ebuild 1118 BLAKE2B e8bcb3547bf545f0aa4f542da23b8c187883d63e61d4f5baa5c29a5c63dffaeb5480f8b9610c6e074a2a1b54fbc472053dbb1a4160cf4c7790fe038f3c488f56 SHA512 78ea95a3253c6884c30be132237917068e822c289900e7bba7370742634be8629bfae0d827dd9d478f36704df8393955db03d44f31c077a5b0ac57bfd4bc68db
+EBUILD bio2jack-0.9-r2.ebuild 1117 BLAKE2B 24b211250ad3147fcf4fa42566fe0488a2542b6082f2da8935ef182e96e8efb7ff09b678106ae5ae8eafb6a73d6643a1b39f490f31881bda8203d73bd6847ec8 SHA512 2ce2cd2bac46895ef77c40b35b790e0c9eb5f95ce8631e9a908101cd7d25c7aee88c26b049fb0ca16bbd40691032020d34e2fe163a03c3a3ece8a3ddaf90c0f8
 MISC metadata.xml 331 BLAKE2B 10b8c96e08bc97853a40647f2875aafc8c7de9994ba5af8cf5e2ed429efc2cd494b65d1d6dd424da234785568ebaeec822f15c0b088a0bc8df1a12322f2472bf SHA512 57c44fcd806d4de0339c0a6041635dac52545c8aa71516aefcde41613a8ec92f293c5e28f7b04ed3ab746fdccee306b80a44ef4faef24b2ade1abd2be831ca27
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 3083ae005de0..10a0f53f039c 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libsamplerate
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 641e19f0bcaa..f3ca78eb3dd8 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -3,5 +3,5 @@ DIST clutter-gst-3.0.24.tar.xz 417796 BLAKE2B d29bb356cd4f2dd9984a94cd2fa8467635
 DIST clutter-gst-3.0.26.tar.xz 402976 BLAKE2B 41a8da175c7b99e9072e76cd0fe8c89050a3b8a11c6c3e7887c1fc466e57d9e9a4f3c2efbc030dc3da51eebc54d56ec1702298bb04081f0a6a169f4f94fbb01c SHA512 c1dca7b6fb7756dd1642e176b2d26f28330388283623c46350a8c979f3dd4af916a9807dfe4937ebd9f747f781a7dad4f0f8eea74ba8423c32bd92610eebcbc7
 EBUILD clutter-gst-2.0.18.ebuild 2078 BLAKE2B d625b47bcc6bc3f723700dd51ceb202a9639923b46e7202df07f54c6783ea7c2e8ec26f11f29d02660591b82b519984184e20f4e7fa1bbe72b2f1ca84d586129 SHA512 6f8ef24b5e6a49a4d55a4d5ebc7e64ec32d071eb61b7e81e092e63ff5344808b89cf3ce3e15e7d1799627ccb00d873a50b93f2d6a8791529e3e6d0e56620f3b4
 EBUILD clutter-gst-3.0.24.ebuild 1449 BLAKE2B eb1e92cc37002f80a5c4e89c227cfa3821cf2a6f61dc016c339ec453e4053647fdfa36b0142411608f2e30c271a856b78d6dab04e70c83e8291605b69b1fc7ff SHA512 6d84c897f361dfa21fc26152f2f403ff3457f299f7270c643c3b3bf108bfe7cb7d49b7662d06879f93652d6b8cc6685b5c6fb8db67f12550125509a80ff22821
-EBUILD clutter-gst-3.0.26.ebuild 1451 BLAKE2B e105a27cdf04f91ae4ae07c707a4d6c070b1226e615a0ee4008fdeb45faa1efcbbaf0cd73cad027c08b8c6372f6645eb224f17c562922ef5f1564dba98d9bf15 SHA512 797596a9d04e5fa3b6a873767e5f9eab2755a1334324f81eca341d485312cfb75ef2f7df31613f97fe32c291e8f2d352b613e4aec20ed109999bd0f7867698c6
+EBUILD clutter-gst-3.0.26.ebuild 1449 BLAKE2B 487d89353835d667e0cafebb30a4d1fbae7578e8729ef1da573707791f2ce1362bff6661cfab5fde273abe005b3e826ef8b7818224f4e270f60ee1b2ab566781 SHA512 0342b96a22002ba8a57be7a714e29fc8dbbeb80793b4203d4aa7b98e3f0e20a93ab50d68a0857a2eef848222f12aba38a1389c2f502601ee606dccc08385ac8e
 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 96359bc33783..9458d0f7985a 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X debug examples +introspection udev"
 
 # >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 7c3de82712f8..85a07e5f91f1 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-1.26.2.tar.xz 5353736 BLAKE2B ac30cee3c5a8ed786c38820b7afb86e80929c2a797b737b35650ae6dd856576d72cc7f5407a984f418e255d6ab43c8d3ca9d7efd6f50650b2e0c733ecca19114 SHA512 c8008a1a1f111313d9abaff8d4415f112ddc32a02e08845f3735d33bb25b72b082f133daba06749bb9595eaf1ba83b308d30a413fbbe8dcdc1afdd7077a30937
-EBUILD clutter-1.26.2.ebuild 2867 BLAKE2B 02f520f6ec8b3fb07ab845fa7ea1860252ae98a4fc1e700eabb8675a7456c6b6494581f265876c2f12ce30037bc1ba324a4cd43789f7447cf172d65a6bfa3072 SHA512 b34aca923c23ac47980aeef1f4d07632f9f9e94c0f9e780868716a316a1bb6278bc49275d55a735c409653f2d5c483f10f60405dc291cc29583b805fc3f3cf98
+EBUILD clutter-1.26.2-r1.ebuild 2872 BLAKE2B 09331e4fd43a46cba083eb17378d7b2e33b17d699f77385504180c8af2fed4d9ac903932badbbebaa362bd640fcc15293d821568643bf5765b517aebf040f705 SHA512 eca64b0eba586bf2b4a6a33d77d4630d1d7d712010c0abd5b3f6beb5f8051de1bbdfa2632bc5479b698f1a5b45dec14ce56f1cb50352597370c17b2fa25dc458
 MISC metadata.xml 404 BLAKE2B 45f5b28d9e612464ad5f56c016adae7466e549403a3939fddc433f9f428476db7b4e5a2436a436b0f9c46176bf849938c4c8895ae8f464115ea6ffeedac0f19d SHA512 c6e268f9e2fd4400fd0e7c265b6c64b738a22005ea9af7d792c45a8bd1de8fe81ac1d534cbfc2988cf55bd810aa84bdddf45d3ce33c3bf60e5030fc48d467db6
diff --git a/media-libs/clutter/clutter-1.26.2.ebuild b/media-libs/clutter/clutter-1.26.2-r1.ebuild
index 5aaee721b632..22a03103bd96 100644
--- a/media-libs/clutter/clutter-1.26.2.ebuild
+++ b/media-libs/clutter/clutter-1.26.2-r1.ebuild
@@ -47,7 +47,6 @@ RDEPEND="
 		>=x11-libs/libX11-1.3.1
 		x11-libs/libXext
 		x11-libs/libXdamage
-		x11-proto/inputproto
 		>=x11-libs/libXi-1.3
 		>=x11-libs/libXcomposite-0.4 )
 	wayland? (
@@ -62,6 +61,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.20
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
 		dev-libs/libxslt )
+	X? ( x11-base/xorg-proto )
 	test? ( x11-libs/gdk-pixbuf )
 "
 
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index f82214e62dcc..16895e87a458 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -5,5 +5,5 @@ DIST exempi-2.4.2.tar.gz 3911796 BLAKE2B 73fc84dfff84b608e1408678af06b017617c3be
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
 EBUILD exempi-2.2.1.ebuild 1067 BLAKE2B 0c3a3a919e27ed78ef0cd4c9912dd48aff0ed0b378214fe11b6abd25a67ec4ced85b0fc8191c2df91981535199ae7ac65e1a823b9b1a3aac0dbd6588dc758e6f SHA512 4671cc734e821f6fddea6a84c7b67f3dd58549be5d76acf8f99c44aaafda9cfcdf1ffca73262c8b67f355431f58a5fe3ebe37566c64ac58d154442305c35c8fa
 EBUILD exempi-2.4.2.ebuild 1168 BLAKE2B 20951be88c2e85f5ffc13bf7b36ab63d7130d84e8213c93c413f83e415f194c2c4477ccd8e228a706461499f549a0e00bf77f1b69a4bbbc645dbb441b8dacc66 SHA512 45e1f895a0cb7054f08f4d426d47c1be81e8d2367f3aceb2c2ca9cb3becc52742c314ded6e1da97fdc0af69b5e49404285b236235de340bafbfde0f8c0b26072
-EBUILD exempi-2.4.5.ebuild 1173 BLAKE2B df97f272d97bc02dd66aab88d9f8d1bdadfdfaa8e180b783530b78cdc59dc6eb78ede0957e831212a155a4dedd47349f5163ff8c1555129da46fabeb8feadda0 SHA512 d60f39627ef818780fb5e3a1d3633727a0be39afe8b872c97d6d51e882e3a16420663100f7b21dbe87bb602ed1bacd3cd18efe1747f47d6f83552b8b5eeba28a
+EBUILD exempi-2.4.5.ebuild 1172 BLAKE2B e0ae5fd94d47b0b71dc668183c39b57218a2de780132e813824e673c8e03f8db85f43b80f655a86fb7558023d78f6c98591a7616ac62686275b7b46443130a15 SHA512 66488219608bd2c493e3f8c254ad9aee87be62c9a92e59fc0fffba930f8e41ca5026b8dd19ecad20c0fd5f88759195cb50948e7bc39342dd4a4de5340838a40f
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5.ebuild b/media-libs/exempi/exempi-2.4.5.ebuild
index 95c6013e696d..4a723cd96269 100644
--- a/media-libs/exempi/exempi-2.4.5.ebuild
+++ b/media-libs/exempi/exempi-2.4.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="examples static-libs test"
 
 RDEPEND="
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index fc9ecb4515eb..ee9536ec91bb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -12,5 +12,5 @@ DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fa
 EBUILD freetype-2.8.1.ebuild 5286 BLAKE2B 111b52cc01d22c50ee59f12e022026420883123aa8a83ad4aff9fc88f3e9716d98f82e66308edfef966bc5f4830d2a147539b65818e65dc7816e1f38cd1b5e20 SHA512 e983b5d145fd2357b7cfaa8887fab2a6e124657f3ffb8b7358d6957c07b248ae79dce45a816cffadb2a35f5c654ff707da6dc9a92648e254f42493278b1a0793
 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
-EBUILD freetype-9999.ebuild 6493 BLAKE2B 1c7aac501a5527fcdfb1e02947affa657f26bcb5e5fae2d51af2dc0c82059d76c22f7e9cb198758ea7075b87ec0bc1c7db86592c082731f634f1eeaeb4e06196 SHA512 83a558d45129dec28baa26192e03c2b156a17baa60ddb857cee8973505c7ecfd4c938fa1c50b047bdb3a805d39dfd7f2b5feb427972bc9e958b768c8ba1d7fe5
+EBUILD freetype-9999.ebuild 6391 BLAKE2B 692190bd0f74bde9a86e436078584c9e70e672ad409c72ff6c5712948214464da971998a0a8146906a45ca19ac9bc39d5f90ac8a58f735c60003aaa37adb7b5e SHA512 87c1df557644d23949a44c511396e9c91da84a2aa8e53ac8c36d8d416c9619cc106f1796d6a41b204638d4b9d0fe963ad1c8b9160195b2d2fcaaca26e8bf9786
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 4fa091f67693..ba2ddfe1a614 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -3,17 +3,11 @@
 
 EAPI=6
 
-SCM=
-[[ "${PV}" = 9999 ]] && SCM="autotools git-r3"
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs ${SCM}
-unset SCM
-
-INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz
-	infinality png static-libs utils"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
@@ -23,7 +17,9 @@ if [[ "${PV}" != 9999 ]] ; then
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+="doc"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
@@ -52,33 +48,37 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
 )
 
-src_fetch() {
+_egit_repo_handler() {
 	if [[ "${PV}" = 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
 		local EGIT_REPO_URI
 		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
-		git-r3_src_fetch
+		git-r3_src_${phase}
 		if use utils ; then
 			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
-			git-r3_src_fetch
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
 		fi
 	else
 		default
 	fi
 }
 
+src_fetch() {
+	_egit_repo_handler fetch
+}
+
 src_unpack() {
-	if [[ "${PV}" = 9999 ]] ; then
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2.git"
-		git-r3_src_unpack
-		if use utils ; then
-			EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_unpack
-		fi
-	else
-		default
-	fi
+	_egit_repo_handler unpack
 }
 
 src_prepare() {
@@ -174,8 +174,7 @@ multilib_src_configure() {
 		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
 	)
 
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -199,7 +198,7 @@ multilib_src_install() {
 		local ft2demo
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
 			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
-				"${ED}"/usr/bin || die
+				"${ED%/}"/usr/bin || die
 		done
 	fi
 }
@@ -211,8 +210,8 @@ multilib_src_install_all() {
 		local header
 		find src/truetype include/freetype/internal -name '*.h' | \
 		while read header; do
-			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
 		done
 	fi
 
@@ -222,5 +221,5 @@ multilib_src_install_all() {
 		dodoc -r docs/*
 	fi
 
-	prune_libtool_files --all
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 844abd1d6ba5..47a15b3eb5c1 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,3 @@
-DIST libgd-2.2.4.tar.xz 2478528 BLAKE2B bec49fd50465549d13a403e6f2d487ef83633842ff313a44f45ea9bf50c66e70186f314da5a943cc4199185b992f8178334bfb14fb039fe51cdb296e80648cdc SHA512 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.4.ebuild 2072 BLAKE2B 1acf2722c761a805ce0fa14a6301d04c7fb00bc4cfd2e9b21d8b92d7521154382cfcd56c7a0be3daadfe8420f38457038228bd88a8b4fba257eba720d5a6bd11 SHA512 016b8b4c88a5f50b931e903b1dab5f029da8892269eb3e2e16623936c0764b0ae0360a73b6ddc0cec5ed2587784bdf621e54a2d830a4efa866b14d551623fa54
-EBUILD gd-2.2.5.ebuild 2039 BLAKE2B 0911449ea28fbde0fab2922c00f2d3a261a9e6e4d85bb9c1663c7a73465c89d3e025387aed73768f3c698b4015577c4777e9cde18ff325c5a0421e9dcc066f13 SHA512 7cf184be25b5cacea9d61162d12d1c38a309593ab525cf735fbaebb366ff6302b583eb46aed1944d5fc300dc03c8246e919023596d366519f081c114c3ef501c
+EBUILD gd-2.2.5.ebuild 2038 BLAKE2B 94e061857acfd83a4142d7ed03992f96fe5efca3c0da4c0fc1ec5de2dc8c3f949849b1753155cf8b098ee335f4d60cd6acd2a51b34d065b691e48195e0f237a7 SHA512 afdca8fa6b31f1842fc2a825b97ec02d4a006654d42d65b56635ec632423d97f622a3f6293771ca5f5a7343a606db19a79f466b5554d93d5a8b0ab3cdc5c68f9
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.4.ebuild b/media-libs/gd/gd-2.2.4.ebuild
deleted file mode 100644
index 64fb1ae3054d..000000000000
--- a/media-libs/gd/gd-2.2.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A graphics library for fast image creation"
-HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="prefix? ( fontconfig )"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
-	default
-	elibtoolize  # for shared library on Solaris
-}
-
-multilib_src_configure() {
-	# we aren't actually {en,dis}abling X here ... the configure
-	# script uses it just to add explicit -I/-L paths which we
-	# don't care about on Gentoo systems.
-	local myeconfargs=(
-		--disable-werror
-		--without-x
-		--without-liq
-		$(use_enable static-libs static)
-		$(use_with fontconfig)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype freetype)
-		$(use_with jpeg)
-		$(use_with webp)
-		$(use_with xpm)
-		$(use_with zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
index 998ab0713c39..545b781f4045 100644
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ b/media-libs/gd/gd-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f861aa078930..0f98808516e6 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,6 +3,6 @@ DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
 EBUILD harfbuzz-1.7.5.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
-EBUILD harfbuzz-1.7.6.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
+EBUILD harfbuzz-1.7.6.ebuild 3208 BLAKE2B aaf4e9f78c98e6b16dcf925ecf1553e8ebedbb29488923113f543b770fd7146f04653e3d6e576882a4d6c8630b4907a85b73428bc24b7c79a48ce7eeb9178b28 SHA512 1409c611b8049bed9e9af55d31b5078294112bf92391ab1ab7cda1517693690c57d20701aa08b0645cc780d83a509e08a417c36c3065415cb986ac2013089aca
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 81bf676d86a2..652f9591f8d5 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index d0cceb8f5f19..b33ff44eb1bc 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,6 +1,8 @@
 DIST imlib2-1.4.10.tar.gz 1016606 BLAKE2B 8d70930d3f4dabb3ead557337ad8eb65ebc84afce40fce97bd1b5bf3e78092d7c7d6c8a3d3604b6d6026cec4b7460a51d966c63a2d4b315c197de233a1205f32 SHA512 e8ba42399773fc8e340b914be4b07bb170ad39ea0840f909cc611ce2372fd2467148f0319aeae1a10b8b4f5ea6b38b1fc1fc68f649d4940b9096a2633a588987
 DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538ae8beec23ffd96254b303c5ddd3e46c8850221f7ad24a462c9f04daee155878b41d96d602f3c9ca6aac2b1e386 SHA512 303436f447142153928e2d76226b6798c65cb834bf3bfb760e278d2558a3f072ff43fe46616baeea927254200c4535cc323f6a83c5d869def4f6a7213e30e2db
+DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 EBUILD imlib2-1.4.10.ebuild 2087 BLAKE2B 4be5f44f59fbe143b3edbdd90c9cafff323f78add0e2e9909e08a5e27d5d6de9adea2266dbfa1d80a3481ee36b217a0bdf6974fa515589fb59f417df8b2ab36f SHA512 a1e9ec3050489cdede172c5f0bb213663f17f6ab9f06c24592d282568f5eacd9f591c353aabdcad97ed214cd752f0a802db1d2f94256bad5a4c4f13734325efd
 EBUILD imlib2-1.4.9.ebuild 2070 BLAKE2B abc5e363da21bad5b8f2e10ce45a0d03ae3e439b40b454a5f56463ac052d1ae272f28fc1418c1bdfcb7180f7a4117a4b772a094e094e8faa9ec84adf2b8835c3 SHA512 76e64aed5acea1542e8ab67b5d69101fc6f3fe64d5ecabe38c4528c545fa435a4e3188304a84c9b8ef6810e8b65bd297ef6f6b0432a9333485efb9b9d006cee8
+EBUILD imlib2-1.5.1.ebuild 1882 BLAKE2B 2553d4049273c2ec58d996205bdf2c870de90f9342b5de4fa37883aacbcf3839cbe135a9447ac5c0842e517a357b7b01eac961ff11e6eececa2b408efa88beb5 SHA512 a1261b11c354ac6c28a82f70c3b5cb8627778e848ae9fea6ed6170e3b8173e22b556dd35cd9866634537e698569bb6070ebe8a7780c735e74acb215a4555df48
 EBUILD imlib2-9999.ebuild 1902 BLAKE2B 6dc263963a9d811487849c4d210db0ee8548d425d382254310da3af807f72b69822f6e62023ddd1853c2b42f05d9d7bca3a8ded648c3657fe70af0e754923000 SHA512 cf07610f0fc4b9ffaa4a75fdab9af7f84d1a9de58f73f68a00a723291eab15c612b2b4b4e2e641a6b590873d9f95eb9506b89e8cf84fa1a826aa291c683d6bb6
 MISC metadata.xml 2278 BLAKE2B 7461b5d38509f5908d239712947f2f9d3ba91d5dcac79cb82f78ba74c0f8b51b54740cf734b0cf70acaf450f22b8c926ef5661631ac99269f3037d00ace553f8 SHA512 c9ac86bfc0e1cc55096dfb4f99321fa5c5efec65c7beb6d14955b7359ec362f8f41b15adf5e511ed88c1080bd568b59bad2c258fa98d6b89ba5a9dcbcf5b6c67
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
new file mode 100644
index 000000000000..b9c2d44d1bce
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 gif jpeg mp3 nls png static-libs tiff X zlib"
+
+RDEPEND="
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
+	jpeg? ( ~virtual/jpeg-0:0=[${MULTILIB_USEDEP}] )
+	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local myconf_imlib2=(
+		$(use_with bzip2)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mp3 id3)
+		$(use_with png)
+		$(use_enable static-libs static)
+		$(use_with tiff)
+		$(use_with X x)
+		$(use_with zlib)
+	)
+
+	# imlib2 has different configure options for x86/amd64 assembly
+	if [[ $(tc-arch) == amd64 ]]; then
+		myconf_imlib2+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
+	else
+		myconf_imlib2+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf_imlib2[@]}"
+}
+
+multilib_src_install() {
+	V=1 emake install DESTDIR="${D}"
+
+	local HTML_DOCS=( doc/. )
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index eb319beac0b2..389b7f15ad66 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -2,6 +2,6 @@ AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b0
 DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
 DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
 EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
-EBUILD jasper-2.0.14.ebuild 1916 BLAKE2B ea748d392063eff912da7dd5c9b81b910e950c4b2255dda06f910506fd9ee4403ff584a6761c361f0054eee84ef26196801c1e7d31d02c470d7b253c6bda845e SHA512 277f7d7378d64e92a74df79bd996ba4cfce5631034d25420b2acc521971c24fbe95ce63e513bf197d2abf076e23933bdc14f02a7d2c2f59691f6569a8f52585e
+EBUILD jasper-2.0.14.ebuild 1915 BLAKE2B 5c08dff5043242ea43e8833eb8a990d68c4ccb4b194d10422629ac18ceecde7452142a20dad5d2564168e0bd293e560fe332af7efea5bb018d8163f41628307f SHA512 0a136391226aeef10c8c6083c88dda8efb8337566f582a3c9edc74d2716ff8665949946ad313151ac3cb49ac6dc158f26e060712c7cd6e86498ac8ed70bfc24d
 EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
index 8f0dc8cf9bea..fd9bf7d23be7 100644
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index eaef1d51b466..89159bd10f49 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -8,5 +8,5 @@ DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc
 EBUILD jpeg-6b-r12.ebuild 1126 BLAKE2B 8a161ddc45d213b874815518bbaf5d3b5f5053658153e60bdbf6c376c29d0964aff0f220e41135935d1276641fad69fd8f4ce042023a9d6e4460ca07c7929694 SHA512 97aa4b853ca53728cebf56da61468b0cba0c35f78ac37add53c403489c7c13df2530194f2876f0c49f13dd3ff2fe162c9472eca8ab87266c0b6aec38f6c9ff25
 EBUILD jpeg-8d-r1.ebuild 1942 BLAKE2B 05938a73c8013d923e450b189b9c7f746a928237810ec41a017ecad5924d92a61d6b6c887f4aa3f26231604b94526905b83e8e5215bb714a432d1402a7a2f5e4 SHA512 f4aab4bda823dc772d309cb96156ae60bdf4d8528a8117540e7b7d82e116cc11cd45bcf0abc0dfc4767cc782e24905792cae6f96b1a24eae4de40a338dc124cf
 EBUILD jpeg-8d-r2.ebuild 1405 BLAKE2B 5bea27ef13659ebfc7f4e3aa9605da42b49ba478f15abe9cf0aca65206641a89692f6b764d99df40e977299e4c233da8a481285768369dc5aefc03a472950afe SHA512 809b128963ac2a257d8eaf58e2df54c34fd42a7f1a8756552dd88758f572eb30edfa2378f49b765276fd0d83eda4bbf9682efcf6b739d34164687c0b0f9ed2cf
-EBUILD jpeg-9c.ebuild 2001 BLAKE2B ceef32043af8ff6f786033bddedcd6d7bd5d585b14592dc2c70def0eed0a643d81fdea2b446a9d82105f7046e7fd7cf06b98e01b1d4284b0dd14aeab68547de9 SHA512 c0e11739e642b72a6c8b5708cd3a149272b3776226a0fb05fbed4050770b8a233be301eb0c2844a1afac4812c156cb84e9d7bf9a19ad1819802c67cd28cfa810
+EBUILD jpeg-9c.ebuild 2000 BLAKE2B 5c787ac7856149564c95fa0a0c90fd56b23b545ced39e495b98706b0736f5fce2bb0e6aa49ba08bee607ec19bc7946075b4fababe1ab2278be9fc0c350f9f13d SHA512 2c6bd89524f5eb4e82841d2f36e92bfc98b80785644d9f953feea0fe381aeec574538778dfa6d36cdd478073f36e57c21bb0d7874e2aa540806b039acd9febd4
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 107e31a3d4d7..66a11695608c 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index a01f69f06e8d..40cb9f77add1 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -2,9 +2,11 @@ DIST libepoxy-1.4.1.tar.gz 309759 BLAKE2B 304bbe395ec184d0b29b0ed256917d78a84d81
 DIST libepoxy-1.4.2.tar.gz 309973 BLAKE2B 029948aea64db917e782a57c901f537be796b269bcfdc9f4238db4fae41d3d11f68def2288d73a673b7e2a159e7ed2226761e4ebf603ec4f0fdcaf7f56eb02d1 SHA512 b94e1fe749c63a82f38369ff62b7d0d8cf1c55884159f030dc2919c17daf5811dd71cfd6a663edb38df66ff4ca53120a6a53501568cc8a582f08d4ae82fe9d89
 DIST libepoxy-1.4.3.tar.gz 310823 BLAKE2B 6eab12a0ecf68a1bda3484c7cd71c0b3d62391e2bee8efd3c0fe7970ee4c3672f2dd81547d3884b301165accf3a8ce91a7c2a2e9686b1ca43c7f37cd15c5c946 SHA512 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0
 DIST libepoxy-1.5.0.tar.gz 325983 BLAKE2B 13cec792a3f32630765e3bad755bfb8569119351a3bf83a6581c4db3210eca0779ca6681bbb67898847265283a929ed742fd7000d18977fb5f2203968815fe92 SHA512 e522c64d4f407aab031fbd31feaee1a2de4467fdd49b0267327100cfe836c2f5bebccf367449e3bd97e1a457168bbf0ace968eaa45a018020f1c038469343efe
+DIST libepoxy-1.5.1.tar.gz 324985 BLAKE2B 338b558ca3c174c04383dfc1bfe4f444965aef745b3043183d4024df62b37fdfc923c5c1d243a3061201a0f7b6946ce443d4ede3195b85d1022c187f46b08540 SHA512 f839f82e4ffabda42a2bb9c2822ba2e8da6583bdb481daa2e090e62b580fdfb0d11f96af790685769317ff2446d1d8d7cb6374b2049614ee938b84014b604bce
 EBUILD libepoxy-1.4.1.ebuild 1055 BLAKE2B f4d5b8ff39e7e06f7be21001bae24e7a95af921d40a47b44b4617ac1eff83f77cef3675fd9ed62f4d52fb92f2a41c77c5f94838ba944108cc1cb04056f33b9c9 SHA512 e78c02e4c9927fc1e50d59c72661fa28d449a7da3b3c0420621d1f896c2fafc43b98a928c15d01655eeefa0f9de0db0c2629712fa3f03869a0d1dab2cc744743
 EBUILD libepoxy-1.4.2.ebuild 1055 BLAKE2B 585d84565beffa47a418913e8b9833c38676f551222dae02c1f0f4a20788a8a27727709ea9bd4df4fa27e136b2f5e3b1c8797abb4ffd761d9e48ec8eb39dd14f SHA512 80291d0d467d736c6e865ad9786ec876a64e6b05ecc22e5df13a7ac60ee48703a514d73bc42562eabf7d54364b8e6a00635904478e551ca4dd70a9694e4e9356
 EBUILD libepoxy-1.4.3.ebuild 1080 BLAKE2B 4546353e099a85502a82a35c551621e1092fa21228ea78c3f02ab8db8ed760472ec42ed08b1a86d29a8a0079912c8e12f8d784fb5bf1064bc78f6af573cba4e4 SHA512 706ca5de96e6833cd77237c95dd9d638e06dd1b266ce0522db3774f37edfd61293c2fbf7fc480ff02484f124042875dca28b630ca6b72806ab945aafb3e23cd8
 EBUILD libepoxy-1.5.0.ebuild 1212 BLAKE2B 7cb9c61326e602863f9c8e014eb403c3d243a30420a45a1c252dc73f8c1ba49580ec80e6784f8a7432c7bbd8363232ec34f5ea0f3b0de1c7a2ef2ed364d379d7 SHA512 2a34ad6e5a4a70cc637480006e75298c1674aac76e80ae8056b48d75e5a69357c8a53828383e72a25abf59c1caaaeaa5490758887cf0cab1b73478a191b8388c
+EBUILD libepoxy-1.5.1.ebuild 1212 BLAKE2B 7cb9c61326e602863f9c8e014eb403c3d243a30420a45a1c252dc73f8c1ba49580ec80e6784f8a7432c7bbd8363232ec34f5ea0f3b0de1c7a2ef2ed364d379d7 SHA512 2a34ad6e5a4a70cc637480006e75298c1674aac76e80ae8056b48d75e5a69357c8a53828383e72a25abf59c1caaaeaa5490758887cf0cab1b73478a191b8388c
 EBUILD libepoxy-9999.ebuild 1224 BLAKE2B 47604c61c6f4e9baa84e4eb5e87eea12141cb0c5fe139dba409a091306825bb32162e178c4a8ac22b06aadff6534ab0801ee1f7f8bcc9c6822515182a287337e SHA512 dd72815b8bf3d0aecc7c66ec49596dbf9bdf3aa855c6d7c469903829801b92e5ac4f8786fb12bb4e716908c3e53eac584bce7413a68227f7804127740e321f70
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.1.ebuild b/media-libs/libepoxy/libepoxy-1.5.1.ebuild
new file mode 100644
index 000000000000..21db4db9f63b
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='xml(+)'
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
+
+DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test +X"
+
+DEPEND="${PYTHON_DEPS}
+	media-libs/mesa[egl,${MULTILIB_USEDEP}]
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	>=dev-util/meson-0.44.0"
+RDEPEND=""
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Degl=yes
+		-Dglx=$(usex X)
+		-Dx11=$(usex X true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index fa6254bf95f2..145ea0711462 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688
 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 EBUILD libgphoto2-2.5.14.ebuild 6273 BLAKE2B 50694401872006701c09767b28b49e8b8aec364ee4a7256e689fc8fbd48fa7190a5a142cddcc1ea602db407a0bf9ee3b4bf098420aeb5bddd410f8bf73d7b16a SHA512 d198382821c1c7e8a59f27de930a901991a645837d038e57d47c9037a2bede022cde0123ae3a18362a0f0c69dcd52fc0098bf0fc8025165f64bf1ba58372086e
-EBUILD libgphoto2-2.5.16.ebuild 6282 BLAKE2B c92b40817a860ed763d4b6c5fca2fd7dd20194810e190c900b5ac87ea1d08d140b9c146deb4fbe3b12a3cb8727dc1ee3e5d72364b9fc858b44fa42c821cb6be2 SHA512 77d221d999edaeb59a291be1085c60eafce8de9fa3586d287be9664778c66d5341134ab774eec8a7857dac3071d1deba5f20a8c8c06c9271f15bd4afb6889dd8
+EBUILD libgphoto2-2.5.16.ebuild 6278 BLAKE2B 78564d53ac65bab263f037f9e16fb9971f7583ce64d5102eb33b37c787365e69f3f56ece2e6b2d688af302aa1ef110bfcd1019a13c491ee2959d1200f59b798c SHA512 b792bfd919bf5c62b8a27595d137ed5f6b42eaf47a0b7449b7fb885e2f496fa6890ab32ac68d3a050e45bc661f7fdba366b462de3d6775d2e38d7fe50e8e0e12
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index c4110354846e..99c6997bcae3 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 1853fd7a1738..d6bffff0dca1 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,6 +1,4 @@
 AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 9192 BLAKE2B 0c4e96448692869202514ad54e0c1b371e839c9f9c4ea6ff9b085fc28f29d9f65912cd501d0c83b442242e292f868eb1d79eea6e36d20ef967cab9fb681b6b2b SHA512 f88acaed5b7a53e7e4ab47100a769a88c9579f373b7d6d305b8fd9ccd3cc749a5d5ec544e0d8f30734d940016bb8ce23e49ffc4347afd87601ad013a7111bacb
-DIST liblastfm-1.0.9.tar.gz 119320 BLAKE2B 4c661b703af1e94b42d2bddffd994e0d33360979e47e0079f3824a9febcdba22c3ccedd8599da5c1d4b701a329cb4779bd680181837152cb1d23a231ec6eee73 SHA512 9d2bcf71b26d8a95920a07649c97b3faa071c49a8269268bb08fab01537392774873233d03cada09d3ce3fe2c45b0affdb74cd27c41f69342b973896effe1018
 DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166
-EBUILD liblastfm-1.0.9-r1.ebuild 1713 BLAKE2B 6f97bd3c43a5435b3b5e793966e71a8f23406589b9457b5d1715e6c6d364e9212616b4b1e74619b3f901b0b0f64d6105d9bff897b8586bac5c5693392a704614 SHA512 08262b6e37da21b66d869504c671cb46d4402a204a705571adac67bcc70b9bafad389905c8ec339196927580c0de3994113bc73ac6c41d365c4a1d1bc4a3de5b
-EBUILD liblastfm-1.1.0_pre20150206.ebuild 1067 BLAKE2B 3a511140f786137ff95137efc75e2715978d67e5aae850f6949fd58f950dedfe150e873383c73ea17c146de2e216a97701e509b07bc4debc8f5141431010c25a SHA512 ea439b4e081b9089c856cd85cde0fb16e0e6dacff23f4a9aa35fdc17f10f3a69dc4291e88516cd0acbd1c91b5e67867b20ea6aa05023ef26356efb6638e414a6
+EBUILD liblastfm-1.1.0_pre20150206.ebuild 1065 BLAKE2B 79f25b42a5a1bdfdfb965c47324e911385454fd165ab883412bd34707c86bcf4d81d7235ca11ad21d7686d6547d14298d3d2ddc79f2c5d754bdde781a4381e63 SHA512 e41ce9dbfe6a81eba89deb6b1f92d13cd01a0f46fa73003fd6d2fa3f274fb516386daae2d67898a2cac0a4e5464d5f8c6682bb133dd34769ad3fc67998637bfc
 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6
diff --git a/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild b/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild
deleted file mode 100644
index b4aedd844173..000000000000
--- a/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multibuild
-
-DESCRIPTION="Collection of libraries to integrate Last.fm services"
-HOMEPAGE="https://github.com/lastfm/liblastfm"
-SRC_URI="https://github.com/lastfm/liblastfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0/0"
-IUSE="fingerprint test +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-COMMON_DEPEND="
-	qt4? (
-		dev-qt/qtcore:4[ssl]
-		dev-qt/qtdbus:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtxml:5
-	)
-	fingerprint? (
-		media-libs/libsamplerate
-		sci-libs/fftw:3.0
-		qt4? ( dev-qt/qtsql:4 )
-		qt5? ( dev-qt/qtsql:5 )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/lastfmlib-0.4.0
-"
-
-# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
-RESTRICT="test"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	myconfigure() {
-		# demos not working
-		local mycmakeargs=(
-			-DBUILD_DEMOS=OFF
-			$(cmake-utils_use_build fingerprint)
-			$(cmake-utils_use_build test TESTS)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DBUILD_WITH_QT4=ON)
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DBUILD_WITH_QT4=OFF)
-		fi
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
index b20109621436..a9a4e77d96ae 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/lastfm/liblastfm"
 SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0/0"
 IUSE="fingerprint test"
 
diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index 532e5d6fe9ad..f8be36eb1853 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,8 +1,5 @@
-AUX libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch 2832 BLAKE2B 54d040461db07b12dc5d259d5521693a4af6dc1f2b55af9418f3b45ffe89024f25f4f388406804e7c1acd9980adbce8f08372fda60b4d6099c76d44bfbb1ec2d SHA512 f51a9edfa359f7bced8c70254c7200aed7688fd356159e6dc53298dc376855c7cfe47ad4ab5e809d8e748b41dccad3175e967c173f1d2ae751c7f2c3e46fce27
-AUX libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch 4846 BLAKE2B 05aca9ef29a790243ddc7a8d84cf1c2fe70e51321d4b95c3dd8d3385a29ffa8c2ec12266c6ba742fed458e85f506a0e161b6b89edf96e736c7d922ede8efc94d SHA512 3fa47945af5dff87d781db033b4f9bc34606c8a7a66db5c16091716374774eccd7b3cca16aadadcb063c42a616cfb445ac51e61b055a45832f81742a6e9b2f9e
-DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6
-DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193
-EBUILD libmygpo-qt-1.0.9.ebuild 1670 BLAKE2B 5aaaa48f08ca84400c554b499499a817b3b7c4b11c9bc97db84b969db86193abf264239c1f33d3304033e451e7c4e1e40f025e7104a3c3bb3ca1831e36b7bfa3 SHA512 6d5c206312cd2cb1bce3e9fdc92ff85a5a7429b6e186032088fc58fde15042d8ba9d6c86e2b7a6f1feda430c95da4c656899a56ad4183acf098736e7bf48af8d
-EBUILD libmygpo-qt-1.1.0_pre20180401.ebuild 876 BLAKE2B 891bb3a733805fe1a35a8ef39e2e62bdad4fa0fe0724182d6d9a231fc78b13c8c21c6a42d27b7b7c1ce7de54d51f043d395eed9388319a1ccde4ef3a31c89005 SHA512 4e7477055a570f8ac70db3857f055fffcc19768dc9027d6fab409680d95ac197b335adf0abcb29737a07b01b7903d3e58d3df1f316622bf1cab0e15cc689e828
+AUX libmygpo-qt-1.1.0-qt-5.11b3.patch 4991 BLAKE2B b79e01b8c72c9248ebcdda72f7051e799a399a8153785ec35cc223ff64e0707baa856846720e79acd5fc93bd73ea7e1ac8b48e8fc4a853970019b0eaac227a55 SHA512 91617ce03cfb94c9524f06dc5dd3af0c84b5b7af279cc8e13b8d4cc221b6d86c4f28347039a944f9002c57ba65bdf8c870e6076b7877ee1c88e1fefa31c1776c
+DIST libmygpo-qt-1.1.0.tar.gz 64959 BLAKE2B 85c8eebe036b5755ce6c765c2c19796532dcebbef1a7342a0f47b84ba7466de87334fd85f844c9f3f6ecf87352d8a5ba523480f1550b4928c67a3f0fe12ea902 SHA512 a24243a98b8e3544127b09e5c678d692e11ad0ad7ee8427e71b0d7cfd9455d068e4445bcd4d8d5ba94d8c0ef1b8f42390b544585ef258b5ec175546ee7bcd86a
+EBUILD libmygpo-qt-1.1.0.ebuild 917 BLAKE2B ba6028461c4fe1b3f3f98ec90bbbd241a2370ecdfe9a44f9ce219db3bab73e5c6debdc42a31db2db1d0f57fd0f9784e2067517435f72809bfd40c6af3494c1d2 SHA512 c263ad175340f7d69c461df692940ff2f5dd082a9c6c61fdf32396e8ffb114069e2d078691aa9687928f121031bf103454f98e7d144ee9abaf31b0d945e9ea69
 EBUILD libmygpo-qt-9999.ebuild 763 BLAKE2B f939dd1c0f26fb2a940b83d3a709dfac0c7e6ebf25c07c56175313015a4b109333dfbe3bea6c64184a7c3488f3d6faba8c53842a044c990c2daa2dcd75403990 SHA512 3e010b8c420eb3a605f2490cfea52d30e5147abcd5601575dff993743f3a459bdba7abcbe0e5c5371f6f4905f6d7ac5c70e34b9cfff7d71b06994c08d90c9a74
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch
deleted file mode 100644
index 0d3dd764d8f6..000000000000
--- a/media-libs/libmygpo-qt/files/libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix the failure of JsonCreatorTest due to mistake in expected string.
-The patch is submitted to upstream: https://github.com/gpodder/libmygpo-qt/pull/10
-
-From: Golubev Alexander <fatzer2@gmail.com>
-Date: Tue, 20 Sep 2016 15:33:30 +0400
-
----
- tests/JsonCreatorTest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp
-index b15b006..feb03d5 100644
---- a/tests/JsonCreatorTest.cpp
-+++ b/tests/JsonCreatorTest.cpp
-@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON()
- 
-   output = JsonCreator::episodeActionListToJSON(episodeActions);
-   QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") );
--  QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\" },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) );
-+  QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) );
- 
-   QCOMPARE(outString2, expected2 );
- }
--- 
-2.7.4
-
diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch
index 2b10ae4d7bd9..77c1c74f42d3 100644
--- a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch
+++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch
@@ -1,17 +1,18 @@
-From e5128384620014bca2cd9d1b5f31c405818e1a74 Mon Sep 17 00:00:00 2001
+From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 15 Apr 2018 22:20:34 +0200
-Subject: [PATCH 1/2] Add missing Qt5Network, make BUILD_WITH_QT4 more strict
+Subject: [PATCH 1/2] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more
+ strict
 
 ---
- CMakeLists.txt | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
+ CMakeLists.txt | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a1f652..85d46fd 100644
+index 2a1f652..eb006d9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -5,25 +5,21 @@ project( libmygpo-qt )
+@@ -5,25 +5,25 @@ project( libmygpo-qt )
  set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
  
@@ -22,13 +23,17 @@ index 2a1f652..85d46fd 100644
 -    find_package(Qt5Core QUIET)
 -    if( Qt5Core_DIR )
 -        set(MYGPO_QT_VERSION_SUFFIX 5)
-+    find_package(Qt5 CONFIG REQUIRED Core Network)
-+    set(MYGPO_QT_VERSION_SUFFIX 5)
- 
+-
 -        macro(qt_wrap_cpp)
 -            qt5_wrap_cpp(${ARGN})
 -        endmacro()
--    endif()
++    if( MYGPO_BUILD_TESTS )
++        find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG)
++    else()
++        find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG)
+     endif()
++    set(MYGPO_QT_VERSION_SUFFIX 5)
++
 +    macro(qt_wrap_cpp)
 +        qt5_wrap_cpp(${ARGN})
 +    endmacro()
@@ -48,7 +53,7 @@ index 2a1f652..85d46fd 100644
 2.17.0
 
 
-From 1cadc5d15d0de4dd2d7d08069a421337547031d2 Mon Sep 17 00:00:00 2001
+From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 15 Apr 2018 22:29:33 +0200
 Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
@@ -60,10 +65,10 @@ Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
  3 files changed, 15 insertions(+), 8 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 85d46fd..d6b3a15 100644
+index eb006d9..fa4b0cb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -30,9 +30,6 @@ else()
+@@ -34,9 +34,6 @@ else()
      set( QT_DONT_USE_QTGUI TRUE )
      include( ${QT_USE_FILE} )
  
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild
deleted file mode 100644
index a276eeb094d1..000000000000
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils multibuild
-
-DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
-HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+qt4 qt5 test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? (
-		>=dev-libs/qjson-0.5[qt4(+)]
-		dev-qt/qtcore:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-DOCS=( AUTHORS README )
-PATCHES=( ${FILESDIR}/${PN}-1.0.8-fix-JsonCreatorTest-failure.patch )
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-	if use qt5; then
-		ewarn "Please note that Qt5 support is still experimental."
-		ewarn "If you find anything to not work with Qt5, please report a bug."
-	fi
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DMYGPO_BUILD_TESTS=$(usex test)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DBUILD_WITH_QT4=ON)
-		fi
-
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DBUILD_WITH_QT4=OFF)
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
index 7f7d18f3bf03..5aae16cca567 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-COMMIT=b84549b8803033b803f7d4dc14d5dcd7a5c344b7
-inherit cmake-utils vcs-snapshot
+inherit cmake-utils
 
 DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
 HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
@@ -13,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/gpodder/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="LGPL-2.1"
@@ -40,3 +39,12 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+src_test() {
+	# bug: 653312
+	local myctestargs=(
+		-E "(JsonCreatorTest-test)"
+	)
+
+	cmake-utils_src_test
+}
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 69f74b7605df..17864dc21a6b 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -1,5 +1,5 @@
 DIST libpano13-2.9.18.tar.gz 2723032 BLAKE2B 61402a30ff9c310a2c965ca10dc43d2ddbd43b0f04f2cad3123981010d8a91491414d00f32aad54552026486f48056d98f509fa5b0404bbb8b845466caa7c436 SHA512 bd8449a8ee01e990fa19784889c1afb0e64f90e25596c872e7470fb700c327aad4fc0c565977576dac34dca4cea55a46aad9dc547d3ee4ab6b353cd8b6656874
 DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b8826ac5b84d1dc32d28cc384b6690b258c0c3a6b75d3423a1583daccbd0aecd3f010eb58fb356cae5c54d29e05672f0 SHA512 f9f147426d44d8babac09cb1a1b5111f88b9c2fc079f33df80133492bcf24cbd1edd771e6bec7bed4b0256bf15c700139c0a83119d3adf296ae5c567e006d868
-EBUILD libpano13-2.9.18.ebuild 1059 BLAKE2B a15dede41a4318135e5ec9a41ba9ee2a4d10890acef213c70ad96a20dacaab9b6aa221a94a1c343a16716e23c690211a094eb787980d0dcae3163ba76d474cc8 SHA512 f418c71268cd21c6cce8428492cdb4e11738881e4fa879d600378ddcfc233958d658b5474484ccce1457663db74abc1878ed6a4ffff92e0e6b83d02e0393b5dc
-EBUILD libpano13-2.9.19.ebuild 895 BLAKE2B f7b803fe41fb49db193342e2f3771da1c39d63a99c9cca1607264e5196d9e615051ce746e4a1907f7e25963754ae5fc80b4c5e5f1b9c680e34c05deb1cd0ed71 SHA512 87bceeeebeacb3973ed693176e6586b53cc49dc544fa3843382b1af95c1e6622bf49834f2d1df57c36086b8bc4044eccbf2e130c95e411e64d9aaa59af85da92
+EBUILD libpano13-2.9.18.ebuild 1055 BLAKE2B 83c4bbcbf13cd77279c38fbf8aa7c4b9072e44d9bada413dac99d5a5d39d66b5e418bae05c3aa0e027089bb1330156c0eb6c5456bc2df9791c144e4fd88ad3f3 SHA512 dea68e475345f67d226e9c1964e2aa456ac77d09062be40d1179ac9d77fbde7f9a2bc997dcde75fc81a11d88a2c6062f437745c637146cd73a461d2363bbddca
+EBUILD libpano13-2.9.19.ebuild 890 BLAKE2B 2907e7322e72cfd5a2b6b13ffd0e16a4608906930b9422fb024ec465f5e833a49211f894cf438cd8062f4e8bef0f8f7c2e9222f3077c41874310d1a90f9f8073 SHA512 de63492c42d4ab12203573a322252e318ad1e4c46645cc5645bf2af799557271381a4a81b2e53d02f55d6cdac6012103c8efab9205d4efb4d503ede73ec9e760
 MISC metadata.xml 338 BLAKE2B 1ec5e22829216634d2abd6a1053661d8c226a7b852aa5725146d4ac2300c2ca308b2771a71c85cfce761a3c74eb70d10ee8bfc7fee9316d237bb80f298ca05ba SHA512 0797dff4c92d3f6a18f7d8244d39079e718e381ab04620c6f3b165ef1ae1e0357c9d56216e50290bf0f91d2803720a3e67ae7224c9f6f7097dbed2e33dd47929
diff --git a/media-libs/libpano13/libpano13-2.9.18.ebuild b/media-libs/libpano13/libpano13-2.9.18.ebuild
index c6354fba4fa2..752123e3c714 100644
--- a/media-libs/libpano13/libpano13-2.9.18.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="java static-libs"
 
 DEPEND="media-libs/libpng
diff --git a/media-libs/libpano13/libpano13-2.9.19.ebuild b/media-libs/libpano13/libpano13-2.9.19.ebuild
index e56f77a0ffac..620232069038 100644
--- a/media-libs/libpano13/libpano13-2.9.19.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/3"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="java static-libs"
 
 DEPEND="media-libs/libpng:0=
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index cb0e8bd10c02..77baad50a8d2 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,5 +8,5 @@ DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
 EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
-EBUILD libpng-1.6.34.ebuild 1378 BLAKE2B 07448b284d01b1b7d43b5c3aa08485e47f780b3f323f1c481ef59dc7947bb21c60296ad730f7d8d126cb7253e6bfbbc9bbd168de1bc32170394aee092719558d SHA512 5488fe8d0afa54e8467905dd3181e9572ac26361c212e94ccc08015bfa77919a6bed96d3b95abe420af032613185c453fbf42618b01a5e92653c5ed73ed1c245
+EBUILD libpng-1.6.34.ebuild 1377 BLAKE2B ed608f657136bab48b6b27ec2079b689633d13ed052dc4908748428c86b3d222c7c74c9d8d6ea4a8f409ca1559b4068e9cf128b68d984a476ed3d36779080ee5 SHA512 6a9777ff871215fdaf596f4b01b26465ffbfb0b26ea35b9ddf80a512b6b92959baf1cb3b452be1f92af80d50c7bf075a42154877da32a93b656997acecc5ac80
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 9720f11d8ee8..32c427520fc0 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index b4905f7c2ae3..54a2dcfcd4ec 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,14 +1,12 @@
 AUX libraw-0.18.4-glibc-2.27.patch 531 BLAKE2B dccb6c080bcb0ebaf0db9e406ebcc46b1aeae2608a4a006284265413b4b9a3f4b0d2dda7e42bab539dbe4e74ad6603350cac03fac37ec5e2a87ff639bf9dc704 SHA512 26c4e0f86149dba7da89f185bf98821fe20d0770718102228e351772ad0959c9140ba230f0e75892e612e40e9bd573389ee46c9b549a5414f0ba6da5c9b6e16f
 DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
-DIST LibRaw-0.18.7.tar.gz 1280935 BLAKE2B 6bc35b05ecca81cb1a8d0e054c2b74eb8f2f4e58e4f6085a1c4886bf96180a547452d4164c6d0f74fa49e6c1b06ee6663b4b9b94aadbaee4c7de890e4e11959e SHA512 5d906e69427d4f9edff8b3bc24eb85896e037dd98578cf07c668b96f6abd82bc8dd9f937ecbca6472d334c4cf8d8cbc8b07c2c84aba748e22ec55cecc6a4ed78
 DIST LibRaw-0.18.8.tar.gz 1281773 BLAKE2B 755d17ee4c08e26b04d20cc6284f43e1a87d2bc1b41499d175c6ebfc39684732a4407b990115818553c7b815c66bb04ad451d478ed2c084c443871de8ea221e4 SHA512 48871a5e43c89a17962fae426a962d11a6ce40cb8e7d8abc90e98c899dc42b7e1711398c075901ddbc710fe7e916ba6d507bee7e18975779caa8f5d512b1d580
+DIST LibRaw-0.18.9.tar.gz 1282015 BLAKE2B d94681633e3b187102462be5b849cb4cb3468a74d5c4288e23a07ccf0b66246305f9e75e1d6408e259b3c7777ef77501954d208669c9ddc56b943f13f95c867e SHA512 5becbbf05db091d86f7a3a098402c5a981a5c614e9ac742e80823efec5dccfb3a1336cfd1493aa88c8d1a37fe05896efd3f8f145536d799a9ce19665073cf8ce
 DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e7730f750c65f4a58ca385227a7c9d5c8ab2926ef2fb74a798bd09b78e6f9c1c5cdd39de712ec05a49412087f3b889f3ff76dbb0fbe8 SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d
-DIST LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz 30659 BLAKE2B 11bb00034838470c9b5762761acde6d6c49c0dfe7e342cc1a6e4f0744b718ba6c5dfb027c5144a0858214c91faf9b726e5c008758cc5c2f9464b7feb4db9eda9 SHA512 1a967eb06807bc5ce2177d4e13d394e8f4afe15e5ef07d9a49c1a2172f0961cd122a3bfa84fa66a203766d50735adacbffd48ba8deead8a202c3c2a1e4a97ffa
 DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
 DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
-DIST LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz 39229 BLAKE2B d76134c4b53a1285c31e290c088bdde9646ca94a7ecaf4997af5e2da4410ec70671d0e597c1748072266c241b7021b16344a8d8507ebc938ce03ab1f061630a6 SHA512 347a39d8326e4614b83c2721baa09414738416d405d7db516d155a867902dd85cf51d156705d1fd0bc933802cd3a01cfb1c9da43f4cdff15b7a7253674b91c4a
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
 EBUILD libraw-0.18.4.ebuild 1774 BLAKE2B b34582c011016beb415bf262bb8a5db89e9a6a2e641b0cb3bc26b93d86fd4b95616255a42fe5a6e50a76a0974875ebe151f9684b674435966265a16e97845442 SHA512 a0277cda774fc2ec3f318544655dbb3a39266828bf9bdac80a839577f4fb5a2028b34548c7aeea33a61560753ff4631ccfb0ae3fa558440cc507e23c9bc246db
-EBUILD libraw-0.18.7.ebuild 1789 BLAKE2B 40a23381efcec9f5e959981237ebacd1d4b0f550a6e3841c8dfd699017d0642e6d028b12574eccfaea145fb133289224fdd6c69aa1bb93e61af254feb76cee61 SHA512 f8a3e81a58eadfb1705380afc0bcb95b4f11281a5db2b4535237e579262de5c939e784a5d935c9c69ac001fdfd8ad3c0cac7620cce041b7eeae51a5a4e5e416f
 EBUILD libraw-0.18.8.ebuild 1723 BLAKE2B f48d3b7e4d07c1d48064a8dc16d5af25f532bde1501cc1a6714f5412c42b824b6e9c1ae936a2d548746871925df553f3f7f722aa450930f70006ffdd2e4026e8 SHA512 679c029b6628eaa141085c1a4788ddc17b927eda419a6ebdd6d398341293aec4703e00e0aef81ef7c5ee9794ccd8eb45cfcea682bee006b75621325cbf0692ed
+EBUILD libraw-0.18.9.ebuild 1815 BLAKE2B a17813cba8285e7dddbb7c13db642faed63dc11d4b32b69a8d9ca7cb46bcc8c55a3c0a415afbf243e9fa487f05a6f933feddd48a35ac9ec919379401896a8508 SHA512 55ca2174034614f008fd9c2daa96ff5dcfb612353c5d3b1ccebd28b71b91c5b40bcb130efc98b263f17eab46d13019d06dcd41d37bb5ddf22d257d830ec8dd01
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.7.ebuild b/media-libs/libraw/libraw-0.18.9.ebuild
index 29deec7e93d7..742725977fa3 100644
--- a/media-libs/libraw/libraw-0.18.7.ebuild
+++ b/media-libs/libraw/libraw-0.18.9.ebuild
@@ -8,13 +8,15 @@ inherit multilib-minimal toolchain-funcs
 MY_PN=LibRaw
 MY_PV="${PV/_b/-B}"
 MY_P="${MY_PN}-${MY_PV}"
+# demosaic package wasn't bumped to 0.18.9 version
+DEMOSAIC_PV="0.18.8"
 
 DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
 HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
 SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
+		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
 	)"
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
@@ -32,10 +34,6 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS=( Changelog.txt README )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.4-glibc-2.27.patch
-)
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index fa812fbe7f34..3a2e9bab9b13 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -5,5 +5,5 @@ DIST SDL2-2.0.5.tar.gz 4209352 BLAKE2B c0a040e39117ac355e49950434a96b790dba2af13
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.4.ebuild 4724 BLAKE2B 81b738d8d00280008bc2e764e07210847ed765c4867ed8b2e071c8bbe16ddc250c9600afe30b4c9c2941e56eaa81249e6e8f872f6d15c7c47cdcde81342d683f SHA512 a02673ae1dd84a173d9479ccc572470484666f429fa36a4a2c4cc39bcc21e93b1691ce51cbc012d1c06c1e9cf073e7d694b77f25b1b9a229e5ea719c1c835254
 EBUILD libsdl2-2.0.5.ebuild 4760 BLAKE2B c23874aa322c300b1f4de2e5d303bd6a60afa27c0ce194e1c3eba2c6f51d86c7aa2f13d2a87ef77de7d3845c6cfde24e6806f7dd7bbc1782669c0516fad24ede SHA512 96834e25594b9d568c261991e24f3c1a7985fde2edc9c17facc726e11790939d0ae6b122e2d80d808781ee01949bea16756a3a7e1112b30ff22c190873d58078
-EBUILD libsdl2-2.0.8-r1.ebuild 4817 BLAKE2B 0a648c00f9bed23760e2368aa6be0ac542bbcccb650d68ac16f24a991e4525cc0cfb71be46f9d531038de19d3acf17c3541a6e50fd9e2bd0ed334ab813bf40e9 SHA512 b99aa8c3c0fac5c35722499d1c6ed8d237528f67736f517adf2c5967a5a099b8436d1900e34b409e477535e851a77eb9931d1fba262208ce9a1363ccfb8e74a3
+EBUILD libsdl2-2.0.8-r1.ebuild 4814 BLAKE2B 06af1ba3bd9ee79ed31c441d122d2db7e5608c1ae22275a4ac203efd9a597231ca682a3c952d3f12ae83ca1556c8c1f29379d5d2185d3752fcf6d0057ec4f4aa SHA512 9ac1c421db6d90bbcb33c2d8bb94b77e4188b5d30950cb470d23afd5649f55c6f67585383128bf17293c0ac5569be235d9f76dd3254681282fd0a85502990b3c
 MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index b0e5df3291cd..40cd411567a5 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index d6f4411c6738..f5e04a9a2b14 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,5 +1,3 @@
-DIST libvorbis-1.3.5.tar.xz 1193144 BLAKE2B 8f1b7dc9e25147fdb6304e2630a0f90a8766338b4566e9ad2f288f8e6cbcfa98b9d471dbd33e98882711319c74d5ebe78728b4c7376e07b2ab5b08a3b67c74a1 SHA512 f18f32edc43f65fea2dd4133e2828a0ced9e5b0797c4569bd26989fc1409ad599359e7c796bffc082ad36189f9722c7b38837384cea66d217beac8b425299ef8
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
-EBUILD libvorbis-1.3.5.ebuild 1069 BLAKE2B 2906bd9b09e366ccff6437c0bbe766dec5d23c47e0248047f702a3710c5be6b393ec82309f6e87be629b2a9185eb0cd9271eb2d79c8e66c2c137b3f3af03f4a1 SHA512 11394b3e512ccf4e732d398f82fae9b02f594f93ae70c09c4bc5cd0e4d7a1a1e67497b1e5830b976821e560e04e951a976350c32be2a7e833c215bdfdc72d11b
-EBUILD libvorbis-1.3.6.ebuild 1070 BLAKE2B 467866613f980295d02581fcfd17fee52e5a75685eb33d5cfd248c71aea4b305220a2fcdd20ea7d60d7114b0626f9de16b9b9a8c8a2f8796945f7e9d942a5f54 SHA512 e45a830f9bf48d6b4ace010524646687d6765829ab7a2c277a328dd152b4eb69bc9325317cac35414747572fc02e5663210438555ae6921c2481ca61f505a237
+EBUILD libvorbis-1.3.6.ebuild 1069 BLAKE2B 8bf55a682cf50cdf2767439e6376f507bf19e540e0c6d035b4eb644423704d63f1a1c37760e509e1f220966cc6f1012d60580707db67bad49468f78657867fb6 SHA512 5c4ed5e5a4e80a61e2eb49e13ada75dc2333e402117189f6013ba73f0148f42799a7b6a920c41c49540bcea6659766855d9a5e69b48f012c593ea54871838b3b
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libvorbis/libvorbis-1.3.5.ebuild b/media-libs/libvorbis/libvorbis-1.3.5.ebuild
deleted file mode 100644
index a5b03de83831..000000000000
--- a/media-libs/libvorbis/libvorbis-1.3.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib
-
-DESCRIPTION="The Ogg Vorbis sound file format library"
-HOMEPAGE="https://xiph.org/vorbis/"
-SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS/s:-O20::' \
-		-e '/CFLAGS/s:-mcpu=750::' \
-		-e '/CFLAGS/s:-mno-ieee-fp::' \
-		configure.ac || die
-
-	# Un-hack docdir redefinition.
-	find -name 'Makefile.am' \
-		-exec sed -i \
-			-e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \
-			{} + || die
-
-	AT_M4DIR="m4" \
-	autotools-multilib_src_prepare
-}
diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index 61b6d8e505a9..a18f3cc1cab5 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 3668a3556bd8..44f7fc8790b4 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -7,8 +7,8 @@ DIST libvpx-testdata-1.5.0.tar.bz2 117022525 BLAKE2B d0b5e96694d84d825b874df208d
 DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d66394b228d62c19906dc79c5c661feedf088d09d4b6c2ac908dc8b1ac4236a801047d5d608b17a8bc0fa5bd5ca0c992cd0729fc7a SHA512 639e229bd97e7a92a29e636f548234a87dbe63673d968cdfbec1faf9ccb0ee2087ad00b0a5bfb1581bea6b17e70bb449e9a046da4d9891f59ec79773ece4294e
 DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
 DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
-EBUILD libvpx-1.5.0.ebuild 3945 BLAKE2B 27946d19f0b447eda7bfe11fd7c4e88f6fc0a9716047f97cf52eec0bc1143abce5f15241b428942bcc3574ce5f463dd6425a41eb6b87ebe60f2422ed39032849 SHA512 7487893dc7efdafa43ef2d2413118a87a5a378603fbfc9a67122c794b6638ee2a322a4d04cbf71fc5a6efa311222e626e127b13697692b9c53fba8c4d4a9737c
-EBUILD libvpx-1.6.0-r1.ebuild 3561 BLAKE2B a0c88796bd2bd8e85c209e9d97b21a15836365bf449028c0ed66840336d1de3bf4bd4fcde14d370d70b06a90b1d7595b4af7e90bb4a0198496b1fea4e826ce3f SHA512 a06e4ce706d0c1ca5769480d939d3c199caf9dc9c181c37b21a243aa48ea6d01dba33e14af54e0ec053442334fbb9162d5ec0cb1cbc33d0008a5971c721169c0
-EBUILD libvpx-1.6.1.ebuild 3915 BLAKE2B 7e38fd6c01f92326c636f1f97d8ca4d0ac81c18175f889d2ff2a32ae322aa742ff022dc1bd4aa54ccf5fbdb47bc3b860e791cf14c7579c648a8eb9e177eac0ac SHA512 43f18dadcd60bd272f8408dd009da9169c2088b7ca8e5d917ce486f794aa9f87a5c0dbb9cb9c24fdcb380c7eabac1d86aecef2853bff6babf03fc5a6ed1f4b77
-EBUILD libvpx-1.7.0.ebuild 3880 BLAKE2B ce0383c2e06b24f46e040c14cafbf6f94492de2c10b28df482088ebd4681f7bc745c80f1bce8487b87579f02782ed18b097e0140c8d6080f8d25ccabc8e8226c SHA512 6f8fa6dd744dcdd54ee8ad2493fc06dce9fe0c87c8cdbc9c4f8f967f2642d159b3b3df1bda5d8084442b58772ae50ffc62c3a2417b6ebe56a629704f5db0483e
+EBUILD libvpx-1.5.0.ebuild 3947 BLAKE2B e37b362db5aebcf8383c1cca5362a4830713e4e2271b72ee5975a8ee5fbbfda8b97f7a1f4105008f10bc775cb94b28390da9d9a3ec1909a46dcb0d6f316801b5 SHA512 591fb7e4f3fb384a9d04d3474b0ac7d9a6643dd37f32121d038ed9b68ec31e5945c763dad3c1face760b1c4b3b21ce0aa0c0e2a6d0766c296a776bd16101da10
+EBUILD libvpx-1.6.0-r1.ebuild 3563 BLAKE2B 54fcff4bdd1b8de48898679703821df70964380561de8b2f86e0b22d4c85dfbaaade86328b23e0141bfbb5d3ffe658133cb9f5572d8c672890b2e1b20dfcf280 SHA512 53b48d9777db87c31da9d4926c4f8a44e0b0fa32996b32134f48194d56e7a60878d78c009a9623acc1ed70d8e065b28ea6e5ad929da983e536fce986554ed314
+EBUILD libvpx-1.6.1.ebuild 3917 BLAKE2B d9bf7dc5f29971f8042307ad7ce7edee11b8b3fcece7846aa62b62b71f96fe2d74884a5a2d7dc71b9c6111fd4c63f2ef45a7bca646ea69a1664147a8e9e583c4 SHA512 900d84e078dd2a65da6a1f929aec0dcfea39e5a9df88aaf57ac9af6364f9d458cdaf5f51dbefd456d015a5b29f6a2b091569905e1f2dc556a1a45295f924386f
+EBUILD libvpx-1.7.0.ebuild 3881 BLAKE2B 61efd2d24e797b9e29bc4f3dda41be86cc366427e0b767a0b717c66adf361b0c62cf3b28cb0fb25f00c9844d26726dad955f4ad6c6cdb601e7ba056571c31bc7 SHA512 ebbf1d29208a506c92e27ef170cb6bc54b999a6c31a93e2883ab134621a29192c8e98e4ce80a918cc51592ce16dbccab76f8e95b33332e800f406901df36d9ff
 MISC metadata.xml 575 BLAKE2B f8e5f9a2663a651155da3bde8284ace9c5c9394842c279a83b58e61f5bbdbcb279b71609b1129c7e1ebd61b02ca6d6f7374313815ea33d98d60affda0144c54f SHA512 748b5a315632723c78b1db5eaa0f62e331d28874a9dbc42ebc66089eee1e2e54fc19f33c7188c4b84977b35762c94c2319787cb7528f7c22382bccd715b247a5
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index 1cfa682061a4..555f65c26ade 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
-	SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
+	SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 # generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
@@ -22,7 +22,7 @@ SRC_URI="${SRC_URI}
 	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
 
 DESCRIPTION="WebM VP8 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
+HOMEPAGE="https://www.webmproject.org"
 
 LICENSE="BSD"
 SLOT="0/3"
diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
index 55c20e8d6aa9..3ecde0cc0400 100644
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ inherit toolchain-funcs multilib-minimal
 LIBVPX_TESTDATA_VER=1.6.0
 
 DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
-SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
 	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
 
 LICENSE="BSD"
diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
index f556462fb05f..22d33e597c7f 100644
--- a/media-libs/libvpx/libvpx-1.6.1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,8 +14,8 @@ inherit toolchain-funcs multilib-minimal
 LIBVPX_TESTDATA_VER=1.6.1
 
 DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
-SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
 	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
 
 LICENSE="BSD"
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index d391dc81190c..18f70ac5a88d 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -14,7 +14,7 @@ inherit toolchain-funcs multilib-minimal
 LIBVPX_TESTDATA_VER=1.7.0
 
 DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
+HOMEPAGE="https://www.webmproject.org"
 SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
 
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 9add86604c79..f0b290fbfec5 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,7 +1,7 @@
 DIST libwebp-0.5.2.tar.gz 1221153 BLAKE2B bf8f20c9dd45f70e68dda4eb1104b511be07b4e7bf13850e376c6fff32cf18048f46c718c900fedd6150b010b4a33d96dbcb602e1b0cd693c13dcec7954a2234 SHA512 f0d798e0ef8b58bc159c53214a62b29dff4309ced9efd7c5f0e6f837877906db8318c4c3453f92725ef6f2b069b931ce3e7961ca26db723a31eedc7b52988de2
 DIST libwebp-0.6.1.tar.gz 3990217 BLAKE2B 680dcc56bd10797e93d09dc64ed04fd2ffb0b8131aa0c0f1497054c50f5cff73b7ee2aa96df4f7ca760640b636f6f5265ae26e7874a77a86d39d2c74197c93b7 SHA512 fece551d8fabdd8d7ba6807baa54a69a345f8690be4415dd0c0dea54002d78fe893a5d5aacfc13800300edd462b969d596709ac3213f6bc90f8e3698b2490d5f
-DIST libwebp-1.0.0-rc2.tar.gz 4023563 BLAKE2B 003a5241f2a03a9be80379e36f04c1dc4f667721e27d58a92fca6a967ce9ad9c1e176f4e00510314eebfe38a5966c11c626d2f1b12bdb84854ffe173b0de71a9 SHA512 bb5749e4ae79595e195a00e28a3db75c7330ff2eb910a330cf4814b596061da073b5da179a1ca9c02a1c8892f165d2e18689a7677992cdbd0af82532cc83a4ad
+DIST libwebp-1.0.0.tar.gz 4023549 BLAKE2B 10286182ddc1f3561d01edf095ba8921b932b950175c45bbc86400318f9a88237c7623b0bcdd0dfecea6efb085e84e029c82a61396cb784d778d59902353d2b4 SHA512 2af7036957722a3f1533fa2da0da15c76d7eb8ac98ec4ad5cf71dd4262f3d7c9897fb6b50befab83b7de22f0abceeb2c0ff52d60927513d40f8a41aa6a9abd99
 EBUILD libwebp-0.5.2.ebuild 1771 BLAKE2B 910cb7ed016abafd6fdbab80b3c37435b1290d6444a65e639f6291526a1c54798145cd45c2281690d4624fa057cdd69ba3caed970b5fea29cedcc9d8dd50506e SHA512 f461a096427a8fb7dec8a2126474b97f4d6268d9c5fba3b9a581604c06f76980e31da67f2a9b55b45439bcf820b6a81021a6087070899ae73943e9386b514ec4
 EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
-EBUILD libwebp-1.0.0_rc2.ebuild 1825 BLAKE2B d67d794b02d412cbe9f937fbef07b150e16b33b793701866d5f2e6b84a855acfc7c0e82d768bfeec039697a055522ee36e2e3498a337a4028dcc4ef74dac473b SHA512 fceed52ca5db11f48bd7f74538ef44fc94945c0b5b6059a3f6c86dc587d19d8979a1b18e8ab9e64ca7eed7dc6fe8f2f34962596b81f7d33cc6b50da35789fdbb
+EBUILD libwebp-1.0.0.ebuild 1825 BLAKE2B d67d794b02d412cbe9f937fbef07b150e16b33b793701866d5f2e6b84a855acfc7c0e82d768bfeec039697a055522ee36e2e3498a337a4028dcc4ef74dac473b SHA512 fceed52ca5db11f48bd7f74538ef44fc94945c0b5b6059a3f6c86dc587d19d8979a1b18e8ab9e64ca7eed7dc6fe8f2f34962596b81f7d33cc6b50da35789fdbb
 MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
diff --git a/media-libs/libwebp/libwebp-1.0.0_rc2.ebuild b/media-libs/libwebp/libwebp-1.0.0.ebuild
index 6ef54b5061d5..6ef54b5061d5 100644
--- a/media-libs/libwebp/libwebp-1.0.0_rc2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.0.ebuild
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 7987b19fbd54..77782a252e97 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -6,12 +6,14 @@ DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25
 DIST mesa-18.0.0.tar.xz 11056544 BLAKE2B 467c100bcbc0a60e3868e718331192255fd16394c21b08c128a054e066740cd071e0b272aba011873fe239821f53442e9a07ae860d94b425275bd68c3db3b7fc SHA512 1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396
 DIST mesa-18.0.1.tar.xz 10945308 BLAKE2B 03dad0961aafeb954a50f1db305288682e6b0dc58631b66de2f331dc95756b881bf7f73b5e2fa4ec04640054c27aab236acdf6b89bd7cd89ca1dbe9134a6a2d0 SHA512 b0d610904b6f179a27b42aee5f479339e341926915cdc6adb08ac999a4a12539abc3776577e86af83e10381d9703ef1bca70bab81b43daf2c000622c9c3612d2
 DIST mesa-18.1.0-rc1.tar.xz 11118324 BLAKE2B e5a89c8469b6716463c9efb0e7059022bc986da83d55a020156a3466cb44c283828bacb340ef4dceda9e14a82f737b6809f742b49a8b38d7e871ff1864e8bb3e SHA512 5b179b4ece6fd0e04ef00744d975607b6678c4c333c47fdd7442768ac15b375c7faeb8472b0dba19c0b8755067effd6243803ce17739a50c17efc8e69e6ae401
+DIST mesa-18.1.0-rc2.tar.xz 11117872 BLAKE2B a95096ed573031eed17b880f725d68af062e0f7d9513d391d83c51e996fa238add93e05ae98ad4ed77d731f7521736b73566687be798029293d88f8b4b75db1c SHA512 43ddb27c436ab6ad08c4f5f764855e0681c10995e5279146c01e03e6e8af98dd23d96a20d3ac50107a6ca89cc3dd094bc472ddd70d290d0357cef3059ae34cfc
 EBUILD mesa-17.1.10.ebuild 13230 BLAKE2B d134695fc6a88f4097d8a96591ce4841aca0eb5b66a56f67d327aec0e43fc165e12e66d231805ebb0d76964046425091fc0096ddcd2cd6713cef87a6140c31bc SHA512 195b4fcf00384ca5f6566cbf94aa41da7341144dca77c03ffea2759f2930f5e20ab44d10dc19f1561e175ac083bb13befeae1135878195a4a6ebf509161c8157
 EBUILD mesa-17.2.8.ebuild 14952 BLAKE2B 1404da9b183b733ecc767a65413c674a7574aed54d7c18f8991c2a8287bf4ab0875d55c6863edaabe5b95a2c0e7625296df6b7ee1430137263aff17e2bbe485a SHA512 1b3a5c2b52f3ece48ae7954c21644e75dad7c44503fca4b82764e89dcb9c4ef8870e6f6f32a29abb5702cb9705ba176bdc9a336897103593700c8aab66f499e0
-EBUILD mesa-17.3.8.ebuild 14839 BLAKE2B ca1ff53b722b9c3ba406e2e2e759e785a3389bd6b8f63dd1cf8f2355aea1bebf38a750bbf8767c8316590c160e976fff74e8dab8764b6d9dc2ca5956ad5416aa SHA512 7c5a50570e4b6bd9598b36eeb4fe74ccf9e8c6b1b318760aec825d71d8c892bdf3275f30d975398b373d6b4d5d30c5b6035a86eb41f328e871e46f71886d5e0b
+EBUILD mesa-17.3.8.ebuild 14838 BLAKE2B e3f6176aa224e2a239322bb7de1b7ec77d10100f4cfe035cc3451c32df514b7523eb0375934065e3e82da31e020117bda44f9cf0fce6c125da6334e24d6083a6 SHA512 0f935ca455d98d3658996d25a6f2c0701879ee834b0310a56ca2ca1fba4d7d62203411ccf08d040418d284b97fdcc2970bd05c8a92759401e02ae29b5d6e0e7b
 EBUILD mesa-17.3.9.ebuild 14846 BLAKE2B a2f5c078392845a9078952c30bba2b9254b708de62101026f33542215081cb0114c7e466140cd9c59d29dc3ddd0809632374917feaf36b28684a7471637ad4c8 SHA512 b6789f7d6d9810f12b9ed7edc640e1864688ea0fbb75036834b13c0105270a05f267a560353f8cbfcff15e343dce55dc4c0956fdc84e3c674b6f59b0e574e565
 EBUILD mesa-18.0.0.ebuild 14889 BLAKE2B 6451b69e15a9d5b92bcd2eb9137fdc41ec3c6206c77c7cf1bd9b00849b2a625114e593f74117a950a028b6a8baf96e3c32966f362ae8073ddcdf1a385f9822db SHA512 191befc6f75488eac2f94404fd6fe87f1dd6f12dd51c562a02f7a29fa54c47bfe242cadb200393c384cdf50c7d781f7c9ea886a68cf5dc56ca940b2f51f8f764
 EBUILD mesa-18.0.1.ebuild 14889 BLAKE2B 6451b69e15a9d5b92bcd2eb9137fdc41ec3c6206c77c7cf1bd9b00849b2a625114e593f74117a950a028b6a8baf96e3c32966f362ae8073ddcdf1a385f9822db SHA512 191befc6f75488eac2f94404fd6fe87f1dd6f12dd51c562a02f7a29fa54c47bfe242cadb200393c384cdf50c7d781f7c9ea886a68cf5dc56ca940b2f51f8f764
 EBUILD mesa-18.1.0_rc1.ebuild 14927 BLAKE2B a539af1a34ff27d0729e65a79ffe7c87e1e3d86e0cde2efdcae3f59fe97fc23a87f4216459749d576b6d1ba9febb9c1009186c092365f69322c51cda0778aee8 SHA512 5af9c71bc73d22585942325e7ab9cf637695d2b572b7dd0d819f12c1df6c2c10981e1248600eb3bbbf623884128a6c8ef4e6a3abc00b0a6eb9eef63c90dcd366
+EBUILD mesa-18.1.0_rc2.ebuild 14927 BLAKE2B a539af1a34ff27d0729e65a79ffe7c87e1e3d86e0cde2efdcae3f59fe97fc23a87f4216459749d576b6d1ba9febb9c1009186c092365f69322c51cda0778aee8 SHA512 5af9c71bc73d22585942325e7ab9cf637695d2b572b7dd0d819f12c1df6c2c10981e1248600eb3bbbf623884128a6c8ef4e6a3abc00b0a6eb9eef63c90dcd366
 EBUILD mesa-9999.ebuild 14927 BLAKE2B a539af1a34ff27d0729e65a79ffe7c87e1e3d86e0cde2efdcae3f59fe97fc23a87f4216459749d576b6d1ba9febb9c1009186c092365f69322c51cda0778aee8 SHA512 5af9c71bc73d22585942325e7ab9cf637695d2b572b7dd0d819f12c1df6c2c10981e1248600eb3bbbf623884128a6c8ef4e6a3abc00b0a6eb9eef63c90dcd366
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.3.8.ebuild b/media-libs/mesa/mesa-17.3.8.ebuild
index 6b9e44398fcf..dda783275c71 100644
--- a/media-libs/mesa/mesa-17.3.8.ebuild
+++ b/media-libs/mesa/mesa-17.3.8.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-18.1.0_rc2.ebuild b/media-libs/mesa/mesa-18.1.0_rc2.ebuild
new file mode 100644
index 000000000000..161933dd9309
--- /dev/null
+++ b/media-libs/mesa/mesa-18.1.0_rc2.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+
+if [[ ${PV} = 9999 ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+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
+	SRC_URI=""
+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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+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}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+	vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	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.91"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	classic? ( app-eselect/eselect-mesa )
+	gallium? ( 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}]
+	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}]
+		)
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	openmax? (
+		>=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
+		x11-misc/xdg-utils
+	)
+	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}] )
+	wayland? (
+		>=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${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_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${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/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+	vulkan? (
+		$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+	)
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${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.1.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_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
+}
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm)
+			$(use_enable openmax omx-bellagio)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		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_i915 i915
+		gallium_enable video_cards_imx imx
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		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
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+
+		gallium_enable video_cards_virgl virgl
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi radeon
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	if use gallium; then
+		myconf+=" $(use_enable osmesa gallium-osmesa)"
+	else
+		myconf+=" $(use_enable osmesa)"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable unwind libunwind) \
+		--enable-valgrind=$(usex valgrind auto no) \
+		--enable-llvm-shared-libs \
+		--disable-opencl-icd \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-vulkan-drivers=${VULKAN_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see /usr/share/doc/${P}/patents.txt.bz2 for an"
+		elog "explanation."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+vulkan_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			VULKAN_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					VULKAN_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 98ba2a13752a..e7e3b650284c 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -2,8 +2,8 @@ DIST mutagen-1.35.1.tar.gz 883772 BLAKE2B 933c689bf4e578c1acb6c16af4071e879db4e0
 DIST mutagen-1.38.tar.gz 913243 BLAKE2B 08281ed0ea9307a6caa64cc5f66dbea43d09ab6dffba49bab3bea8d3878ae1062b0b7dcb772f0880848adbbd3c3c89a73e0d59b496fb635f7308c66869aa2531 SHA512 1430901539cddc7f58978f59125b793228c611cee9cc19535142e3095a7caaeee7a2431c244054affa33fb6518123b46cd187715d8353fd1b165496bd358a995
 DIST mutagen-1.39.tar.gz 916084 BLAKE2B e67de0f0c2b33283ea276511f5537f5f12a35d336927dff662a5044a05163c7dc5677dc2e5b2696fc62ac3888a9602a566b43ffb511d3eee1c8f07f17bc08302 SHA512 0508c3dfa31a4af29845204664819bc8af8121a785b8e5cc307a12bdf7c151acf4cd72e0820fb9d284c859dd6d63d7d7a6c7ebad8e3ca19db52f0c496ce74736
 DIST mutagen-1.40.0.tar.gz 917874 BLAKE2B 69405942af849a8c82d14424a242e77cd9d554155494976402c3eb5d95dcccbf14de5fd3268cb9cf12e0035dcbf88c3724d1684c21612b2f0b0a87cb48de1ec8 SHA512 ad4accccc3457d1ff7238c2941b20aeb532e9b41bf2bf1cb130e428f9af9a7dd18a0e81a4d45fbc98783d8cf90cd105de09d703c70beea7cba5eca58dab1bb69
-EBUILD mutagen-1.35.1.ebuild 1165 BLAKE2B 9d27287c664b5932c64a20ba4127e73c6d3b7bc5c172ed53b5885355e8f24902321d0d7d1125671676e695e9a193d06ed233cbb63f5f4d10c3cf272fb7034d06 SHA512 f78fbd1311e058b704da406f0015782218551881e743a089ba8108ea96ce895da68792fac24bec8070e6543f17164e36dbd3ac81d3498366ed54b6312d0c3769
-EBUILD mutagen-1.38.ebuild 1037 BLAKE2B 58e036918dca047ec5fe2518e44adf8a93949f72a1e33d8295d136b917f808891833771a51d954ccf210745584a25ac3225b2a0ae56631cbe449232e6d55ed77 SHA512 f87e626b2de17e6e8da46f7f3ef07078a0050212d9c3c59eeb3fe318c0a8063970f1486bd9e511c7c7067fce40db7d815a66cbed1ab22a8a5dc6e17e0ad17305
-EBUILD mutagen-1.39.ebuild 1082 BLAKE2B aec4bebf1340691d9d6f92e01ce7ddbee3fa7b1ab7b15f44610e13ff42513f789d323e0a0ef6f8417bcf3a38a3b7c694ffee75942336e66ad8856b211be7fe7e SHA512 83836de0d5156008f44639129bc8ec464457176c67dea893bc69e7dfd250dba1f66acd21e58979d59f2c96789fec1a936445dea50a5827abb726e16d0da17721
-EBUILD mutagen-1.40.0.ebuild 1095 BLAKE2B d59306f96a67fa12bb5d21814f5af1369d407bf4935cc8ab93341334061aff02a8e960673a585ce932d4e90ad296f427b2a6ca472a2213516b8f0273e35673ea SHA512 ba041ad0c0d31a338d202b0fca64bb59474c2c5562cb9a4fa234ab5df87b805601601a771feecdd64fca27aa37f38b364e5cabc28b95552a3c2d6cb084d7ed87
+EBUILD mutagen-1.35.1.ebuild 1166 BLAKE2B 1761c7c348571b4719c5c8e6c2b79ea266b0e8a81d501152097139eaf5127852815b4104923bf6aede0a65b2bdf27c12a49aacaa9f4fee494eaa85ca63b5c746 SHA512 6ccf8d04d02dd849a0dc8a40e47e2c67c94db362a4211a88aa0b321319f5c93716859a57aff862028d82bc841be3051b70487e31456c1c1d355f9fec4a035c95
+EBUILD mutagen-1.38.ebuild 1038 BLAKE2B ac815c6a5cdbb250a1faf16c060c2e5baa12d9e3ca2ceccd653c4e9c7aa04b35eb55d242c5e6f2be7c599ed7658b721aef5d4f96f6b88a1932b31dd5c639e17a SHA512 c579883b1ec90b1c94b85e897cf744ac26ade4975ba0dc76aac0d10ea0659740eddd891c7d7c05e24356d019c1bfbec18070e35b1843e5d393e3a182e435e9cc
+EBUILD mutagen-1.39.ebuild 1083 BLAKE2B 079e0e7111f495b6b45409a28b3101663dbe1e52154860a30c16dc8e2fca5a9dae53b20ebc90271c68e7ac550f4f76c4e3a26b0fcebe769b64be17603a1e1914 SHA512 d8890394aa2f7ff82e11b3076a6909609ef0876d9572e52b889fe01677571de2cbf8859ed257c54f93262a6f3364948c94a6b11934122279a08785b0d98156e4
+EBUILD mutagen-1.40.0.ebuild 1096 BLAKE2B fbb87f99424705f4c9534d56afb1751a701b4cb1f2e8d16d0a8960f2cb3e2127c60c2932406f65cc81f2b45b5c8a1f884803a0bb9f43e65a874ad00e6e2c8a8e SHA512 9fe54ac39230796d1ff28e3505c3c9a45197b59555b72587e9781077d9ab5dec4caa27ca7734cae231d4315ed7953a60972374ea3e1852a1c78931fcfc353d75
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.35.1.ebuild b/media-libs/mutagen/mutagen-1.35.1.ebuild
index c67b83d227b9..ea192d81db19 100644
--- a/media-libs/mutagen/mutagen-1.35.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.35.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.org/project/mutagen/"
 SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.38.ebuild b/media-libs/mutagen/mutagen-1.38.ebuild
index c582be7c718e..e969b8cc6380 100644
--- a/media-libs/mutagen/mutagen-1.38.ebuild
+++ b/media-libs/mutagen/mutagen-1.38.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.39.ebuild b/media-libs/mutagen/mutagen-1.39.ebuild
index 02874c5e466c..5555b0fb0019 100644
--- a/media-libs/mutagen/mutagen-1.39.ebuild
+++ b/media-libs/mutagen/mutagen-1.39.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
index ef45a7517694..26f9b74d4c3f 100644
--- a/media-libs/mutagen/mutagen-1.40.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.40.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
 SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index 47cc27d30e47..9cfae7af7154 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,3 +1,3 @@
-DIST nv-codec-headers-8.1.24.1.tar.xz 44672 BLAKE2B 52bd3d7abe6887b270c3c04c5416fb481f77c4b4516527e0439681460e69e3a5a288ddad8e752a111b3109fbde4dae78c0660892a8ee8b284d1b06b32eb92ea8 SHA512 aa63141d234c0bd5f9cb7f568c54a10119e3f0270f7c344030c684865ef0f33106f1a45ce59dd8189c3b7493ee1522f9ba558a667d75bea68b738522e7dc1d11
-EBUILD nv-codec-headers-8.1.24.1.ebuild 848 BLAKE2B 985aaaebd8ef70f9dbb5b10f123d6b48d434ca70c1d9bfd119b53ea14428cf8589fa1f20e91596213d6b436e4d5a69503e47884845c00eb3be688843e94ec133 SHA512 b86f9b51222b5ff3c1374cdf1034d58c65f065961b133419843e1b2fd8da8a58d6790f13c8c5fc967d0d3f02215d7183e1e384cc3130bd9828ad93a70364908b
-MISC metadata.xml 227 BLAKE2B 129a977f3a470f0774cb25c7d9d67968f807b5bbba6b1d1b1d0155e288555355796826ce187abf95a06ee0a448e08e9c5ec34ee79d9895bf2718b47ff0d9bfe8 SHA512 d39fc0676c06bf09884fa817e0d5dc386a536d5626a9c2cf34ddb8b7e29d612ecb2c617214788ffe729c5118c632c119e03ce6d38f17114c48c090c82a2ec2e5
+DIST nv-codec-headers-8.1.24.1.tar.gz 53312 BLAKE2B debb3556399c19ab4d6b6399a187aae23d4480309531d8c60032cf0832f21943e6c568eddd05df200daa17fbfadb679f6b48f59721c0f66ce17ca916e3812dc9 SHA512 b3d8ac2611260bff20ecfb223e1fe84190ea1264a77fda7273624b2ec2dd1ccee3d92d91217546bf9db4c52997fc5c4a769466c363fd67b06dee4f962712776d
+EBUILD nv-codec-headers-8.1.24.1.ebuild 791 BLAKE2B 2caf4d406ebe5ea042f4f3ac321bdc95a9759ce9b9d9c15c68149e77fdde99718a1eed0d730b908e116b8bdfb96279ff6ac1484193ec2f6ca3d78e6b8cdf5a85 SHA512 9994916c7b592ea86289b83762832729a745002372e939396fdc5075f2850de5ed0cd03f027c4d38d39bec1a2f847282d466cb7e4dc7a07757065098bccde465
+MISC metadata.xml 319 BLAKE2B 227369d173003d904c042ec479371e9a483e6d7d58af0f8f1a03317e773bbbd0a06250e06583cf2cbbbe9020a1d7cd416b51467dc96649ead55f51785c79a019 SHA512 c1815f8f72b994c4f4fbd3edf1a856c89848e092b3b6515e706ef26b6b09d0096582219b7670b2b822ccecdfeefcbbbe768141acc3f4e55ca8879045a8ed51cd
diff --git a/media-libs/nv-codec-headers/metadata.xml b/media-libs/nv-codec-headers/metadata.xml
index 106575f01e53..7e6631855605 100644
--- a/media-libs/nv-codec-headers/metadata.xml
+++ b/media-libs/nv-codec-headers/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer type="project">
     <email>media-video@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">FFmpeg/nv-codec-headers</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild
index 94eab8fa1623..61ca145dbfff 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal
 
 DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
 HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,11 +19,7 @@ RDEPEND="${DEPEND}
 	>=x11-drivers/nvidia-drivers-390.25[${MULTILIB_USEDEP}]
 "
 
-# Snapshot from:
-# EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"
-# EGIT_COMMIT="n${PV}"
-
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-n${PV}"
 
 src_prepare() {
 	multilib_copy_sources
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 7b0c281b5a7c..8b706df81652 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -3,6 +3,7 @@ AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877
 AUX openimageio-1.6.18-use-gnuinstalldirs.patch 11257 BLAKE2B 524d40a5ad4827743d20a259f2fd2ed094945439eef620473ff1097efb150cdfc80c66f4576b869aed6c7b9d086499d5d286c3dcaae4d891a37f6ae06f504a85 SHA512 3ca9e8474bc58b726686d1e87766d20f2cdcb2544b07b20a8a48594b442409f753c1e860219bfe948d19cdf0f5090bd04299ab6fdc6bf39f753d158d9f75a1e1
 AUX openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch 15432 BLAKE2B 550a6aa0b962b6efc5c9fb01dcb781dc78bc26a42624c8d4f4be24925464d66e6cbc1a0a7d9dcececa5c5681a70e34d97bfd72ee3224158cffe8ca151a0750c9 SHA512 433dda4b999d60248fecffe0c5866c1214a2db68dedb0e63e36f9c5e0fbcd5c54d3faff3effd19d7b3bb57bce9016eca10f58ba6b3a4143391325838cb637227
 AUX openimageio-1.7.17-use-gnuinstalldirs.patch 11236 BLAKE2B f8adc11f949906bce9046fffb0074487962c8832b4b026a7c2a47b081d0c30ca813536462a685feb5e67b793b37cb5985c3cfc6766df65424c6921ec0bc28e60 SHA512 27d51f70406812efad10cc099a3c9cabb21f98db4bc718ec14269bea564059be40e691210537cb5609708e1ba318fb485a8e02317a34c20106b2b826200ad79f
+AUX openimageio-1.8.7-ffmpeg4.patch 752 BLAKE2B 53b0ee1dec1dd5ef3c9847d46868130bb4e8203f212932af15670c02ef9d99e22a2f8dfbfc02d1fcb4c8b25599969b92997855189bb075fc75342d3932c1dad4 SHA512 ce34f1ae3854d35d17028bf09ec034c22c028d603247a7c0fee94566ada493cb106a7a08241e37f61e8b15f9c4cc67635e0d56734846a1887ce54fce8b8ae42e
 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
@@ -10,5 +11,5 @@ DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a
 EBUILD openimageio-1.6.13.ebuild 2381 BLAKE2B b8a5ff95b6acc88f1de5d12e113e9812b56f5330ee677fe470650f4077635d667071090226a51762d5c1c2e55bbae928b3c9583a8b9ae56b333ed4c16ae5b931 SHA512 e3b005728837a83100594e4fbce4ce18e5af8e24b5addb0023c0da4cc45cff66a42fd551960d6a13bc2e8342e234e5eb8f53a318cbd44a32264e57ef633f5e78
 EBUILD openimageio-1.6.18.ebuild 2884 BLAKE2B 5402981510f3886fd9a143403bacc084703c6a3898319d8f61b124111e26084bdabcb5d8cb0e085cf745d66e9e8d20a68c06ad9382319482fca17a59fd3f2ee4 SHA512 6b07dd2e6239aa9c86f1b2d7dd548dbc6501e06d41c184e99dfbf400a06bd0e4c3a02d54999017e44522c50b069e94d3539d57dce78937f84bb5fcd43a97a970
 EBUILD openimageio-1.7.17.ebuild 2946 BLAKE2B 7a40878d3fab0bf03777a4a9b45118525985bbfa1b494f0641a52a73d3fecc9bc7d76616e1c61757b8b10b93c60c2a9ba5a3066971b017271aeb5b21e4ec266b SHA512 cb9df0dade489b996818b73a62e0d4de82a485b7e7f2123c95be1a46a2405d7690913878d676477857bbda07a8877138de805f8390e0d2899f3f7a26ccbf8128
-EBUILD openimageio-1.8.7.ebuild 2936 BLAKE2B bb57729c82e47998ff76ce112dca5d63950ae4e3c02b93ae8b3c57aef4d5af69ed8984318306c6ad38c66cf735cb856de7d1281d2880307d887656ce2eac6cac SHA512 d96f0ce9f748da35447758b6c1c9d38dff61ffc7d7823887cf8f5b8a97a282fc4a6237793905a7fc5b20ddeb69a6a8eb527600210a292d673d942625f45a0bb6
+EBUILD openimageio-1.8.7.ebuild 2983 BLAKE2B 8b71066fbc00e8ede83b6767a37956aa1df54dea03d8bb00ffabd6c65e3d95f453153482e34b4c090bc9f694370bfa5a06d92e2d45014dd10bf9a841e2c69ca3 SHA512 5f314056c16ba4585afe8c68aabe74fcb3580e05d0b19952e8fea373fd0cc65f50ac58270501a2391cc8a1d8ad14d97387b49e9dcce244949302b6a5b361492a
 MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
new file mode 100644
index 000000000000..92cad26c9335
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
@@ -0,0 +1,26 @@
+commit 810a0235837d6f31d8b3c05544f99461df71403e
+Author: Larry Gritz <lg@larrygritz.com>
+Date:   Mon Apr 23 15:50:14 2018 -0700
+
+    Changes to allow building against the new ffmpeg 4.0 (#1926)
+
+diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
+index 4e0cb3b9..548ddba4 100644
+--- a/src/ffmpeg.imageio/ffmpeginput.cpp
++++ b/src/ffmpeg.imageio/ffmpeginput.cpp
+@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
+ }
+ #endif
+ 
++
++// Changes for ffmpeg 4.0
++#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
++
++#if USE_FFMPEG_4_0
++#  define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
++#endif
++
++
+ #include <boost/thread/once.hpp>
+ 
+ #include <OpenImageIO/imageio.h>
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
index 1c69cf3c6d6a..22956201293b 100644
--- a/media-libs/openimageio/openimageio-1.8.7.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.7.ebuild
@@ -65,6 +65,10 @@ RDEPEND=">=dev-libs/boost-1.62:=
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg4.patch"
+)
+
 DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
 
 pkg_setup() {
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index f62495cb97f1..287ab711607d 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,8 +1,7 @@
-AUX phonon-4.10.0-qt-5.11.patch 7953 BLAKE2B 980598938afe0f64c872f41dfaea13e44d25c50dcaedaf7540000c6dcf657b86560a0a63fdb86f954ed8323b167b4aa50f9918598cff908798c887b3db99c996 SHA512 1760c5f5adaead31ab6bd8f80cc7765ed26186337f4558e313b62a0ecda1065eae1d7dcd4eeeacc3c30c1c998ffffc2b7f8338acdbcf604e81fe3cecc2e9fd8d
 AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2
-DIST phonon-4.10.0.tar.xz 322072 BLAKE2B ba49893368fc13946e2e83a498787bf8fe605b2b3d8e2b1c28eacad5ec13d9679b8c9ddd2adc54c340bbc60a01c7c1143ccaca6f26b86be105cb7502de5f39fc SHA512 6074c7c33edcdfeed8a6199024f1faedebe09652cf5d01075f2d97146b54c4269924b69ca8298e2341c0cf6ca4d18f930a59a937697f6f282b6de8e976d097c4
+DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728
-EBUILD phonon-4.10.0.ebuild 1364 BLAKE2B 0e9d09cf4b7bcb75bfb626cabb4a1a184dfbc8b7f5b70edf42b60568a0c417c9e643bee145d524e87789feabf0830879fe26b45a810b3a5cb03573cdd2a56e8d SHA512 31fd8461c9be7fd99a9c73643edb871253de55e80d5847b8bded86ba771f126eb0670eba553597d2c1fb4dc6fd038815a7eb554e6a315117988ea1040af4e3c7
+EBUILD phonon-4.10.1.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8
 EBUILD phonon-4.9.1-r1.ebuild 3088 BLAKE2B 0d162cfad037d952af2b935999fb0634073103e727a7426101cb2cffb03b8bed18461687ec767e81a6a1d9728ff6cbd02793e8d60940b0ea56b2b7deca17118b SHA512 22ab58d17069ebbe15f0f7bce13026c4fd0accd32db2fdd6d158da489ac0399407c840b01195b22b2e5fa454443b9f71ff94f4cc24f31f0ef55eb87563c1d7ec
-EBUILD phonon-9999.ebuild 1306 BLAKE2B 0c124727d6c0052966c90042246023d3927ddd7a076b79c8e0f56e43e1c2727863ded2c0aedc2f6524b14e446365f04965e3ae1d579477726b50600a29f5101f SHA512 916fca63f9ddd17f207b1349507bd408c462551d14380a3428c783177eb2a68012bffb697882b52339442b39b253280af39808ee8e8bba9278d2e9fbade6aca4
+EBUILD phonon-9999.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
deleted file mode 100644
index f8444b343a40..000000000000
--- a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 2670e33c418acdf6c08fd0cf5d238a4d93cc12e6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 22:35:30 +0200
-Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- declarative/CMakeLists.txt          | 10 ++++-----
- demos/metadatareader/CMakeLists.txt |  7 ++++--
- demos/phota/CMakeLists.txt          |  7 ++++--
- demos/simplecapture/CMakeLists.txt  |  7 ++++--
- demos/simpleplayer/CMakeLists.txt   |  7 ++++--
- designer/CMakeLists.txt             | 10 ++++-----
- phonon/CMakeLists.txt               | 33 +++++++++++++++++------------
- phonon/experimental/CMakeLists.txt  |  9 ++++++--
- 9 files changed, 57 insertions(+), 58 deletions(-)
-
-diff --git a/declarative/CMakeLists.txt b/declarative/CMakeLists.txt
-index da2d2eb9..cdc1b842 100644
---- a/declarative/CMakeLists.txt
-+++ b/declarative/CMakeLists.txt
-@@ -19,11 +19,11 @@ set(declarative_SRCS
- 
- phonon_add_declarative_plugin(phononqmlplugin ${declarative_SRCS})
- 
--target_link_libraries(phononqmlplugin
--    ${PHONON_LIBS}
--)
--
--qt5_use_modules(phononqmlplugin Core Gui Declarative)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phononqmlplugin Qt5::Core Qt5::Gui Qt5::Declarative ${PHONON_LIBS})
-+else()
-+    target_link_libraries(phononqmlplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${PHONON_LIBS})
-+endif()
- 
- install(TARGETS phononqmlplugin DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon)
- install(FILES ${phonon_QMLS} DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon)
-diff --git a/demos/metadatareader/CMakeLists.txt b/demos/metadatareader/CMakeLists.txt
-index a307c071..69e2b3a6 100644
---- a/demos/metadatareader/CMakeLists.txt
-+++ b/demos/metadatareader/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(metadatareader_SRCS
- 
- phonon_add_executable(metadatareader ${metadatareader_SRCS})
- 
--qt5_use_modules(metadatareader Core Widgets)
--target_link_libraries(metadatareader ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(metadatareader Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(metadatareader ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/phota/CMakeLists.txt b/demos/phota/CMakeLists.txt
-index e9a4ee34..aa70cf39 100644
---- a/demos/phota/CMakeLists.txt
-+++ b/demos/phota/CMakeLists.txt
-@@ -17,5 +17,8 @@ qt5_wrap_ui(phota_SRCS videoeffects.ui)
- 
- phonon_add_executable(phota ${phota_SRCS})
- 
--qt5_use_modules(phota Core Widgets)
--target_link_libraries(phota ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phota Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(phota ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/simplecapture/CMakeLists.txt b/demos/simplecapture/CMakeLists.txt
-index cd910707..811d29c6 100644
---- a/demos/simplecapture/CMakeLists.txt
-+++ b/demos/simplecapture/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(simplecapture_SRCS
- 
- phonon_add_executable(simplecapture ${simplecapture_SRCS})
- 
--qt5_use_modules(simplecapture Core Widgets)
--target_link_libraries(simplecapture ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(simplecapture Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(simplecapture ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/simpleplayer/CMakeLists.txt b/demos/simpleplayer/CMakeLists.txt
-index 3d66c74e..f759224f 100644
---- a/demos/simpleplayer/CMakeLists.txt
-+++ b/demos/simpleplayer/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(simpleplayer_SRCS
- 
- phonon_add_executable(simpleplayer ${simpleplayer_SRCS})
- 
--qt5_use_modules(simpleplayer Core Widgets)
--target_link_libraries(simpleplayer ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(simpleplayer Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(simpleplayer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt
-index 9d437547..e9d2e982 100644
---- a/designer/CMakeLists.txt
-+++ b/designer/CMakeLists.txt
-@@ -11,10 +11,10 @@ set(phononwidgetsplugin_SRCS
- 
- phonon_add_designer_plugin(phononwidgets phononwidgets.qrc ${phononwidgetsplugin_SRCS})
- 
--qt5_use_modules(phononwidgets Core Gui Widgets Designer)
--
--target_link_libraries(phononwidgets
--    ${PHONON_LIBS}
--)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phononwidgets Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Designer ${PHONON_LIBS})
-+else()
-+    target_link_libraries(phononwidgets ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${PHONON_LIBS})
-+endif()
- 
- install(TARGETS phononwidgets DESTINATION ${PHONON_QT_PLUGIN_INSTALL_DIR})
-diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
-index f9ae09e5..b80c96d8 100644
---- a/phonon/CMakeLists.txt
-+++ b/phonon/CMakeLists.txt
-@@ -137,25 +137,32 @@ add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_
- add_definitions(-DPHONON_BACKEND_DIR_SUFFIX="/${PHONON_LIB_SONAME}_backend/")
- 
- add_library(${PHONON_LIB_SONAME} SHARED ${phonon_LIB_SRCS})
--qt5_use_modules(${PHONON_LIB_SONAME} Core Widgets)
- 
--if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
--    qt5_use_modules(${PHONON_LIB_SONAME} DBus)
--endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(${PHONON_LIB_SONAME} Qt5::Core Qt5::Widgets)
-+    if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+        target_link_libraries(${PHONON_LIB_SONAME} Qt5::DBus)
-+    endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+    if(NOT PHONON_NO_GRAPHICSVIEW)
-+        target_link_libraries(${PHONON_LIB_SONAME} Qt5::OpenGL ${OPENGL_gl_LIBRARY})
-+    endif()
-+else()
-+    target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+    if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTDBUS_LIBRARY})
-+    endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+    if(NOT PHONON_NO_GRAPHICSVIEW)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
-+    endif()
-+    if (QZEITGEIST_FOUND)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY})
-+    endif(QZEITGEIST_FOUND)
-+endif()
- 
- if (PHONON_PULSESUPPORT)
-     target_link_libraries(${PHONON_LIB_SONAME} ${GOBJECT_LIBRARIES} ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY})
- endif (PHONON_PULSESUPPORT)
- 
--if(NOT PHONON_NO_GRAPHICSVIEW)
--    qt5_use_modules(${PHONON_LIB_SONAME} OpenGL)
--    target_link_libraries(${PHONON_LIB_SONAME} ${OPENGL_gl_LIBRARY})
--endif()
--
--if (QZEITGEIST_FOUND)
--    target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY})
--endif(QZEITGEIST_FOUND)
--
- if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-   # We need to explicitly link libm to phonon in Solaris
-   target_link_libraries(${PHONON_LIB_SONAME} m)
-diff --git a/phonon/experimental/CMakeLists.txt b/phonon/experimental/CMakeLists.txt
-index e44cb7ac..13101ec9 100644
---- a/phonon/experimental/CMakeLists.txt
-+++ b/phonon/experimental/CMakeLists.txt
-@@ -20,8 +20,13 @@ set(phononexperimental_LIB_SRCS
-     ../abstractvideooutput_p.cpp
-    )
- add_library(${PHONON_LIB_SONAME}experimental SHARED ${phononexperimental_LIB_SRCS})
--qt5_use_modules(${PHONON_LIB_SONAME}experimental Core Widgets)
--target_link_libraries(${PHONON_LIB_SONAME}experimental ${PHONON_LIBS})
-+
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(${PHONON_LIB_SONAME}experimental Qt5::Core Qt5::Widgets ${PHONON_LIBS})
-+else()
-+    target_link_libraries(${PHONON_LIB_SONAME}experimental ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBS})
-+endif()
-+
- set_target_properties(${PHONON_LIB_SONAME}experimental PROPERTIES
-                                          VERSION ${PHONON_LIB_VERSION}
-                                          SOVERSION ${PHONON_LIB_SOVERSION}
--- 
-2.17.0
-
diff --git a/media-libs/phonon/phonon-4.10.0.ebuild b/media-libs/phonon/phonon-4.10.1.ebuild
index 5da7537646b2..478b0d3bb95d 100644
--- a/media-libs/phonon/phonon-4.10.0.ebuild
+++ b/media-libs/phonon/phonon-4.10.1.ebuild
@@ -41,8 +41,6 @@ PDEPEND="
 	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DPHONON_BUILD_PHONON4QT5=ON
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 537dd677f726..478b0d3bb95d 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index 67518ef5bb5c..40da4604feb5 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -4,5 +4,5 @@ AUX plotutils-2.6-libpng-1.5.patch 575 BLAKE2B b35dc9895e5a2f17ad1d5b71d8dfc1d04
 AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1
 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84
 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7
-EBUILD plotutils-2.6-r1.ebuild 2075 BLAKE2B 1994d7132d14d61f5509a56350d5abe41b2ea1e1f9b3e947e91aaf1fa4a22d6182e457ba3ea444e7fe4bcd71a9c0e232d3cb4705e19bce018617ddab10896c93 SHA512 7f78a4635234f05b27c6812e406a2bdc30ae46e2bcd333704e966d2e4c6231251b1033924205bcbd37d3f0191b55ecfab23e698580b0c04890da22b301c38d20
+EBUILD plotutils-2.6-r2.ebuild 2051 BLAKE2B 75b581a2fa74367e04ab519c79254149f0c932df755b76513ffa491cfc6fb16f106ed22e03e94146f2ae184bfc5198d7fadde0d554d12a0c0cfb047782bbc67c SHA512 40c295166cb3296cc682532eb1b4ebc1411b0946c4d6d7f1c4f21b0451f0bd066c01ed327874439f9fd9f24f77f600d533066898014af905c91fdbb215f17f41
 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4
diff --git a/media-libs/plotutils/plotutils-2.6-r1.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index 5e78143d10b8..e0e81ef5577f 100644
--- a/media-libs/plotutils/plotutils-2.6-r1.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -20,9 +20,7 @@ DEPEND="
 	png? (
 		media-libs/libpng:0=
 		sys-libs/zlib )
-	X? (
-		x11-libs/libXaw
-		x11-proto/xextproto )"
+	X? ( x11-libs/libXaw )"
 RDEPEND="${DEPEND}"
 
 DOCS="AUTHORS COMPAT ChangeLog INSTALL.* KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO"
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index a93d26a69546..ff2f948bfc9f 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -12,5 +12,5 @@ AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398e
 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82
 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
 EBUILD svgalib-1.9.25-r4.ebuild 4043 BLAKE2B a7d0923085e1b203498078e8a2639efcc8c6c5044c43bc7d942b66f6ad0caf0d5bf712809a0b9ed6f780fd0ae8d30193f4bfc4753b5b8c82da21dd5b7b4d78f3 SHA512 b96d007f1dff3d8f3f55a6f10d7f64ba10277e2cb6edf02120ac52fef8afa0c44440d94c05a850d0b1845a66f5cb945b27dd19ea3b69b474dfc502a06bc2de20
-EBUILD svgalib-1.9.25-r5.ebuild 3565 BLAKE2B c5fb8ecc866545bbb1e9232e614f33fe24866505d6884f8dc2293dc9ba4a60aca76d2bb0c0b72e93d69d182ab9699460bee4f0ffc3804328bea09e7e308367f8 SHA512 c693257317b3b4e480bfb5e92f4b2201cfed6338ed8677e1d95922a41fca297ceb28e0fc49ac825486cf25efedcdef71060ca3749cb8ebfafb53d7b7493c4abc
+EBUILD svgalib-1.9.25-r5.ebuild 3564 BLAKE2B 34169bab844e25a70e0872a767dc50b44efe2af788b8a2f6aa4c707d01e3e2c015c7fb25db1aaa45ee0617930251b83bf15618438fba26dd7e8195310b8c8368 SHA512 c32cd1636355ef7cba7572e894ab7d83c35becaaa999db1849535b8b179a800a34be5afda2a416ef54cb09fa37045d53c290dc909ecb6d04372d72b17b93f21d
 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d
diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
index db04ae0a17d0..54c070fe7ef7 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="build +kernel-helper"
 
 MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 3595499c267a..7323d0969e3f 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -21,5 +21,5 @@ EBUILD tiff-3.9.7-r1.ebuild 1941 BLAKE2B 38e7fc7b06adec30d32dce66390c5174fa8ca51
 EBUILD tiff-4.0.8.ebuild 2485 BLAKE2B de7917ea6c510b4da138abc7c8c46c108d93385845f37922c0043e619ecce744212ce0da78d3cd32c7ab6d07c667037432ff5203271ac357019260b2b2426120 SHA512 6b36c1575467420df401fa1268a93d51ad7e58c0e2ea1f43f79a98fbaced66f8f8d248f6f38531e731b384e1c4ea4d36416ba1545724cea7ad6d99e8fbfe1235
 EBUILD tiff-4.0.9-r1.ebuild 2130 BLAKE2B 09892b7bd37c8dfc6660bcb4ef5369457bf8e0929a2863fd62bc2a02c235c893fbc1880f0267683b115381980cade0f8412ec3bb63c2cae247263f7a3677b23b SHA512 fb2797ff15a7b1d3eb1ebf6be90a76c219f8cfb088ec1608b45f696e797fe1a74669152e89cee385d2c38758a737e4f4eba574701f02c27f2a791b8b394f90bd
 EBUILD tiff-4.0.9-r2.ebuild 2229 BLAKE2B 53aa8befbe2c445bec2276190fd1c7282b46881b8a8ea14cc5b71e9df65de8199c8b4f9d155f6d47b8d727bc91b31be7ec975720c27e597c737fd6e6fc388d8d SHA512 789642b417be56603c2acd94c6e472780944022f138b19ad1f41d72381a876a9212107c5dc39c96fa650f8632055ffabafb6c543a26331f8f7e3c754e44a9001
-EBUILD tiff-4.0.9-r3.ebuild 2268 BLAKE2B 89e3ba540d05f2141f55c3da530a62185466e23f76b4588f8f3e35bb7e72bf33bd4c1aa06dcabfb8ab1c2d30d9bd13179efa9e93b7bb8bd738bf36f6b5c311ed SHA512 c6cf933a65a8e2d8f9a49d02735e2c88bd965cea448de0a6f4c4cca763765a44126abf9765ad1d6afc8df0cb73135f21c3f009b5a391f578f73ff755897a508e
+EBUILD tiff-4.0.9-r3.ebuild 2267 BLAKE2B 588724f8e3d3d68f76b12021f475b5c18fc7cf7be8d8a22e1222198e309ddfab20e0154c91432a52453731873ebb499a0ee2fa87d0d97b8210bf0b6291a46170 SHA512 a12480c422d4d76f9fd5c2c8459838a03f96540654655fee324e9da5bbdf89e1f7a11318b97e2c3036e146da02d2a12e5b9a433ac2306adf5fd158acdf106b09
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild
index a3fc4bf56e68..922ac56426c6 100644
--- a/media-libs/tiff/tiff-4.0.9-r3.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 72750cb7d094..6f0a7ae5e17f 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -3,7 +3,7 @@ AUX vigra-1.9.0-automagicness.patch 2470 BLAKE2B dbe9116f2864cba0a20d125ec494a08
 DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757
-EBUILD vigra-1.11.0.ebuild 3504 BLAKE2B b234c2c35e728818322358eb3bc1b22339a9e3ed2cb6853c724a2b80ec214627b953138e9a5ca7bc2e2e7b8d37835443ed80b86f7c892992f5774326ec83c7d0 SHA512 702c801b8b5eccc845db31a61637210e148d8ffbd27182252820b5fecabf9b068c5828f2e7519c3caf2089d909d03909e30786a30260a2a8919dd16ad01127c5
-EBUILD vigra-1.11.1.ebuild 3548 BLAKE2B 737ab017f04ad0630782ff60f0846457e611e66ccd8d1c71ebaf0e39d447919a6a1e57d64d58bb2a12990c97512e55616d6d0afa9cc2fd29db33650645972c8a SHA512 53270bb5f330a387d03fab354f8fdd52e61e565dcfdec2da08d7e08eda0308341dfc2ea18182e2eb221344b7ed77477fca973744bf98cd76ec5c87fbd53156fd
-EBUILD vigra-1.9.0.ebuild 2647 BLAKE2B 44d9d93f5f0d735b08e0bba27e455d3e3eaf6266d8e65a1ee10843db9667b0c39789f40f0e3226101ab075dbe683004e87b00df9496c3ea0ff8e2622d8e77861 SHA512 a1f995bca67859d072e666d16d7ddad87609dd857afde8fc2de4c56636cfbdc751b63acadd3ab06d230374da57edb49e9cc9f4bb896f6264005e54570fc96c0c
+EBUILD vigra-1.11.0.ebuild 3492 BLAKE2B 304c3a1ec38d2239999edb9088144379b0cd08f166e2c6d73e60f1c962217daaa4d3fe5e98c3a3ea5918ab199a030537902823f31cc54d5803130a9e259396ca SHA512 d006b82c2d904308da82a4bdb90860f502a509be2fb5cc0a143c8f8a88ef69fa054b15af63e7a4228d86403bf3d19fe4757f25bb123f4013ba046c70d2b1e160
+EBUILD vigra-1.11.1.ebuild 3535 BLAKE2B 23c0f6fea13190f8b0e729de8d2b28d3a8efbcd5fc77223f553b6c354dacfb61ad13c25f4f991b6b4ca87b73ee53050ba5fa77ab643469a3b5ef675ef0ffe949 SHA512 b1f535c04ca2df0724d6e2b45b714eb1cc0e217c4c1f22e00bdd7dc241730341792c2280a14299031907c7177c45ca69deb27e709d32f411ed0eed23293522be
+EBUILD vigra-1.9.0.ebuild 2637 BLAKE2B dc273de65af90b7b5093f00ab90d1f93a11e989dd267eb014e5e80fb635a85bb42250661761c897dfe499b3fb7796585d87505739a848e2f6f5f57596674cbd1 SHA512 c6d217e3a07bb9332f83a9eb98d98bf76909ec40528cc155c882ff00c2a1fc287935098798793ebc57505185dd7bd36b3c88ba6259b05464d822d3f1a61baf92
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 7c3e44a5e1b5..566354ca414b 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
 
 # runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index 6fa95e1699aa..c7db801f5f0d 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
 
 # runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
index fe2fa6ed8e7f..0252dcd97b64 100644
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
 
 # Pull in dev-lang/python:2.7 for vigra-config which is always installed
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 95c17f37d4bd..7cd108c83f6d 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,8 @@
 AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918
+AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
 AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
 DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
+EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1780 BLAKE2B ee2078c51a1368e97e347565d0152b70b636ff094b39e3c44c348c2d37aecba7781140a36deb74f803e90c25d272d34e46dfa4853345c05bb2490cb4c702623d SHA512 4c9254c7cc300db6107e77755117e0c1a86c4e5e5750aaff31f753aa7222516c48e84a4cdabe7fb7f84f92bfbc8f4f84b8ad4287126c423627898ab1fbe3cccd
 EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681
 EBUILD vulkan-loader-9999.ebuild 1649 BLAKE2B cbd06a6d61272d7b4c5a72cd78386bc133c8789c7f0b98af3bdec194262837412398eb4bdff8441d3b05b96f5aae1fa06b62df672e2e892e6490edb8366ba408 SHA512 550bab7fd8d6de1d2c1ddf8071edfa63d69ae89e462ecf2d806ed330cd9b4f2d12708374b87557bfef9b38bd5af5f5698fb753cf74c9e7a9e7f64857491a5b8d
 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch b/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch
new file mode 100644
index 000000000000..193a8e55a465
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch
@@ -0,0 +1,26 @@
+From 4ae095d8d3e668311b3db3657af753dfb39a149c Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Sun, 22 Apr 2018 18:44:48 -0400
+Subject: [PATCH] Make the layers install into the data root directory
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ layers/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 9ade6a03..c1a3cedd 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -142,7 +142,7 @@ if(UNIX)
+                 VERBATIM
+                 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json
+                 )
+-            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/explicit_layer.d)
++            install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vulkan/explicit_layer.d)
+         endforeach(config_file)
+     endif()
+ endif()
+-- 
+2.17.0
+
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
new file mode 100644
index 000000000000..980db94c32fb
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="demos layers wayland X"
+REQUIRED_USE="demos? ( X )"
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+	layers? (
+			dev-util/glslang:=[${MULTILIB_USEDEP}]
+			>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
+		)
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+PATCHES=(
+		"${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch"
+		"${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
+		"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+	)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LAYERS=$(usex layers)
+		-DBUILD_DEMOS=$(usex demos)
+		-DBUILD_VKJSON=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_src_install
+}
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index ef7cb45e8492..02345c166e05 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,4 @@
 DIST waffle-1.5.2.tar.xz 179284 BLAKE2B 40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56 SHA512 04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
-EBUILD waffle-1.5.2.ebuild 1589 BLAKE2B 807690d54c0a290d35c6dbb28bd47fbaae055543753bb1781d4688039bd5896bff76850aa072d84f19140ee37a25ba5039e815cbd7fb86982f4c9b898f7f1a24 SHA512 fffbf7a02e4f90fbf57b304e1126bc8d32c0273782814d56a1ac55255c4666a1dba43604f27f45d0eb2bc971f2bf57190441be704fbc8932f606a126e661ebe5
-EBUILD waffle-9999.ebuild 1569 BLAKE2B df54503e3ddc18c15e1948dddab17acbb118b71e8308d4990378199773b9c42926fb57c3fec4261b3453a755b73ee5ae9faa6486dfe9885afede47efdcc328b2 SHA512 4b623a99b992a21b77a817811f70af3068c0d471aa459ad481732a634f935d76273238c7d6853d9cd36c81aab462803751c98391466d347e9a31a0a57f0ad586
+EBUILD waffle-1.5.2.ebuild 1588 BLAKE2B 31f81f4134cd77403add1e283875fd9f54bb04df770bf50b83af8b2169eee2ccf7fd77ff412c37838882615d0e97d69ec31161517d838e23479dd4f364cd98fc SHA512 cf7dadaf9b902ecd6c1afdb0d0169514ada5962557cb9f2b55fda83e8b9050affc9d904529dacd0fb0adeab5bcdc86a646c41ec857a9d1fdeb7c3f63686493c6
+EBUILD waffle-9999.ebuild 1568 BLAKE2B 0b0d86df3b63730d185c115e7ea0cefa2a2b3a632e1002b84dbe31cfaf2871591385eca2fc66e556dac660e08b3be591f2b84be2675774fd42b9b11a2b7303fd SHA512 d4cad6393e0bbcf2c91dbb8811629e523495f12c5951cd7b70b1a8351fee0ed72528a1364500201e94777215b1402038fe188e24951ced3f7827bedbe24a6395
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild
index 140bb05b121d..ec71eacc2bfe 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	>=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xml-dtd:4.2
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 8d8286cd45ce..23384f2ecadf 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	>=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-xml-dtd:4.2
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /media-libs
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)