gentoo resync : 30.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
commit: b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree: c66442ced2011c5ca81c3114cc51041e314c6d33 /media-libs
parent: e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)
77 files changed, 425 insertions, 735 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7da288fbab99..b0f2623dca86 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index fd5464f06a28..b6ca75574a86 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -6,7 +6,7 @@ AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r6.ebuild 1780 BLAKE2B 9612eb7ce830849555921150cfb53e49fe7dd4cfa2b3f8e67b5191eded0300607184eebcc80c23ba0876063d5e7317b7796b9f4d870e04d88d815f9b9c479b35 SHA512 285aeb2d26cceb3a5bfc6bea24ce77da9ff38fe2ac2ba3955f9f6dc71119bccc9704a0c8548c81313eec856248e2e3b96fd61e1e6a874440a44ab1e9eb5ca5b2
+EBUILD aalib-1.4_rc5-r6.ebuild 1779 BLAKE2B e89ac319629bbe00158c7b9fee75e44681a050cc30e4beb6023274268e646ed8e0e27bc27ac982d70157807f71d8238d793c3c14fde689c6ea47674666e76fca SHA512 0217cdbdaacb10eef8148600c37623f63dd9682a9f652fe1c8da17676f4841fe501b5e3e8c9bf8f32463d66ef4d6520eec4787885756f5166eae1944667c2d78
 EBUILD aalib-1.4_rc5-r7.ebuild 1844 BLAKE2B c0da2a46a489a14d24268c78789fb2a381746533910ee313067dd577155711210ca2853e572e0cb9b9903dbf10fa8e6d6300cb2b199296e761f9f6bcb0dc39f0 SHA512 b8bb79cd21dd348258e0eb6fda05b75a009497d923801a742fc2dab142194e8bd1b60c3f640ae15063735721b6f0d387c4ec613f889e460ab982e1b5c3492477
 EBUILD aalib-1.4_rc5-r8.ebuild 1988 BLAKE2B 5cae6ea9906bc9860f2334ac558a2723f96da3e88f985067babfb6343eb9baeb245e9706537d2a1fbbb3b932579c98be6b43cbf0b785a0297f6b8e05f95dc237 SHA512 c70991712d711c03e8a4731846cd746aa000e0dbed97b2d3f66021bf5670e3068c6340c32e19ddf47abb5ef65e398f9daf0a49985dac80305334b6914f3d3f46
 MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
index c9b66ed53477..4c2a787d388f 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="
diff --git a/media-libs/aften/Manifest b/media-libs/aften/Manifest
index 184d0280df6a..0a97d137f8a3 100644
--- a/media-libs/aften/Manifest
+++ b/media-libs/aften/Manifest
@@ -2,6 +2,5 @@ AUX aften-0.0.8-multilib.patch 576 BLAKE2B c049de0a7f99ec04a7edfff591ab320c61ad7
 AUX aften-0.0.8-no-static-aften.patch 684 BLAKE2B c0df8086a8b73d155ec3175767cee9c32ba9f835b0307e880dc985602ee901b43a5bd9458a288380ef0d99981f62092d7eb9758ee52281a4250f3e5bb9d24a57 SHA512 cfd2b151a031b64cb3f09b0bfa514e220fade4372dbe37bccbb58a158053ec25715617ffbcd5fd3b5e0a348488f28d13711db5a18bd62fc67058dbee540a36a5
 AUX aften-0.0.8-ppc.patch 4066 BLAKE2B 27285a58026f95b2974f8ceb09dfeaf38d53c019c19e96ef8e8da42a7a368432a59bde54b3b72bf80202da7ce7c3f3faa279b5b5801bca7a1237c269cf7d05e3 SHA512 5022529320ae0cefbbd4124c37bdf3d2451c4733b41007f77cfcb5a26ae32ca159716ce4782b6e75767309a2057c839e467e966c8d9ad159d074c53ffdaf4ef5
 DIST aften-0.0.8.tar.bz2 80865 BLAKE2B 8746ba1f061255a6ec79a1253aede9aca8fa9bbdcb3bcc38636a99ec2f83f882cb713183483143ba0dc3852bff821d00a9029e0812b67e67540b303fb67b26b7 SHA512 1261297eac5065c6f028618d3e15e9b152ac35440c74cfb09d98cd99a90fb1c6a49585f70928834c3f6ddbcdd1d8721f7329d24f57cd30901dff09bbc0d419e3
-EBUILD aften-0.0.8-r2.ebuild 751 BLAKE2B 5c89d01269c80fb77ecbab3be72cd7e849c7a24244fb46fe4e31c575f732e837e6f413851f875ee04275dc9251b8ff48ed0dc78cbdde174b8a16c1d6011387b3 SHA512 80cfb35bd2ffd6d0622c247f654b82f9d55a6671bc8adf839d15e38224a8d907a01f4aaf9fd4355031a9401909ae6b82dd5c039896dea88bddc214fbea7d7169
-EBUILD aften-0.0.8.ebuild 739 BLAKE2B 1bd159a956fcd25e4515a3b27775bb83b05b42e1a123fe86df4c8ce72adbbadde85c07f2c5945eb3289a51037b71d66e41025fe1dd1146cfc907a48c671e96d5 SHA512 002b86d193810c8696a3fd17e6f883201503d26f49fe2daa89abaadbc20f76a4968560eee07997490cbda2887c8794569b729c3ec50f2c025e2bd989a589f7c7
+EBUILD aften-0.0.8-r2.ebuild 750 BLAKE2B 3cb48a36e12fb93ceb703bb225b88f73c5af88f96b893a2e1a26aa73fcaae96317ef8ca592d44895f86dcb7124aeda449f9c4bfc60a81c50ff7ee11bd3d96f28 SHA512 c3bff1006d7132bc268207027aedbeaca420c3ddbd70a7c0108f3e8f37f63234e936f8b92f901e7840130860f3fae8412626f5fecd53e3db008d2b83f4593b11
 MISC metadata.xml 602 BLAKE2B 87b43f5a24944d2583cc0b10dbb51babab9de77027aa6f19460e7a217e5370c7f8343610df5ada3f21827f267c2a1b84bb720afcb1221112fd112ff944001467 SHA512 6b78ecfd5eefe1ce29c875db4d487ed23fda5faf9a1bc97b75d6de9afad30be6aceffabd3031bf35badbfb8cabdb4bfa24fb2c7a3905d7a68b9ef9bc0bf0d458
diff --git a/media-libs/aften/aften-0.0.8-r2.ebuild b/media-libs/aften/aften-0.0.8-r2.ebuild
index a52cda27855c..cb3a41a38299 100644
--- a/media-libs/aften/aften-0.0.8-r2.ebuild
+++ b/media-libs/aften/aften-0.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="cxx"
 
 PATCHES=(
diff --git a/media-libs/aften/aften-0.0.8.ebuild b/media-libs/aften/aften-0.0.8.ebuild
deleted file mode 100644
index 1b01dc33c91f..000000000000
--- a/media-libs/aften/aften-0.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="An A/52 (AC-3) audio encoder"
-HOMEPAGE="http://aften.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="cxx"
-
-PATCHES=(
-	"${FILESDIR}/${P}-multilib.patch"
-	"${FILESDIR}/${P}-ppc.patch"
-)
-
-src_configure() {
-	local mycmakeargs="-DSHARED=1"
-	use cxx && mycmakeargs+=" -DBINDINGS_CXX=1"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README Changelog
-	# File collision with media-sound/wavbreaker, upstream informed
-	mv "${D}/usr/bin/wavinfo" "${D}/usr/bin/wavinfo-aften" || die
-}
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 0d0568c1af7f..f3a005740285 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -12,5 +12,5 @@ EBUILD assimp-3.1.1.ebuild 953 BLAKE2B 15f39ddc3b95c4285d16096caca82100ef0a7dab1
 EBUILD assimp-3.2-r2.ebuild 1096 BLAKE2B 6cc29ade3736c8e1608398fe609295e5836cd42cb0faf436149142046675fd81aeb43bf2b9718de8566a6b87dc98de525edbbf54991c7b82f5fe01b469d0f54f SHA512 30d46bb930c589837d8444201881a611189fd8c87763ed04d10c52fcfac8b6cecfe70690fa684e5d7cbd4deda8e510cb8b13b6b8506c9b4881abbefbfe8f0e9c
 EBUILD assimp-3.2-r3.ebuild 1246 BLAKE2B d8f049d6fd8dfd6eaeeca58ba3b4a24fdebb1e25f7568410b7f5d97b6bb911d083e4c4968dbd6d18ad947f72f18376dd54fb759b16a9ac3510e7070a9b56768f SHA512 efe222111e465ba66060db4dff39fe2e75510dbe97a754c7d930fa27e1947fd002fe9c472f0c829874ed93d9af375ea9d25dadb62006ae8b985ba530c0ad09ed
 EBUILD assimp-3.3.1.ebuild 1127 BLAKE2B a119bd51210262335826392fb0f4f2a78f764fd7c27932a1d6ff0e4eb7f183716ea10f5a25b67e0bde6d65935febc92037572f872cb831b1af5bb49dae1612d5 SHA512 afaed89ce02ddb4f734b2dc8ff3dc92a02b28d97cecb8b874bbc1d32c19219390257c598c88031cbd63fa42567e4dce7c32ead01265a1a4f70a77e0e9f09a578
-EBUILD assimp-4.0.1.ebuild 1282 BLAKE2B 2231c2e4bce5f0f48078bff8d33fd3f169514b3bbb94cb2d16a1f352b89c93b0f754e3fdb91178433d2bb60085120dd1d662cdfbee75b93064f5f5a18ba22354 SHA512 aa02344b91ab3fdfa633acba9cbc354f96b9907b57a793ed99f7cde361a1192e3e5cf570d76c1936c5951855915be14c8d082793b6a84ddba98da539c6cedc6f
+EBUILD assimp-4.0.1.ebuild 1281 BLAKE2B 029b1474f1d2f9bff73436f1009c965d11739aedd2d2ebdcc1dd6e9354bb0bb7ddb77aaa69fe618be05d86d3af2577d91c7f5dabb3e392642b9180f9c24b0174 SHA512 7e4c081c6c244a519a199e7e54fffba275f965449fa680d362a8934cece4446fe37590f4d688ceb2cb16e06fabb603d89f031b49ce59edd3b91aafa4b422f1de
 MISC metadata.xml 523 BLAKE2B d50f227136c88ab834e955a8fdd9b25b3624a2195610378f4e8ee7170a89c231654f08980e347074023b79730e36c5b17cf82b127628e13bfb4cab894ee202a8 SHA512 f156dce148c52ce8ace4f8efe42a0a891ed82dcf8ecff3420cdb427f195910532e952bd3e8578b171cfedc0ebabd4b4bec71585a308a575701a1195331bb5c75
diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild
index 89da03baf096..c3bb59596e50 100644
--- a/media-libs/assimp/assimp-4.0.1.ebuild
+++ b/media-libs/assimp/assimp-4.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/assimp/assimp"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="samples static test tools"
 SLOT="0"
 
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index a0adf44e28a6..508dbc6a703a 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,3 +1,3 @@
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4.ebuild 625 BLAKE2B 27cdf011b774550263148fee1096d5540037bad3f688bf12a4d27273a1c9f833a0abb63820e69cad4b3e0fbc502129cfae742f534583117e8b9504628c30f7e9 SHA512 9366f0c3eea13a699ec3d7ce851855a1a54d78e9b537a96d566c3604ced4c70c440e41125095c5ae18d58cfe06ed1a6f78e342c0eb4fd82139a089a2271efb93
+EBUILD bcg729-1.0.4.ebuild 624 BLAKE2B e27d7dd45939f19eecb977717524c6eb98eb82c0a06fd995a8efc002853206dc9cd9c75b5833a35f1270c9ab9afe1fcc93bcd519ec4060d663a816f0a6187840 SHA512 586924b8271bbce14e5cbda085543e22a9b9a2c4e272ab12fdfae24175a8ce16a6ac35dc5396e637329baf9a6c9cc2fc55c68a3d64842a8f41cb6a2e02b346b6
 MISC metadata.xml 213 BLAKE2B be9f4b06d7567b80dc4d16cb47551ef3e825a84f13897115ef207911582b9062e23181c5d7583fbe1a8299e563eefc7cdeee4114d36ab911f685fd27b294d23e SHA512 b2ac78c6617cda0ce08982f7a56bbedd709df884c5ac51b5ae4fdbc36eee2690a177afa507206d8e3914c0e1b80d96291a329164a1883b7c76e5e4eae376b667
diff --git a/media-libs/bcg729/bcg729-1.0.4.ebuild b/media-libs/bcg729/bcg729-1.0.4.ebuild
index dd1a87246015..895498431d71 100644
--- a/media-libs/bcg729/bcg729-1.0.4.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc64 x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc64 x86"
 IUSE="static-libs"
 RDEPEND="
 	!media-plugins/mediastreamer-bcg729
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 7b73d9f7d249..a50f524eac08 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 1116 BLAKE2B 3feea86074a3cc1dead7f62cf148994f7a15d9c740de0559f6c4f317c62c43777b45134a564d55b19a94c3221669b0ab512f739783ec40f4ce71ca08a1073fe7 SHA512 db2b2a538c241ddb6975877067c264a64c75a3932d58691576601d928a4c65915c442b0b9f59ca9ddc72545edf696961bf9d9bcadaaab21d1fb9d89341963c75
+EBUILD bio2jack-0.9-r2.ebuild 1114 BLAKE2B bbf2ef4493626a210150be1c908f5078c6620dd87acfc798065d1eeb37df2a0147cf4bc410ff9409c98f0e339d052b84f6a2adda49c78ecafb858b2952cbf4ce SHA512 93ac39e934fbe58fa498f67a544b528bbe7d02606fb4ac4bdd968885b7ab923239b19298ef7111de734f2bfe5f2aa699a8c17250601f0b84b8aefb2548a5e675
 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 508dfec6b962..570aeab5fee2 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/exiftool/Manifest b/media-libs/exiftool/Manifest
index 3f61ca8b1ae0..f31a06fc4b42 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,9 @@
 DIST Image-ExifTool-10.95.tar.gz 4393497 BLAKE2B 34591d8626366f41d316c18e7453b6d2b222820c19e3b6693ab0f2065c52a9e5121f1d9831baaeb09f67d96bbaa2ed3737651c4feaf43acf3a9132eaa92da7ec SHA512 925557772f6b9588f946e7889904166e66c4c1b40da499822908d99f5211e1cffc1e911d468226d7052fef1e9f61e8069fa86e2ab4fa49fbc6a31d3d82c5c308
 DIST Image-ExifTool-10.99.tar.gz 4400996 BLAKE2B eec9774493347d11c4d1ba00b167cb6f6ae10a3e0abf7139c5a8117a45a358831db6cd7e36d371eeda16c0a99aba621923c199c9b1512038cac1ab354490781a SHA512 d1f5347453ff8c3e724bd642ca8ac880e0d338d06dc25fa58674e3990c4e35752078c7ab7b8e05849420debf8eb3b770ec2100e6a975bb43abb3d57229c839ba
 DIST Image-ExifTool-11.02.tar.gz 4413241 BLAKE2B 8261c59374b51486fef11a14721b5180b7c3fa5df26257b828917ce304f74797e75aafc65684b06fcdda0331c2ae44189adb1d23d8fab20af000d059cbfe8ee1 SHA512 bc4599dcf855d8154c008e749a2cff71644a26f41a9d33972f95950a1e77b00ba47d5c33590b36f9d7e9cf08f6319a6339a83f3478e2f05598f97cb6519d58da
+DIST Image-ExifTool-11.03.tar.gz 4414017 BLAKE2B 3f5abe1b6c5c43d216aa7d1774516d924cc3c325f5341153abeb51a197b3d5e2232b13ca788251a5b202aafc8a098cb4818ea2fc75ccf6830e2aab5095af18b1 SHA512 00cefe64248915fbabf2f8f5dad9b6e577455ee67b08dea59aad4551b1b0f6c876558b75cea7a0aa33ab0e29fa7c224acd88058f09f211220bc3524f39d1c0ca
 EBUILD exiftool-10.95.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
 EBUILD exiftool-10.99.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 EBUILD exiftool-11.02.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
+EBUILD exiftool-11.03.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.03.ebuild b/media-libs/exiftool/exiftool-11.03.ebuild
new file mode 100644
index 000000000000..ec856d3619aa
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.03.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index ffd8baf7ec24..59daf5b7d7cf 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,12 +1,3 @@
-AUX gexiv2-0.10.3-exiv-0.26.patch 1487 BLAKE2B 75237a5f19a64ac044310ccf4eb3c55dfc9215aa81598f580ecd85762521079bbf354b907a2fd8069f720b043f9e58001b78f26b951d5f7f58cbb319adf36e48 SHA512 2c36f1a805ffd789672dd1dfe0c6404e7c38ac7935c6cb62819fe8d58c0eb536c92ea1430948e91c746e803ef3d57868f17b83918d2b1d9667886292e42d0257
-AUX gexiv2-0.10.5-stdexcept.patch 461 BLAKE2B 8e46f805285bc979712be4f97012cc71c68fa365f51a9410233d5fcae413468def2fc85197a0c9e9da1369be5428923e4d66f898064a7953cf64d9895daa7a5e SHA512 fa88869142b5efe87980109ac21d3e23c279d4f1dbf4a32921c20350868c2d95301e3b9c52924232ff1a6d8c2e11701a0f8a83dcdd991b6dec2be53995e592bb
-DIST gexiv2-0.10.3.tar.xz 244816 BLAKE2B 79177a679c0d10c90a266c023930e27318f2e784e599b8f84a7356534045695e4ca44890b87eb0da4c16673e6e58c3ad77c80e404df2e76662f5a9250fc58e85 SHA512 a258a95e3e9dddc6636430d8a2bc222b6605e5d0d122ea1b951f97568cecd04b2d3cbc522625918faf3b5a3e670b01db81a45c2c5c5d65e6eb4b4f4a2ac69e8f
-DIST gexiv2-0.10.5.tar.xz 591752 BLAKE2B 2fe5beaec7a6c2c9c55e8669c1cd8077cb5636f9b188b1ae64212582a23b514ece68108dbd3d4369417af6901579a28b69beb1a44013b51a3517f7fcf4f3e409 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06
-DIST gexiv2-0.10.6.tar.xz 629872 BLAKE2B 9a0f0b98eb1f19d4642cd0fb692b8ec539d3aa98f5c47f04317466877c404955d86c7fb4b2399fee30191555340fbc7701e19132d707f57d123cb16771507570 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.3-r1.ebuild 1309 BLAKE2B e84c8556178cc05c47eebd511139abd9d1d23528e6072f24835ec80cd3c97d63f3ace18c9330601951ecad3abdf4443b3500631fb0ff527dd663073d33c23279 SHA512 e8a61d7206413874b4fb83bf96ed2459440e3c4718d21bda407d65d71f89201851ec60feeb7bb5c58cd9dbc5c11c9f4ef8c47fbb2714ac71a7577a4f5d7dca3d
-EBUILD gexiv2-0.10.3.ebuild 1270 BLAKE2B dc6f81c5599f6bbf9f51a632c37e141227527b20b1d0274911242b40867c65329e9ca4d513589e08dbdf596b5efce125784c408db2ea0fac1cc138b59284f3a5 SHA512 85dfd941c7ef4413ab277489e2e05eb9d5b55aba4a61fa56546200517fe7a4bf3e4f3ed66e9475d8137e9bcbef95c318b4e77044b201ab9f6504c25479162e18
-EBUILD gexiv2-0.10.5-r1.ebuild 1395 BLAKE2B 0cdfba0d2a67f586aac986c5aabbe66375868004c476ab700053e94f2cda1602974501645d360e0755168a3dc3a14a9b66aeac32dec343721e20a6fb33bd5200 SHA512 d4eaf6dad6c7ae160c0cff8b10a8c34dca7f88538ce70671e7cbd936b81a5139acf30703f515ca47280f00b8cecfd920866f57992c4ae7af2edd35697a80ede6
-EBUILD gexiv2-0.10.6.ebuild 1333 BLAKE2B cd2474b63ecbab4fc5ca47e836e3afbd82d85023cb0d3744967b269f05a4316c39cf59dd6774989d7532ee67cc6a0a7eecac2be55a4c9e8e0351796289670118 SHA512 377878817bf52c642b012af0f15433866eebb0c06974b26c23faa1865ea26beb7ac647181b1a6e4b98fefe0a5ed1efa9acd879bb9e90d46641d05681c636ca6f
-EBUILD gexiv2-0.10.8.ebuild 1511 BLAKE2B 65b967c889607b27f6955e2fcdb329051c2de80849c3bea67e1fc94be216914455a39f0c168e24dd6d1b8d62dd4c825ab882d3457a168247561259438e9662e2 SHA512 716b016bb29d60f7f3d80249ffa52003fa93eddab0b92f5f7c5fbf51b2b2d943da5d3981b3dbdc2bc82a0369fbba5f101195c6f695702ee51ee9af23cb32165d
+EBUILD gexiv2-0.10.8.ebuild 1515 BLAKE2B 3387879c3645d2a3d12197967e4c922a192671f36e7508c52dbc35f01c774569558c99c0cfbc7da17f07f86271a88df06a78a0e7f0813c64f62c8e2a19cdd6da SHA512 0ebde8bc70841feaccbd151336884d4d2a7f77a0246829973d8450b8383f5a1aa01b2307c150effc75d8bbdcfa0a6a1fe78682a9de629c6d89c0718f31a9a419
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch b/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
deleted file mode 100644
index c3fd932e2a21..000000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.3-exiv-0.26.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Fri, 12 May 2017 19:50:58 +0200
-Subject: iostream: Adapt to new Exiv2 API in 0.26
-
-https://bugzilla.gnome.org/show_bug.cgi?id=782449
----
- gexiv2/gexiv2-stream-io.cpp | 4 ++--
- gexiv2/gexiv2-stream-io.h   | 8 +++++++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
-index 0ae3324..abfb843 100644
---- a/gexiv2/gexiv2-stream-io.cpp
-+++ b/gexiv2/gexiv2-stream-io.cpp
-@@ -142,7 +142,7 @@ long StreamIo::tell () const {
-     return cb->Position (cb->handle);
- }
- 
--long StreamIo::size () const {
-+StreamIo::size_type StreamIo::size () const {
-     return cb->Length (cb->handle);
- }
- 
-diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
-index 76621a9..a26f4e6 100644
---- a/gexiv2/gexiv2-stream-io.h
-+++ b/gexiv2/gexiv2-stream-io.h
-@@ -25,6 +25,12 @@ public:
- 
- 	StreamIo (ManagedStreamCallbacks* cb);
- 
-+#if EXIV2_TEST_VERSION(0,26,0)
-+    typedef size_t size_type;
-+#else
-+    typedef long size_type;
-+#endif
-+
- 	virtual ~StreamIo ();
- 	virtual int open ();
- 	virtual int close ();
-@@ -39,7 +45,7 @@ public:
- 	virtual Exiv2::byte* mmap (bool isWriteable = false);
- 	virtual int munmap ();
- 	virtual long tell () const;
--	virtual long size () const;
-+	virtual size_type size () const;
- 	virtual bool isopen () const;
- 	virtual int error () const;
- 	virtual bool eof () const;
--- 
-cgit v0.12
-
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch b/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch
deleted file mode 100644
index dc9c5825b90e..000000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.5-stdexcept.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp
---- gexiv2-0.10.5/gexiv2/gexiv2-metadata-gps.cpp	2017-03-19 18:00:55.000000000 +0100
-+++ gexiv2-0.10.5b/gexiv2/gexiv2-metadata-gps.cpp	2017-03-26 09:45:44.638692802 +0200
-@@ -12,6 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <cmath>
-+#include <stdexcept>
- #include <stdio.h>
- #include <glib-object.h>
- #include <exiv2/exif.hpp>
diff --git a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
deleted file mode 100644
index 59f6c592a3c2..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="introspection python static-libs"
-
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.1:2
-	>=media-gfx/exiv2-0.21:0=
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	epatch "${FILESDIR}/${P}-exiv-0.26.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install
-	dodoc AUTHORS NEWS README THANKS
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-
-	use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
deleted file mode 100644
index 5c8ce7cbeaf7..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="introspection python static-libs"
-
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.1:2
-	>=media-gfx/exiv2-0.21:0=
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	epatch "${FILESDIR}/${P}-exiv-0.26.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install
-	dodoc AUTHORS NEWS README THANKS
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-
-	use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
deleted file mode 100644
index 7c8bc4142efc..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="introspection python static-libs test"
-
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.1:2
-	>=media-gfx/exiv2-0.21:0=
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.5-stdexcept.patch
-	"${FILESDIR}"/${PN}-0.10.3-exiv-0.26.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install
-	dodoc AUTHORS NEWS README THANKS
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-
-	use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.6.ebuild b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
deleted file mode 100644
index e1130127c854..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="introspection python static-libs test"
-
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.1:2
-	>=media-gfx/exiv2-0.21:0=
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install
-	dodoc AUTHORS NEWS README THANKS
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-
-	use static-libs || prune_libtool_files --modules
-}
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index e3a432736fe8..8ad241f540c4 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit autotools eutils multilib python-r1 toolchain-funcs versionator vala xdg-utils
 
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index fb98499bfe83..5792b89310c4 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,7 +4,7 @@ DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d6981959204
 DIST harfbuzz-1.8.0.tar.bz2 3793974 BLAKE2B d6f6a58e1fe2778f5007e73abc90ccd5bed3b170f27ef1a656fcad824a410b2f4d7f560ce01e5dc87ad97dea0bc926c7d49f2c9e87fec5b7c84cac6be4373afc SHA512 90cccdaa45bbd7b5a75c9600d49e15dea820f0db4f9e4eda2c451092000281657a2ecb281b574d339e84e72842e978f5cbf505845fa573e6b76382192d8dd4fb
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
 EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
-EBUILD harfbuzz-1.7.6.ebuild 3253 BLAKE2B a8d306d52e456084d25a4d9a3657475754014074018a5dcf88ac9a6a0f0c01a10b1bcf8b4f5355066e3fbb7e966c951b241f779d83a6429d2f1e6413bce03af6 SHA512 dfb10b099ba0490c2ac8f3a67d1366bb53f9212a256ee3d804b5fd6041173f0cee04f4118de9b27a82be056b53fa46c472b898a92ac480565b5e07c616a5c2a0
+EBUILD harfbuzz-1.7.6.ebuild 3252 BLAKE2B e9d0be30511ff76b2423c84a97488fae78af56b346ab3b650bc24e392513dd8748b0f9fc59032d24529b96020fc83463e2a38c66bb9d2f49c8979322fcac3d48 SHA512 ab4b7ccb76e49f3bccc5ed61a8282db84d03f7b70b75963fb01b5a2613ff4ea568379464b89ae4357edd6d6eb057088cc5424d59ae20b6f0c4a4bd6ba665d0a3
 EBUILD harfbuzz-1.8.0.ebuild 3215 BLAKE2B e3e8dd964ff7dd7cddd8f493be4f5d4a816e90c6ff64994e3f0cf77446c5cd3f85f97cde0cc8fe198f72574f8589e70d1123997afb0220ec50df4e78d8ea3f88 SHA512 2476547f182aa0138ec49cc61fd5af2dc06b9980a335f7a93c9698fa63b9e0e29765d774098f3a17ee6b9669a6de3cfef0de9ca359c0ea89028bcae3e431d191
 EBUILD harfbuzz-1.8.1.ebuild 3215 BLAKE2B e3e8dd964ff7dd7cddd8f493be4f5d4a816e90c6ff64994e3f0cf77446c5cd3f85f97cde0cc8fe198f72574f8589e70d1123997afb0220ec50df4e78d8ea3f88 SHA512 2476547f182aa0138ec49cc61fd5af2dc06b9980a335f7a93c9698fa63b9e0e29765d774098f3a17ee6b9669a6de3cfef0de9ca359c0ea89028bcae3e431d191
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 1abc3458ddfd..be5068b82b03 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 bade603dac8e..9be588ee3130 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -3,5 +3,5 @@ DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538a
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 EBUILD imlib2-1.4.10.ebuild 2005 BLAKE2B b0792ae68d5ac1c4d0a17415d4614bfa35b7ea8e4293b55399abc897dbd98f04375efc2e60d349e968ddfd8757614689d2b6dd0b4d8ce18c6e7c882b0d26cdc4 SHA512 fcb939157b9e7d840c00af3700f2e119875bcfbeef2b48bc72aea6a835c66936c747de350894702abc8159c9925b7e6ec4f1c27eb2be773abff3fca396875801
 EBUILD imlib2-1.4.9.ebuild 1988 BLAKE2B 17390f940f2381e276754f332fa6d68e69dd2e34f5edf950c04dbeb62f4e2fec806a7756765f60334b8ee2cb0e7dd4584fb2c46ba533a47cd9e107eb6027669e SHA512 8b2310e639ce77034448dc4d917d5ab67b75c1dc835370f5975ef82e973099bcdef538612ca7ff4a1f32a83c49cd440d24c721a27de4c961ac3fdc60c4fbb92e
-EBUILD imlib2-1.5.1.ebuild 1974 BLAKE2B 367e928e0313cdc8a8bc37b97bea39df14a15d804a35d88093f7d425eda046cb2179aad3454aa60366582581ac7939cadc6730042e9bba33a85254146980be17 SHA512 b5f071c82cd25346960681282c57ef351a56b4b061b58147db19c6b2fb36a49e989ee4c1809f65f039b327ae85047db7b077d2418cf87cd70414722b5e3241dd
-MISC metadata.xml 2278 BLAKE2B 7461b5d38509f5908d239712947f2f9d3ba91d5dcac79cb82f78ba74c0f8b51b54740cf734b0cf70acaf450f22b8c926ef5661631ac99269f3037d00ace553f8 SHA512 c9ac86bfc0e1cc55096dfb4f99321fa5c5efec65c7beb6d14955b7359ec362f8f41b15adf5e511ed88c1080bd568b59bad2c258fa98d6b89ba5a9dcbcf5b6c67
+EBUILD imlib2-1.5.1.ebuild 1970 BLAKE2B b5c5a1af294553ee3d429d9e721acf2e8a2bda3ee58f701afd67ef89b1445dbe63f805f4f62ddef22a61f8589839e2b3a050e5776afa47bf0640e5516c8db0ab SHA512 c6276f78f4213e08db21b6e2a5b1c3b2187a3997e106e5d36de064e0db11c8867ab28c98a4c1fbbbef8094d44b3738db60458966cd0981d4f42c101efd2bad7f
+MISC metadata.xml 2445 BLAKE2B 58a14b7c6eeb627113a5a2a4e72c3937b4b74b3ac6e363d8e0f735f25775178ac2aa5bae2ccc6881bc291d220268fc7db85cd33c0ec796ada823c7812c40d10a SHA512 7a6940cd007784b50b010af8d01992ba56bb756f6433e26ae4962ccdfe25efc41ca1b020b7d88f15cb784ba2d8cb39caffd89b727db7b7f7149ecb137dcaae6d
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
index 265a9b8a0a46..9d59947b4b61 100644
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 gif jpeg mp3 nls png static-libs tiff X zlib"
 
 RDEPEND="
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index b1209376c6fe..1a0d4be94cfd 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+  	<email>juippis@gmail.com</email>
+</maintainer>
+<maintainer type="project">
+  	<email>proxy-maint@gentoo.org</email>
+  	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 Imlib 2 is the successor to Imlib. It is not just a newer version - it is a 
 completely new library. Imlib2 can be installed alongside Imlib 1.x without any 
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 9bf0215caa10..a8aaac35ef78 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -2,6 +2,6 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.13-patchset.tar.bz2 8452 BLAKE2B 473a338b460c8a66991fb50e110f4386944c8d1ea557318bf8c249e3ed64d290ace9112ad713f92bb4c933fd187eae7ec9f2358ca904a1e41e003f9f9e8682e5 SHA512 024cb2a9c12f4c1f603b3379bfc0e190006accd484cea124c41d6663e3d094724f53bcf881650edcef80fc86f004e69423bdcaf60a3962e392685bae88375b9d
 DIST jbig2dec-0.13.tar.gz 442571 BLAKE2B 6a973f91502d8effc00cd49b68bb2f853edd41286fdc5cb159460607db8627c2c959ba1c96e65b2ef1df3d4072c9993ce66c06bc5dc1837c89f87c6da0025550 SHA512 ef64a65c54bec65f61602de7130dc9594aae58aaea7958f7cc987f25d0794511e15a423e86501ace4f40c0364796fb97ceab72edb0b69232926767ba16c1b05d
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
-EBUILD jbig2dec-0.13-r4.ebuild 1474 BLAKE2B 039e0dcbac0c99f264fec727ee4bd8bc0584a7549197c88f73e7ae96785b0575c5070fb414f07cb9453430536e7d748328a9f605d961c0e9220f6583ae539a5c SHA512 4346fb82be7f8f0ca586c2d7da51e61b726d263321eb295e9d66234e0f4e690ed3a0870c7ae145f9f902db90fa43b2a5cb38eb29b6f4dee03272cae342b864b5
+EBUILD jbig2dec-0.13-r4.ebuild 1473 BLAKE2B acad9053091c1be3d6b7c72ed249cdbb90a92f2c532c250ae863deff76c5142d67d27ab77b6e05b42b74087d223e861b9d71278ccd007931d588c1bc3802b315 SHA512 035196ce25a11ac4c73ee2f8cf2dadd2c1d869d9f5625cbd894f50807af7cb85438b4b7783f775655059ef108d367fc084c1123aabc674d275216831c15fce47
 EBUILD jbig2dec-0.14.ebuild 1149 BLAKE2B bae8910b3fa05fd25146e1027ef9cabb9560f8b7114ac563f5ef5f0e5309888571a1ec4246b4eda40740ef3d1a332f99d2958e8474910c22dce5ac135c385538 SHA512 04a834292637546648e94efaddc001512b7a67f5d001d17beb22bda8723f1c72f882261c9cc98dd981e68655c427f802bf9fa96d6e8d6e11f9793d97cd643090
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild b/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild
index c982b854cbcf..3c40f7129505 100644
--- a/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
 
 LICENSE="AGPL-3"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 731a95d97f32..6f5f01c5fc15 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1,10 @@
 AUX libdirpc.patch 1877 BLAKE2B e8df5b7b5a662d68d3386e348964b17b15bfed49b8cafed55b9893878ead75e00a1ceac92e63f5dc446b03faf09af26e732c508c83e851a7e3664471c8dd8521 SHA512 ead273addda6b39b6f10b7636465cf313b1dfeb344457227acb1d8c03bdab8f78ba0e44ec90b1044359ae445e1e1ce1a87a06df91c86a406b6fd4ce41713df0a
+AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib.patch 561 BLAKE2B 7d1a68f9c8a9f250aee9ca44a2cb787a802195708f0dc156d22073f21f83772167c5c57d953551a55385edb13ea8c5e8c28cd1379814175ff915d03ad8bf2860 SHA512 7a7060aa7a7062d85ba9ec3e0bdacdd552c5f2b7ee5c326da1d0d4a48b28693651703deccddcbc31b6e3190fcc6ac6e665bf09621b0ad278638d0812f557be85
+AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-0_pre20180421.tar.xz 1927112 BLAKE2B 3e70917e58ea4871c640f9df1da17f50dd7b1b1c41b99a2411bc68f11ae4acd76f358d1aaab17ba240dfa104fca1d5ebea057a0ba5666741658943dad10601ef SHA512 169872495a210192ae4f97d4d630b00d2219aa085999d9d90136274ec2dcf60d5001c91b5d920ee5b14b76cf02a9a067a3bf57a152bee9e9bc5a524c9205642b
+DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
 EBUILD libaom-0_pre20180421.ebuild 2205 BLAKE2B 9cf6720694c443ec5d20bc7df86a7a6abb4a91fe53e90678e07b2634537167a21e645f8c4f6722e093ff26d84ee83b18aaacb959d9a13bea3b6b4136cb3637d0 SHA512 5c9a0143b6b88adb7753285ff9169def2ee2bd9ff5dadb367f110da152d06b34eb188e8b76b0227cba40da29124fd8a7400ed0c68a551e5b58b5f754ac2d32fb
-EBUILD libaom-9999.ebuild 2188 BLAKE2B b399fbf9b68eb2bdb8dc9b5b2327dd842a1c628e4b7b1746a57387e2b5c135cfa24b2ad18a5ed2075038a47a7448639261f78caa401f1438f67cfd8e5973b929 SHA512 6c356b937b184eaeb558475961c7d9dd0e0e37f78a28ef18b2658bed4a084b7e354f3ec5a164c432a54ceca6d0e997b9667a5c90820d55eb6ab69d94423f152a
+EBUILD libaom-1.0.0.ebuild 2327 BLAKE2B 96fb2a1b53847b34059f8afcac3ce84a3092ff8082201ea08d42cc48849a7533f8a9f76270a76446395ad42f382cfe4b07955c95bcd1705e3459e6cd277c2922 SHA512 7e1cf492f664ff77f797ce9464e62aa33a650e47d62193056cc64a81e1fc3b158bc3dcf2f05b1c58f688fd3fa5536cb040887b4e88cbc6719f0c1e3d676e6188
+EBUILD libaom-9999.ebuild 2327 BLAKE2B 96fb2a1b53847b34059f8afcac3ce84a3092ff8082201ea08d42cc48849a7533f8a9f76270a76446395ad42f382cfe4b07955c95bcd1705e3459e6cd277c2922 SHA512 7e1cf492f664ff77f797ce9464e62aa33a650e47d62193056cc64a81e1fc3b158bc3dcf2f05b1c58f688fd3fa5536cb040887b4e88cbc6719f0c1e3d676e6188
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/files/libdirpc2.patch b/media-libs/libaom/files/libdirpc2.patch
new file mode 100644
index 000000000000..cbd1b901fb30
--- /dev/null
+++ b/media-libs/libaom/files/libdirpc2.patch
@@ -0,0 +1,48 @@
+Index: libaom-9999/CMakeLists.txt
+===================================================================
+--- libaom-9999.orig/CMakeLists.txt
++++ libaom-9999/CMakeLists.txt
+@@ -234,8 +234,9 @@ if(NOT MSVC)
+                              -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+                              -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
+                              -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
+-                             -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -P
+-                             "${AOM_ROOT}/build/cmake/pkg_config.cmake"
++                             -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H}
++                             -DLIB_SUFFIX=${LIB_SUFFIX}
++                             -P "${AOM_ROOT}/build/cmake/pkg_config.cmake"
+                      COMMENT "Writing aom.pc" VERBATIM)
+   add_dependencies(aom_pc aom_version)
+ endif()
+Index: libaom-9999/build/cmake/pkg_config.cmake
+===================================================================
+--- libaom-9999.orig/build/cmake/pkg_config.cmake
++++ libaom-9999/build/cmake/pkg_config.cmake
+@@ -34,12 +34,13 @@ endif()
+ 
+ # Write pkg-config info.
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
++set(libdir "lib${LIB_SUFFIX}")
+ set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
+ string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
+ file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
+ file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
+ file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n")
+-file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/lib\n")
++file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/${libdir}\n")
+ file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n")
+ file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")
+ file(APPEND "${pkgconfig_file}"
+@@ -49,10 +50,10 @@ file(APPEND "${pkgconfig_file}" "Require
+ file(APPEND "${pkgconfig_file}" "Conflicts:\n")
+ if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
+   file(APPEND "${pkgconfig_file}"
+-              "Libs: -L\${prefix}/lib -l${pkg_name} -lm -lpthread\n")
++              "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm -lpthread\n")
+   file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
+ else()
+-  file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
++  file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm\n")
+   file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n")
+ endif()
+ file(APPEND "${pkgconfig_file}" "Cflags: -I\${prefix}/include\n")
diff --git a/media-libs/libaom/files/pthread_lib2.patch b/media-libs/libaom/files/pthread_lib2.patch
new file mode 100644
index 000000000000..ec4b9107e996
--- /dev/null
+++ b/media-libs/libaom/files/pthread_lib2.patch
@@ -0,0 +1,14 @@
+Index: libaom-9999/CMakeLists.txt
+===================================================================
+--- libaom-9999.orig/CMakeLists.txt
++++ libaom-9999/CMakeLists.txt
+@@ -575,6 +575,9 @@
+   include("${AOM_ROOT}/build/cmake/exports.cmake")
+   setup_exports_target()
+   set_target_properties(aom PROPERTIES SOVERSION 0)
++  if(HAVE_PTHREAD_H AND CONFIG_MULTITHREAD)
++    target_link_libraries(aom ${AOM_LIB_LINK_TYPE} Threads::Threads)
++  endif()
+ endif()
+ 
+ # Handle user supplied compile and link flags last to ensure they're obeyed.
diff --git a/media-libs/libaom/libaom-1.0.0.ebuild b/media-libs/libaom/libaom-1.0.0.ebuild
new file mode 100644
index 000000000000..7b41eb397c28
--- /dev/null
+++ b/media-libs/libaom/libaom-1.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	if [[ ${PV} == *pre* ]]; then
+		SRC_URI="mirror://gentoo/${P}.tar.xz"
+		S="${WORKDIR}/${PN}"
+	else
+		SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}"
+	fi
+	KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/0"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+PATCHES=( "${FILESDIR}/libdirpc2.patch" "${FILESDIR}/pthread_lib2.patch" )
+
+src_prepare() {
+	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+	rm aom.pc # ensure it is rebuilt with proper libdir
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc docs/html/*
+	fi
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 68a8ddfdb1a0..7b41eb397c28 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -7,10 +7,15 @@ inherit cmake-multilib
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-elif [[ ${PV} == *pre* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}"
+else
+	if [[ ${PV} == *pre* ]]; then
+		SRC_URI="mirror://gentoo/${P}.tar.xz"
+		S="${WORKDIR}/${PN}"
+	else
+		SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}"
+	fi
+	KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
@@ -36,7 +41,7 @@ REQUIRED_USE="
 	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 "
 
-PATCHES=( "${FILESDIR}/libdirpc.patch" "${FILESDIR}/pthread_lib.patch" )
+PATCHES=( "${FILESDIR}/libdirpc2.patch" "${FILESDIR}/pthread_lib2.patch" )
 
 src_prepare() {
 	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 032676b09246..2df256ea8b3f 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -5,6 +5,6 @@ DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484
 EBUILD libbluray-0.9.3.ebuild 2186 BLAKE2B 811d0c37422c0a9425084573f25c19be5a272a88654a227338029de63b4217a6ffe644cd88e45410fd66cd810d1931130e973ce839e8721ab3214710890ec1db SHA512 e2fa9e014338231de6f2811439f88bc861a8765eac08e25121c3200307d01dd478a537b368dd4b9a28966d4f3b2fe73f2d451369dacde8ef441400c0add68629
 EBUILD libbluray-1.0.0.ebuild 2194 BLAKE2B 16b08e28b74eb2d8635092ab2a02d2225d8d69b0b100346170abef947f2a56cb3a3aba7e8a52307c0781e11b74b35ec13b11e15bf2b2e78f46c3481e7ce57976 SHA512 33d28c33eb451f6360426efcde049a9250bcc8ed63e35132f37517bc1630e9c95d189b40fc69ae642e5444ed19bd9a19f4521a92bdaa2640c62fbad8c0060952
 EBUILD libbluray-1.0.1.ebuild 2202 BLAKE2B 486111965f4623e1f9b894f4533276c3e626a1152cbfb4ca0417bab5c4fc11489a7e564b6724123312bb7759e711db945cdbd4f508a0bef77df94ab65ea60353 SHA512 d6666bcc3db0d2c0407b364eccfda76710da9fb66710e93bb71707e4a5ea5941b7bcca4d06a1afa4273d20e1224496f8b60f2106f35ccfe6121efd25d1aae896
-EBUILD libbluray-1.0.2.ebuild 2219 BLAKE2B 61ae1ff3e3cb928616fc61eea6e27014242ce6bb07e4ff813b789ff2db7287c063b9d205af28c72dda594042fcc3ec7d59d9cac61178b0b79826000a39cb34f4 SHA512 8090244f0be463dc1c6627d30787eabc1c4e94b5235988ce62e5d16bdd05d81f656496647cb185d988373edba2477fb80fdc2874e1830cfcc1c765cc258d939d
+EBUILD libbluray-1.0.2.ebuild 2217 BLAKE2B 3296a880c09aca896d4631be7b2ed7de24720bcfbacf59234ef4f316ec939be4ae59ca881598428438ff35d3bd7efdbb1654583eb62224ec08cb2162ed46a7f4 SHA512 64e47c04e42f184a805572dd3dd6a3330c1e38ae3f53b70dda722c2c117e8cc9991287b598c0473f6454cfdc986e419b69468d111ed6c3eb3a12b13219a8df9d
 EBUILD libbluray-9999.ebuild 2201 BLAKE2B 161cdc3be5991a0462a1d4fd90d361032d44e8d6c21ab4166e2db49698803b7a561a1e5f78c5dbcd95708658b46e33a968c78d0f4466387833eeb02afdde8451 SHA512 a3d54041b72299fa25da8c4ec957f77aff6f8b4f1c0be1d775172fdbf6162bcd51c36275e16b71951f1e6f267bd12bc799a99b87f97a723b74aad7522da7b81a
 MISC metadata.xml 606 BLAKE2B f492e640b388b4aadaad89a5e282f3c09044baee74d8698b57c554d0cef6c99ebb64c13aaefbc0d4e2dabd3d5d4c0942465ed4ed2d4d439734f6c9ad55307ade SHA512 649b1a57ebffc011f011a0adc13b3d9a04a43f74dd9e24e4a233de59cd7fa0408ab14b67db21618e1c3e7cd7d78300b181dd22f4110ced4cf4ca12ce0c4951bb
diff --git a/media-libs/libbluray/libbluray-1.0.2.ebuild b/media-libs/libbluray/libbluray-1.0.2.ebuild
index 6fa860eb5b28..0704851b93fc 100644
--- a/media-libs/libbluray/libbluray-1.0.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.0.2.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git"
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 6729ac41a629..fd437736d7fe 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -3,5 +3,5 @@ AUX libcaca-0.99_beta18-latex_hacks.patch 641 BLAKE2B ecaaed51bf3d8c7f75641da665
 DIST libcaca-0.99.beta18.tar.gz 1168552 BLAKE2B 6becacc8b6ae7f8b90eaadf9fe9682f3b35e986c8319907f6336e0b118adc7abc813f95c2ee6a6eac954dc3d8eb304389652489ba881e9004d1f7bfb79aba4cb SHA512 b2a8264ec36b74a01ff415a1fd7cb1806c76e28795b73607d4f8fa5ed5cc776b215f2817f45f06c672688f010622ee5c5e2f9dc4d0c43417dedbff545d575ca5
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
 EBUILD libcaca-0.99_beta18-r2.ebuild 3770 BLAKE2B 35e84791a49b95a5f1a07ad32c41ae83f934fe5063a7ef06cefd9b435b6c8713263b82aa9ce3312a6a389defdaa4a997db35df18d362cf580625db1baecbb842 SHA512 0146860a8f47f143c45f9f73d6dfd626be0be71e2a9264eac115e22a29605a4ad10fbbee38a610a75920f0228e8102ecdf0fd209b87c80c398a0f5f5a6925a89
-EBUILD libcaca-0.99_beta19.ebuild 4107 BLAKE2B 72524364d69e217cb82f2c4650c0a31380f1a1b465e948c7d8940f16edc04a5a864917bac9a92d1456014b6cd9be6b5523c193bccf99da623a5947e9af3c5834 SHA512 ed8fb1b5245eba23f0c1ea78bde867a3f1da2b077d1aa78bfff480519740e9674e4557c4f4c2cb448afb8165ee273930aac0b167847627d9c467cda02fe42070
+EBUILD libcaca-0.99_beta19.ebuild 4112 BLAKE2B 47ab2bca1e149e452c8dc775b91fe3c041827ff66fd41b3cf9ba9806b5dad490c247d568be9719f84c7a9dec0cbf51bafef25d098d8b354b560b9d5177c8814a SHA512 d498c32321fb268b4548b9da0cfdd2fba107d9005789a307d23644c51b60d97c9c04d820ffa3f04ea9dacd85145a7178a4c61f6fa55f3a32841cfbd48eeaad5f
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index b099168ad927..c57546e7c401 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.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
@@ -15,7 +15,7 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index 70311596f923..9e98e336dedc 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,4 @@
-DIST libdvdnav-5.0.3.tar.bz2 372203 BLAKE2B 82b935157cb59c14c0dc2ce043027dca43d181b1dc24435a4876310b4edb9961da96b202c6e99b6531fce22aa05dda2352cdbcfa42ab47051e533ca3fd458158 SHA512 d6d0519f654649bd65b3029224191e7d6acc893d94e8578e435d77b75327584e9f44410a062c1fc60c6211f5bea6b3971228d84de595808733ab7356980e0123
 DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4
-EBUILD libdvdnav-5.0.3.ebuild 956 BLAKE2B d4fd80a6a3aa0116e136f516439fa6b80cfb68cbfacc5d7d04413998e31fc143f83654f29dd9d8348136086b900f0c231312a7675f93c077f4ab1732b5f09347 SHA512 bc29a20d9c78566bf4ffe0488be1996d76101cdf1736e93c13c8f6501f6e3dbf927003b2ff0b7c951af394126f3195bb997f4148d6581791a1c032e6ffb1dd28
 EBUILD libdvdnav-6.0.0.ebuild 1178 BLAKE2B af97a767a55b77e29ae0b8c3b69c12c5c55912476a17e432481e7924b2dde94ad054c19600d2dddb83b9c2a6d7ebe40ab1b828e2778df89ba5f86878df5cc6c8 SHA512 46ce672a6c05b784901c2e719b5a393ab4e6528bc16c4635d3bf0bce02f8261dab8d143f15982f4e59254e02629b939748795733cacb122f6433b56dfb937637
 EBUILD libdvdnav-9999.ebuild 1186 BLAKE2B 2f6ae269963f4ffe99400737fe9bf0b9abdb7ae2d162aeeaafbd2b9afc10feef07647f7059479956a6594e032e63b4ace45ad55cf0b1f215deb16ad0038d7b13 SHA512 5e86d911f940bce20f8e3e962c953116bc306d3fc020e845b104abeab1fd1017a9e6967d17ac5cc639bf2257ff01054ed0945e995e1683df006e06513cbd96d4
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
deleted file mode 100644
index b4625bee7aba..000000000000
--- a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
-
-DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO )
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 6694eb377ee9..316902d96c34 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,4 @@
-DIST libdvdread-5.0.3.tar.bz2 394885 BLAKE2B dc30548b8cdf30b9c114f4314fe0a2350b31e38321f662072e81492d126050eea8a601f12c03a8aa2c10c453f3ff84064fa4768cebe9395e4314cb2a29e872ca SHA512 1ca438f0b5c406549eec62e1abef1e8745b9f932bcd30a3194ee9e37995b269ec8f1652a24cc3d2cb11ddb964e4a47a06e5405f9402e616586ff6263a1af3fc2
 DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479
-EBUILD libdvdread-5.0.3.ebuild 879 BLAKE2B 0dcfb8a7057c5d4010b6a4bd618d4f3b8c036b6ddeb72a6f5a45bff44dc7c1fc1f9ba561d0c921abdf4b5bb363af101b70453a97e2dc7954e2295c6881d33e81 SHA512 a302f5c3f73aa6238b6ea2e1a8dd2dbef1d768ad08e3d35918ab45565780badaf6a0287ec5629695e6563c1ce44b297df2b077d25b517c7f85f91296ef1c2979
-EBUILD libdvdread-6.0.0.ebuild 1149 BLAKE2B 2f2ace80f2ec1ff6c8fcb167e3f350d9d2be0fce69fd25b01b8c0dcd27505021d0b5ac0525b7d0049bf67e4df11749ae7ed7b05d054884800c107d3106ed71d2 SHA512 8b70636a3de6a4720d46d9546beb663cd2074ec95a9dca6e64e438514b6b20a3abc9edc592d66495f98923c2ae48a4f56fcae2213bb16be8903cf3cc18926623
+EBUILD libdvdread-6.0.0.ebuild 1148 BLAKE2B ec06c3c7f0e6f7272473f6b2df07d6457e17135828e74252e16dd1c22bb13ef6bf0d1462a90174fcd24ca077e842af8233dc5548d21e0a4a1cee6f173ee6b2ed SHA512 b0ddbdab2d9f0d3515f6133e43847abc71b71bf4d9443dc8581336eb7766507105963d2c8bc1c00359626d46e39387ed75aa1688cfb60e5249535609d820c119
 EBUILD libdvdread-9999.ebuild 1156 BLAKE2B ffdc1f7a0f7fd5e2a8e17e64a18f7a6df2f93cb305b5851251ee2c494dec221dc8e50e8d6d69b8a8e7be56b042d7ba36496b7f7c05bed189256bc309d0b02008 SHA512 193e1c2ece5c75ff5e326ee789fe493a5e42ccb8f8afa311edef85196e6dd32506d1443489e6ae5b26edc86d135aa662de84bdb609fc8249b8a068bbd6a7729f
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-5.0.3.ebuild b/media-libs/libdvdread/libdvdread-5.0.3.ebuild
deleted file mode 100644
index 6834364ffda4..000000000000
--- a/media-libs/libdvdread/libdvdread-5.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="Library for DVD navigation tools"
-HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+css static-libs"
-
-RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS TODO README )
diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
index 570c1092de96..1ea628dfc223 100644
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index cf779ad5a061..3f665ac5585e 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -3,6 +3,9 @@ AUX libffado-2.4.0-crossbar-router-fix.patch 496 BLAKE2B 7a2b88344c319eb5c1da7a4
 AUX libffado-2.4.0-py3-pyqt5-fixes.patch 9119 BLAKE2B e1b4ead17535e573bfced949652fec2418b0236b4ab3146f45f6931b0d80f5c1af86f17247e931baf07d9efd3c3726e0d9a0cc42783fd9053464073bdc233577 SHA512 26f34e318040e3fb9066424538d4ad7dd41e49e93c5f89161cd460bce862d3e2a25e0a2ffb6c28beb1f91fdd00a146f7d33930242e52e5148a7d1a0fb0e1ff28
 AUX libffado-2.4.0-pyqt5-dbus-detection.patch 1503 BLAKE2B 448eb997454a72f9d55722462dbe696d293b271002acf205c73e5fb59690ab7ae622830e09ab05def50d73d3fa1bc62076ead695a7d79335b75a00d3a4f1ce73 SHA512 29a44a73786256e8aec380e4e68df9f6de3ceb1d7bf1d4f1565585418ab4167ac2d16b85958cc1acfa60906b384445bd82866d05d3c3f3bdc517ae424d83e559
 AUX libffado-2.4.0-rme-bigendian-fix.patch 1618 BLAKE2B db8969797d9f8bdf4aac9a1e8474ad7d84428ede18788746b885ed037dcc71798a348bc86335dd72083a3937ad00170f6bbe412666f3109395642186b0fb4e2c SHA512 0ecb20c21858df87f53c0033109a4b736e1a38dc8a2b0ed00660cd3b80f74ce7b4cb87438ac5a37e11f0d4650166b3519e163f442d27a7822a24f4485626d776
+AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
 DIST libffado-2.4.0.tgz 1228916 BLAKE2B 21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb SHA512 7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627
+DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
 EBUILD libffado-2.4.0.ebuild 3194 BLAKE2B 57fc39ce908391aa991a5dc87d90cc9d709320c65c32eec065fb236a8cc3b5cf6b713b3e97bba0d4de1f96bf9dffb7922b8b8b33d6c31fe3608cba9a00a0b82f SHA512 54574ea4a2baa8a18d4dff29972c96cf94401af1e76afb52271358a0d353e51e4aa589bf590534eaf289998c72e3ee36983a55b77cb3b9969fe480a570c290f3
+EBUILD libffado-2.4.1.ebuild 2805 BLAKE2B 8e7742c0eb46f970945cd9c95f6407a844ce5b59c6b61e28997eda0e1600ae95a34e248b60a87ffc5204d6ea95a5274c1c817daa9788c12a67512382b83475ca SHA512 008724139623e65f92d75cc6731ed1d38c1fb78c8e55dd84e96cea9c26096d4c37baa9d8241857745bc178ec63020a51c81975b4dabfe9fcd56436404887314a
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch b/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch
new file mode 100644
index 000000000000..e9cb0fb94f46
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch
@@ -0,0 +1,24 @@
+--- libffado-2.4.1-old/support/mixer-qt4/SConscript	2015-04-12 20:18:15.000000000 +0900
++++ libffado-2.4.1/support/mixer-qt4/SConscript	2018-06-26 19:59:19.015719710 +0900
+@@ -29,16 +29,12 @@
+ if env['BUILD_MIXER'] == 'true':
+     e = env.Clone()
+ 
+-    def findfiles( arg, dirname, names ):
+-        for name in names:
+-            if name.startswith("."):
+-                names.remove(name)
+-        for name in names:
+-            if '.pyc' not in name and '.in' not in name:
+-                arg.append( os.path.join( dirname, name ) )
+-
+     pythonfiles = [ 'ffado/config.py' ]
+-    os.path.walk( "ffado", findfiles, pythonfiles )
++    for root, dirs, files in os.walk( "ffado" ):
++        for name in files:
++            if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."):
++                continue
++            pythonfiles.append( os.path.join( root, name ) )
+ 
+     e.ScanReplace( "ffado/config.py.in" )
+     e.Depends( "ffado/config.py", "#/SConstruct" )
diff --git a/media-libs/libffado/libffado-2.4.1.ebuild b/media-libs/libffado/libffado-2.4.1.ebuild
new file mode 100644
index 000000000000..a9c3d2c6e170
--- /dev/null
+++ b/media-libs/libffado/libffado-2.4.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
+
+DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
+HOMEPAGE="http://www.ffado.org"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
+else
+	SRC_URI="http://www.ffado.org/files/${P}.tgz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="debug qt5 test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
+	dev-libs/dbus-c++
+	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/libiec61883[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	sys-libs/libavc1394[${MULTILIB_USEDEP}]
+	sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	qt5? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
+		x11-misc/xdg-utils
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!<media-sound/jack-audio-connection-kit-0.122.0:0
+	!<media-sound/jack-audio-connection-kit-1.9.9:2"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3-scons-fix.patch"
+)
+
+myescons() {
+	local myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		UDEVDIR="$(get_udevdir)/rules.d"
+		CUSTOM_ENV=true
+		DETECT_USERSPACE_ENV=false
+		DEBUG=$(usex debug)
+		PYPKGDIR="$(python_get_sitedir)"
+		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
+		# -fomit-frame-pointer is added also which can cripple debugging.
+		# we set flags from portage instead
+		ENABLE_OPTIMIZATIONS=false
+		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
+		# lower versions.
+		ENABLE_SETBUFFERSIZE_API_VER=force
+	)
+	if multilib_is_native_abi; then
+		myesconsargs+=(
+			BUILD_MIXER=$(usex qt5 true false)
+			BUILD_TESTS=$(usex test-programs)
+		)
+	else
+		myesconsargs+=(
+			BUILD_MIXER=false
+			BUILD_TESTS=false
+		)
+	fi
+	escons "${myesconsargs[@]}" "${@}"
+}
+
+src_prepare() {
+	default
+
+	# Always use Qt5
+	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
+
+	# Bugs #658052, #659226
+	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC CXX
+	myescons
+}
+
+multilib_src_install() {
+	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	python_fix_shebang "${D}"
+	python_optimize "${D}"
+
+	if use qt5; then
+		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
+		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
+	fi
+}
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 6f10ddd8695a..4cb78977278d 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -1,9 +1,4 @@
-AUX libshout-2.3.1-underlinking.patch 428 BLAKE2B 3d57e5338c4c0ef864d73f6efadf5095453867058af3edad7c9f904b8d24a52c2680e45bc2a28bf9582cf4f884a0865a6ee0dea48d27448cf2c307d5571f1ada SHA512 555d3b00f051f14b016825e3f76ddf23bf956624480179eb316cf47b4c7cde56dfcbea348bfb16903989033f84465444eea8b0757297fd7483690b75d2eaf27f
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
-DIST libshout-2.3.1.tar.gz 464229 BLAKE2B 6266e23d34f551e4d8afacc514a4e2e7bb12753d24e1c7cbef48899f832f353e7c13dc8c91a9618326dd5b65853d8ab466103954e058bab59068f6567a14cea5 SHA512 19c1421e654310ddbc25f343d205d921b7c3f1c9c97f028207deaf1a46150b7f6c8069d52b7a3c9ed72dda276b52237cf1208292fbfa09aa7d09f85072c46a7b
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
-EBUILD libshout-2.3.1-r1.ebuild 1087 BLAKE2B dc04384b8f5f61c90bd0daf6a60687311ad998a600bd83c5c36d16b5ba6554c1161cb4a57436e177e2620690be69f614299acffbc68de143a1c191bf14d71919 SHA512 1815449c2ee7342a8aa295fc8a3cf049b0f481cbab4393288545b18bd33439264c9550fcbaad584c6112d740fe947b05ecf346172b3d997b7209d1e14942f461
-EBUILD libshout-2.3.1.ebuild 837 BLAKE2B 06e49c76b036ebe4018cfb40df091f48cda71fe516a32a1517744e89e25c90eb177bfe90cc223255be102cf8cdf2405e8941624f62520b6ca19a4ea8e5ab6169 SHA512 f3ca40a99521c197a07dbcad9458b90243fd1ca36e45cd4c9487feee7115a6598eae6c778307dd22e8133b089c5cfdb47b3d237e9d6bf3f75cefc37d0e657913
-EBUILD libshout-2.4.1-r1.ebuild 1318 BLAKE2B 25522e7bcb883202c43066ea842347bd542fb401c0a7f2bd331bb33eaacea2bddceae05409732fd3764b3353359b1b3e1a46c6d26c92a36fb544bfa23f57f97b SHA512 22b9404502ebcffb61b3818a9fc29bed0b9baec50ad6c1de3a6b94f16c6e908b74294952b54000d62085ecbc6b03e2cbbf476beed09c541d383b23f8cca35b23
-EBUILD libshout-2.4.1.ebuild 1211 BLAKE2B f0fba59b7fe490e3d0caafccab41647ac37a26a427652cbc7a49a7156d0630165cdf3f01d735021a8f6ae606b26b87db1bdfa437815f001bf0d047954e5b4f59 SHA512 d107c34d50564aea4281cca3bab02e4977932c21f715d20e2e01ad839290ceb6546c55e469685eb3c0115693d2255779ed4e9cbc7d911ffd9b35173a6ecee158
+EBUILD libshout-2.4.1-r1.ebuild 1317 BLAKE2B 34e99363db05398190a065358d1fde860372deb4750c5d22d8f128d1fe5d257881faba01e42f3b3bbc1f4094e7ec7a6576776a63712d44987e1732eb3efc4618 SHA512 d3e14eaf24dc7bc450274cb106ba2c2720318d295db20f3a9305849e53f72cd9d4d371ae64a18bd74ec90c4b854ce1c6c831e147b5c086acb62e619fff04619a
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/files/libshout-2.3.1-underlinking.patch b/media-libs/libshout/files/libshout-2.3.1-underlinking.patch
deleted file mode 100644
index e9bb73678ae4..000000000000
--- a/media-libs/libshout/files/libshout-2.3.1-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/499458
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -26,7 +26,7 @@
- AM_CFLAGS = @XIPH_CFLAGS@
- 
- libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
--		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
-+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(SPEEX_LIBS)
- 
- INCLUDES = -I$(top_builddir)/include
- 
diff --git a/media-libs/libshout/libshout-2.3.1-r1.ebuild b/media-libs/libshout/libshout-2.3.1-r1.ebuild
deleted file mode 100644
index 0824142aa4a8..000000000000
--- a/media-libs/libshout/libshout-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="speex static-libs theora"
-
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
-		$(use_enable speex)
-}
-
-multilib_src_install_all() {
-	dodoc README examples/example.c
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}
diff --git a/media-libs/libshout/libshout-2.3.1.ebuild b/media-libs/libshout/libshout-2.3.1.ebuild
deleted file mode 100644
index 1e2118e24197..000000000000
--- a/media-libs/libshout/libshout-2.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="speex static-libs theora"
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis
-	speex? ( media-libs/speex )
-	theora? ( media-libs/libtheora )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
-		$(use_enable speex)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README examples/example.c
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}
diff --git a/media-libs/libshout/libshout-2.4.1-r1.ebuild b/media-libs/libshout/libshout-2.4.1-r1.ebuild
index 5d5ef8a159d5..fcfeae82d3a3 100644
--- a/media-libs/libshout/libshout-2.4.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libshout/libshout-2.4.1.ebuild b/media-libs/libshout/libshout-2.4.1.ebuild
deleted file mode 100644
index 05d218d13638..000000000000
--- a/media-libs/libshout/libshout-2.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="library for connecting and sending data to icecast servers"
-HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libressl speex static-libs theora"
-
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.1-underlinking.patch
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable theora) \
-		$(use_enable speex)
-}
-
-multilib_src_install_all() {
-	dodoc README examples/example.c
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	prune_libtool_files
-}
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index 984523f6be2a..3ac83f91764d 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,5 +1,5 @@
-DIST libsixel-1.7.2.tar.gz 4760634 BLAKE2B 0cf1de06a133a018e4bc5d6d5fbceb07e33e4246b826c28c2e1f3251a383a9fddc7255c1b8726c0f4d13b41bbd42e9188e3d442cc65c399004628f3d7a020dd4 SHA512 9716ec45ba29cab6603896f717a6b21111ebacb48744009c8c032d6fd8dbb8f7444f27bc9f5c6f419a771544582ce5828e6b1870ea2cc37d917030c4c88de091
 DIST libsixel-1.7.3.tar.gz 4766335 BLAKE2B 5e546d31f9d66f5121301abe009677d05fbc1444e8a25a1feb6f9fed646a4bc543492376302b663569e0ddca99b665d5c81d9d35aa07349935b727ad581fb517 SHA512 f7b6b9748389f140ce2f6cf0eeb74ab5063c21455c72013a7e066981439bb1ada7b3e9b68a7b3b57c49205271f32ffb8d6d002a4f2af45b1381dd015873b4e91
-EBUILD libsixel-1.7.2.ebuild 1035 BLAKE2B 282b309821c835889539208da70f675ad2317103a69da30cc5c8667ea120393fba920b1abcf36f84a280d04f2ae31f671e86b93f2965182470130d63313f82da SHA512 2c2ec68d5bc1d93f6bd24ace358d075aa0a54b7582c43edab1497aa06be90384395af718a663b6417c4176807982e9b7c50a32ff2cf01a650930775e66e07071
+DIST libsixel-1.8.1.tar.gz 4777791 BLAKE2B de96029990acc00e0c5fa81e6f892153000a93841b8e152ecc2ae3db0e7ca1dbe5063fdbf69f79f23c82095b253206c7bea0f638ed7536ebcf3d0d23a1137965 SHA512 af38b47aac443bfb443aa7b12041ecc1496722afbc861ad8572e90c34c7c1ed4ee04241d5d5f3abb7d8be945fac2a1f718494c4fbd023a6a7b9f6d912f90554c
 EBUILD libsixel-1.7.3.ebuild 1110 BLAKE2B 4ad85bd3aa3f0ef0811367bf4eb8ad40f677d4c0524d58a41628715bf2d075fb69e95ca7733156bbd3659b98d33f4c0ad3c14b610adbdf17d243d9cc61bfddc8 SHA512 08fe560db4fc76c1d2c70a0b7eacc3e48fffac3a4ef9ebf19e44c2735cc5473808b104792c07c80d7c60fc7c95eecabf7623a40d2fb2bbce96cf0caf830a108c
+EBUILD libsixel-1.8.1.ebuild 1035 BLAKE2B 38ef663569cf8809639588d1a1cc4943ac06f4ac12bbb6e156556df93ad266c47bee6d953f7df8c5aed158b47bd0ed012fea48914c33bf889336062f04bfb224 SHA512 8d0b96674b65d4890eb1eca590d08f10a15ec5dc1c72bced54c10a22f933ac5322a7a6219b7cda5616b46b80ddff61da39201dc47be3ec7ebf1d278befb15cd0
 MISC metadata.xml 306 BLAKE2B 9fb9f3186df0538ebf4d1ec03e7404f798f36c2763e048d4b4026156d75b0597e58a4412235e1d7c44b0fc9ea54665fdfcb248374818ab086e4741345469013d SHA512 5fe5ae6f4593b3c990ded3a3d96dc2149729b00bb0a0d13a936c68c61515a79efe90672a6f0b13023b1dbb3fb00e6698ca16751932bfc09af84fb5b4c5ef1dd1
diff --git a/media-libs/libsixel/libsixel-1.7.2.ebuild b/media-libs/libsixel/libsixel-1.8.1.ebuild
index 03c99251a911..12cd9a6cec32 100644
--- a/media-libs/libsixel/libsixel-1.7.2.ebuild
+++ b/media-libs/libsixel/libsixel-1.8.1.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,7 +7,7 @@ inherit bash-completion-r1
 
 DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
 HOMEPAGE="https://github.com/saitoha/libsixel"
-SRC_URI="https://github.com/saitoha/libsixel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/saitoha/libsixel/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0"
@@ -29,8 +29,8 @@ src_configure() {
 		$(use_with gtk gdk-pixbuf2) \
 		$(use_with jpeg) \
 		$(use_with png) \
-		--disable-python \
-		--with-bashcompletiondir=$(get_bashcompdir)
+		--with-bashcompletiondir=$(get_bashcompdir) \
+		--disable-python
 }
 
 src_test() {
diff --git a/media-libs/phonon-qt7/Manifest b/media-libs/phonon-qt7/Manifest
deleted file mode 100644
index e0109c369530..000000000000
--- a/media-libs/phonon-qt7/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch 941 BLAKE2B 7ef8a33b7901326e2ebe702ec86b0f1c2ebb6356e346d51821c6016c948837a49f868e77d20d92dda922c3ab729f246aeac4f371ae73c14057fe3ef2d0fe3a9b SHA512 fd8ed1410d5b74eb24ae1c78265d26684234b25578d1e2155619de75a587eef83a37c85d86de04b5437fddd6eba40358f307a70dedeff3b0ca693132c23e751e
-AUX phonon-qt7-0_pre20110424-darwin11.patch 1043 BLAKE2B f2777f8564ab86ad945fa2a1c16ba13d208c8f59c1d7cbf36596a1c1ddb387243f1dafb1a4f1dca92b358b98f339497177d3c8ed34a6e186a15b64d59997ffd3 SHA512 1d713b42ef8fa80d8ac40497287731b3f42cd7b6cf9a67e46ee579a69ce53243d89082b2e52742c49127ddd5df1991735a761d57bc1cfee84e3963b31c0d8232
-AUX phonon-qt7-noshow.patch 493 BLAKE2B eec9f9d4b642496b1d39f26e8b265f74d5349e357bb1f0ceb3bde15bcdf0c7d4d039a0d56c63e8d3340035b2bf37a899c5ef31da7cfe7c210a6cb3ddf63896fd SHA512 bf407a587ed5a280f5b0a0ce7035aaa9c453297fb66d1ee8b4a40c7be16419b7fc3f1f69ea9e4c7b5fa66ba3c683a165d2c70f85e7b941c7638cc75cdd8de5ed
-DIST phonon-qt7-0_pre20110424.tar.bz2 54610 BLAKE2B 1323e2ca8f34a4b278435df17a2e22c8f4b8ef38abc3dc9fdcc03733cbefcec66d7892a95adf63189317d4f3117a550b084a5573d6cc00ed9088af51beac7508 SHA512 9e694c2effdf2b044118e4afb101e098d479bfc4c97f8f8069dcadbaa44f4dc6371ad15c1487bb1786e1096cbc93b660c0edde87e61f6a9483fce5a7587df2b9
-EBUILD phonon-qt7-0_pre20110424.ebuild 977 BLAKE2B 862dc47c1373b1fe879869bdc8ae38da46cc250fe9905d38786abbc12c677b9318bad6bc4cae4a54e57be32565ee3f72fc13847962f07e8d02f286a13eebbe98 SHA512 a40483e369a27c782d4a9fb88d43bd71782c2d278635fcb05bfe064777a90d7f96b226aad5ec7fc9143482a2501595d73f61933fac14ec1eb836ec5f68b69c48
-MISC metadata.xml 357 BLAKE2B e7a00afa7a9ca1b7b935a0e5c9142fae12f4c8b65adea98bd7c6db4ce633d4f0585be573617d63dcf0d0f366a64dce3cc0085a5841d38635d47744280f09588f SHA512 e7b6fac10e6f156201caa5ccea95e1f8ab99db2c99127a12e710b50bd5cded5ae716ea2f153aa6325bff3f97b02ac22af40a270227f092d6ad064803bc93e3b7
diff --git a/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch b/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch
deleted file mode 100644
index ae222027b892..000000000000
--- a/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Revert commit:
-
-commit b22b86f6940d2605e78398eca4ae05c3ea44a92c
-Author: Ritt Konstantin <ritt.ks@gmail.com>
-Date:   Thu Jun 10 07:38:14 2010 +0400
-
-    fix build with -fno-rtti
-    
-    m_renderDrawWidget object inherits QWidget and can be safely static_cast-ed
-
-as it yields in:
-
-error: invalid static_cast from type ‘Phonon::QT7::IVideoRenderDrawWidget*’ to type ‘QWidget*’
-
-
-diff --git a/qt7/videowidget.mm b/qt7/videowidget.mm
-index 736dcdf..e471140 100644
---- a/qt7/videowidget.mm
-+++ b/qt7/videowidget.mm
-@@ -578,7 +578,7 @@ public:
-                 PhononAutoReleasePool pool;
-                 updateDrawFrameRect();
-                 if (m_renderDrawWidget)
--                    static_cast<QWidget *>(m_renderDrawWidget)->resize(size());
-+                    dynamic_cast<QWidget *>(m_renderDrawWidget)->resize(size());
-                 break; }
-             case QEvent::Paint:{
-                 PhononAutoReleasePool pool;
diff --git a/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-darwin11.patch b/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-darwin11.patch
deleted file mode 100644
index 6d1a5626a207..000000000000
--- a/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-darwin11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-disable AUGraphAddNode, it needs an AudioComponent iso Component
-need a definition for gnuOrtho2D
-
---- phonon-qt7/qt7/audionode.mm
-+++ phonon-qt7/qt7/audionode.mm
-@@ -69,9 +69,9 @@
- 
-     OSStatus err = noErr;
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
--    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
--        err = AUGraphAddNode(m_audioGraph->audioGraphRef(), &description, &m_auNode);
--    else
-+//    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
-+//        err = AUGraphAddNode(m_audioGraph->audioGraphRef(), &description, &m_auNode);
-+//    else
- #endif
-         err = AUGraphNewNode(m_audioGraph->audioGraphRef(), &description, 0, 0, &m_auNode);
-         
---- phonon-qt7/qt7/videowidget.mm
-+++ phonon-qt7/qt7/videowidget.mm
-@@ -35,6 +35,8 @@
- #import <AppKit/NSImage.h>
- #import <QTKit/QTMovieView.h>
- 
-+#import <OpenGL/glu.h>
-+
- /////////////////////////////////////////////////////////////////////////////////////////
- 
- #ifdef QT_MAC_USE_COCOA // Rendering to a QTMovieView can only be done in Cocoa
diff --git a/media-libs/phonon-qt7/files/phonon-qt7-noshow.patch b/media-libs/phonon-qt7/files/phonon-qt7-noshow.patch
deleted file mode 100644
index e05c2c4d9957..000000000000
--- a/media-libs/phonon-qt7/files/phonon-qt7-noshow.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ruN phonon-qt7.orig/CMakeLists.txt phonon-qt7/CMakeLists.txt
---- phonon-qt7.orig/CMakeLists.txt	2011-04-24 20:22:59.000000000 +0200
-+++ phonon-qt7/CMakeLists.txt	2011-04-24 20:42:15.000000000 +0200
-@@ -2,6 +2,8 @@
- 
- cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
- 
-+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-+
- find_package(Phonon REQUIRED)
- find_package(OpenGL REQUIRED)
- 
-@@ -17,4 +19,3 @@
-   add_subdirectory(qt7)
- endif (Q_WS_MAC)
- 
--macro_display_feature_log()
diff --git a/media-libs/phonon-qt7/metadata.xml b/media-libs/phonon-qt7/metadata.xml
deleted file mode 100644
index 465cd64145b1..000000000000
--- a/media-libs/phonon-qt7/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>prefix@gentoo.org</email>
-		<name>Gentoo Prefix</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild b/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild
deleted file mode 100644
index e844131a519a..000000000000
--- a/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon QuickTime7 backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-quicktime"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~ppc-macos ~x64-macos"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND=">=media-libs/phonon-4.5"
-DEPEND="${RDEPEND}
-	>=dev-util/automoc-0.9.87
-	media-libs/opengl-apple
-	sys-devel/gcc-apple[objc]
-	virtual/pkgconfig
-"
-
-# needs OpenGL, how do I specify this properly?
-# I just depended on opengl-apple, hope this is what you meant -- grobian
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-noshow.patch"
-	"${FILESDIR}"/${P}-QWidget-cast-dynamic.patch
-	"${FILESDIR}"/${P}-darwin11.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare  # for PATCHES
-	sed -i -e "/^include_directories/s:): ${EPREFIX}/usr/include):" \
-		CMakeLists.txt || die
-}
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index b6b263cfedf2..afdcf3fe2a21 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
 AUX portmidi-217-cmake.patch 13124 BLAKE2B ccbc53bd6a740fd87789931869aa29d66c3e4b404851f8f465f713fb0bdad2756ba77267396e5f966ae266c1f05b7972f5abd5559ba7f1358e50cf65e3825e63 SHA512 36392c6e5e9f21d8791866f22345569346e4827bbb3525c119f2a28d8ec1d055988a360c2f53323f1d12f8294896656044c5890cabedd7fb6c2f730f5d72e4cb
 AUX portmidi-217-python.patch 764 BLAKE2B bcf569bab2c105f99b7a3b10c0124fa22b7fb0d9d494024c17c01f3bb6641441f1942b4dae76725835e880c4ed90c03e151f218b4eec78b29fdefc343cc00b30 SHA512 5f5e582d1769c995038d1b073eb603e313f1a49b5d7cb832de9f2aef003dfcf34bcd848337dc180ee23bf87ad631887584d339474c45e57b6a78d179c929ec43
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r1.ebuild 3088 BLAKE2B 9210fa4b541627e277ad78435695b35815da3ec0a131c98d3fd9acccbb8b0db97f0e349ac6ab1e6c203ae79fe8ee906e810f04992084e265b3ed80c01d829c33 SHA512 72bc62d6630cdc55542166a8eae3a1c71b5e488c4db5708cd2e4396a9a48f269dbb8cc5dd2a303ead33006142a30fe1ee91f5217b62cbdd65ba7f9de81a4f364
+EBUILD portmidi-217-r1.ebuild 3087 BLAKE2B e84ba635d7192ed9730012df422bc92dacff710d140544f015934bd8a6c71dcf6b5080fe5b0e18b0f20ab069b4c727aa2e1b29bf0d4f77be17b613f1a4ef0d63 SHA512 24e5420c9569513d85cc7c21face7d6b825b0e97140aec10ae6174b0effdc9a42cde3f8ad6656a40219e2184b310de643b5f74911f032a8740a5a0fbdee5cc84
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/portmidi-217-r1.ebuild b/media-libs/portmidi/portmidi-217-r1.ebuild
index 28d12fff0daa..a515367b7ece 100644
--- a/media-libs/portmidi/portmidi-217-r1.ebuild
+++ b/media-libs/portmidi/portmidi-217-r1.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"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 CDEPEND="media-libs/alsa-lib
diff --git a/media-libs/pyliblo/Manifest b/media-libs/pyliblo/Manifest
index e75a8e441ea3..f52edcc0941f 100644
--- a/media-libs/pyliblo/Manifest
+++ b/media-libs/pyliblo/Manifest
@@ -1,3 +1,3 @@
 DIST pyliblo-0.10.0.tar.gz 29702 BLAKE2B 6120003aba9990a4c9d84050a3501e4f2bb345d7b454f47ca2689091c3dcfa1c59c85ff8c2a7b7d0e7a6b9ee87c291ebceddf09cd9a1a39a0706ae463394e407 SHA512 d2a3d47f6c52d310104256d33fbd5d652ae6bc8cde32c2d3b2f3f407b8a4aba99028e57cd466804d266f63468a6c792760f28a43dbabcfa3330e0a852ee4d4e3
-EBUILD pyliblo-0.10.0.ebuild 529 BLAKE2B 27833d317ce545a17d7b2b9f46e020dec5fbf450dc4ab29a79b229d807f12686b22804446f2ecb41c95b663f28318a73301196c193919681c787e39d4af45fc1 SHA512 37ec93d9bc4d3c3e4da6f200a13cddefd80b86c53e5d4d844e3c6df062614c7ed70fc435ac640b180d8f2c0d78f07e4d3aa6486b8120d87067dbc21c5c1d1166
+EBUILD pyliblo-0.10.0.ebuild 533 BLAKE2B 7f97a46d4e98cb3c32f53d7f31e03bd4d77f0b8cc231d063d60543212c5cfa84eeeb278774692fb8fa03eac27fc01be9ce2b0cf4da911c6399c8ba11af9c8881 SHA512 bdd2df2d697d5a2db0a37673f84768f67d938ebaf0d3b095700325d87cc7c0aa2f545e59c4b9a364394bf685436698d7a04a89e93cb76200e842d52fa879bd04
 MISC metadata.xml 367 BLAKE2B a979ddb0a7dc8bb8f1ce169cbe6471b5ad2fd30c484332ac725176ac1c45e9e3cdf3a45b648608d8f6bb402ae8054525a4c9bac491a143f070ff98bd5b8b51db SHA512 0c99d4f580f70955f94255c28a68da367f67269278520e05310e34008a663329cbfe08224ca672287d8055ddada4efbecc0d406678438109aadc87879bf05f58
diff --git a/media-libs/pyliblo/pyliblo-0.10.0.ebuild b/media-libs/pyliblo/pyliblo-0.10.0.ebuild
index c888c9e2eba5..f8533b12693d 100644
--- a/media-libs/pyliblo/pyliblo-0.10.0.ebuild
+++ b/media-libs/pyliblo/pyliblo-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A Python wrapper for the liblo OSC library"
diff --git a/media-libs/sdl-pango/Manifest b/media-libs/sdl-pango/Manifest
index 8b90e4bd4b7e..dd9f65137e2a 100644
--- a/media-libs/sdl-pango/Manifest
+++ b/media-libs/sdl-pango/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_Pango-0.1.2-API-adds.patch 3624 BLAKE2B 17d619c65f126968b2613c9ceb3430037b5c62a08d07fddccfef9c1489751637d85000471d60f68b814799e469b8aab907b1ec3bcd42b34946532b555e38dd62 SHA512 cfda28cd9334989abf7d99a36a15d6d4aac0ee5e9315b21bd5999d106bcd671717328b53cd58c2fa406f61f1728860c2ef7e1cf15bf53b44da4b3cc902a7f7ad
 DIST SDL_Pango-0.1.2.tar.gz 405967 BLAKE2B 310dc47ba8030248a856b9f1c077f04f16ae3e0209afb0051a478d07c7d694bf3d16bd3e507c56d9fbec6bf24b55c6c20da5785b3de547463eee3c858d56f98a SHA512 081ec57e0f55ce541c35393d6db7ea48b662a5008760781076d70c0a645d47f7e994f695c459ed51f8cb71494911a04cd416733fb57934321b806a1ac9878440
-EBUILD sdl-pango-0.1.2-r1.ebuild 933 BLAKE2B c958f97dd670002fa3fd3df5c2fa7883dfbfcf07a5b793c06f430bdcdca12f377de006dbffbc3a8b7bbdb89abf2ff16015af0fce39f924fa86edfce059526b90 SHA512 d1a0f5b758679b2129f4c54c20da9ed4b8dbeb6475c7e710f392e77e287fc6884fbb515b2349b4bb3d7ce38e4ea9a5a62cfcc75edb76949b8f1c0c96e0522571
+EBUILD sdl-pango-0.1.2-r1.ebuild 928 BLAKE2B 418bdb304e5e8ab78012f7214d590b7e753406a49fe50cd9e36140291dc7f48fa195918b6e3db71fb4deed0fc1d195323593bcd9b14c297c5a691f897758ef01 SHA512 070160bcfa93afcbc40c88a0b9be7b2b0111e613e9d5ca2366f725f97320f21ec4ffc602ec1ded76231c08a0e98fd20832c082fd0aa8ac30783a8d1c6d0264d1
 EBUILD sdl-pango-0.1.2.ebuild 837 BLAKE2B 054de2567ef21e27512e24932ad27823f248195d2a56bfdab621048ecfab0b83d05e596752bffacd6278ccb9a6adb21eadda1622a4a0117d017f026e07fea2e0 SHA512 3a9e3b4ca2f85342be6d70499bacb9b5edb200c72f4980a9f5dffb075efb9aef25176999e1e3094d95dd2c3f56b3bd805c5aa699f36b1fdc8840e105c394b935
 MISC metadata.xml 445 BLAKE2B c6a9c35c0363965ce75144a09086bde5cd98efbdb03667d1e135949c203b9070cd97a604e94bf2237c0f3feb21c486f21e5d160743a7a649a1283cd606defde8 SHA512 7d3c70cc8de075c07dfa492ae525c7f0a61bbb81dd14d2ccd106fd81cf4fe5d4289ca03831f8989fe27355ebd0144191471cd233793184c001c2b406420ea7f4
diff --git a/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild b/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
index f3e3135ae42e..676c024261df 100644
--- a/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
+++ b/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sdlpango/SDL_Pango-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc sparc x86"
 IUSE="static-libs"
 
 RDEPEND="x11-libs/pango
diff --git a/media-libs/soxr/Manifest b/media-libs/soxr/Manifest
index 4b3bd1cf3cb3..11801dfca080 100644
--- a/media-libs/soxr/Manifest
+++ b/media-libs/soxr/Manifest
@@ -4,5 +4,5 @@ AUX soxr-0.1.3-fix-pkgconfig.patch 595 BLAKE2B f35e4c8ca382db0d05b9c50c3a02c568b
 DIST soxr-0.1.2-Source.tar.xz 83760 BLAKE2B b54e31599a3eb94902af21749ba92c79ea4edf9a82de5c83581c7968182c22a80c86fbcd7f0bbd823b45adbd52570a7b4accf6bc75df31bb0a76b2b4e4703572 SHA512 ee902c1bc713e05b748f917d78222b68b5fe01d43f405e0954c21ce4d1ee494d01000caa79f696cb8d202c662a4c4d958b332dae034d6f929e0480abf27cd07c
 DIST soxr-0.1.3-Source.tar.xz 94384 BLAKE2B 5b7078f71404b9ef83917dcabc0c99cf17fd625d3e033d1b934382a7b60e55e359931a6ab53f8adaf955c0d811d6cbf231cd6a226549560b3506a3867e845607 SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8
 EBUILD soxr-0.1.2.ebuild 749 BLAKE2B bb4a3e59a1e2d27bc8c000935c26c0831671cdccf57749678dd796ec497ff06c239ee7579acf967eb2e42390ab53a3cbfe84c9895dd928ce3e5a583e29a24cbb SHA512 42a99bebd16b0ff3b0f25c3fc26a80b1079c0b38c106fe1bf3b6e12d53e9fbaabe83e40308d2430e7c416fd2807b4700a19ea161d5b511828d5a6511b5438bb8
-EBUILD soxr-0.1.3-r1.ebuild 1092 BLAKE2B 1d72789194466d099ebfa19318efcca7ab0719a90dad4bfbf48c47907cc9c8324a2f47a5b428684fb6fbfdb57fba88a6e87e71933f50a1c8a69200e0845167d6 SHA512 021ba6c50389595c4ea1ab94ab6370deaae66560b8e3b04369a442d90c37e3e750b50fa0abe80f25ef8615f0d2128295c995c720e4a1138bfeaeeb099c3afa15
+EBUILD soxr-0.1.3-r1.ebuild 1091 BLAKE2B f0205b491c5d5cc1bfeee2a3b799f8c4da82160f1072918daacf93ddb7a1c3d08240b3e608d290f4e61492c892d01e9ded5d5ad557a10280444c218153fd5174 SHA512 f8b6823fa78c3aecc029fc198b6ace01a5f4523f2c61c0b5fddb99797216a4b287f1e72814d8916f8b8d04783e26b6137f6f5b34bc0dccbabaa10fc922fdebc8
 MISC metadata.xml 337 BLAKE2B 9b011942361de08f2263ad43a16d18bc8940e539b045a4907ced6c93dce455450bd754bce933ad33591b001dab99c253c781b26ffc26f0972425f75837186f7b SHA512 7f028b48874ab0d30aadbf0370e3ef5b555785aa4e7ab1bd1755ec2cb5c33d3e99e83ed166d011a94773b3c50b0e5a5403b42ed6d9d0c51ff7f7f2ddf48d064e
diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index ad907d56aa9e..132057f97220 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/soxr/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE="examples test"
 
 # CMakeLists.txt builds examples if either test or examples USE flag is enabled.
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 22370f3a9e9a..251c8374c7b5 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,6 @@
 AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
 AUX vulkan-layers-Use-usr-for-vulkan-headers.patch 4914 BLAKE2B d8a2cadee0230a84aa25957944fb5a6944be4ad7cd19442332204be4f5c428abd181f89a40d464065e4a8ff00b4f43c8d2aab086857b611059de75f0650cd0fc SHA512 76abae6ec5f1ab2db66c8a9db3e5f2c28f7993c8d9e3d582c018ee3c6d6f4111fcd29288a5593d3c37d4e4e3d7e52c324582718b1d7f6db6a8e7b0edad834da2
-DIST vulkan-layers-0_pre20180601.tar.gz 1099188 BLAKE2B 74bc6aeb789485768639482bee5d4383db80344b3bd1f25c8767769d99199fb7db8c9bb6dfc597290aac1bec742851658300e52884fc734f5f6a1e4f8d3f8194 SHA512 7212a5359e56ef593d05c9aa61fd64f13737c55757a38d5d45d71f97f59a0719bf154dfc5a62a54905a944b3fcc24c08b56226c517fc79180a6f6584bf54850b
-EBUILD vulkan-layers-0_pre20180601.ebuild 1591 BLAKE2B 410cf3f55a861ac1f77d6f3ee230e4375cbd72470efcbf0ba166ff241220932fa5bbab2801e57021fa4d81e24a37add62e3a22ee061471b34285eeb482591dd1 SHA512 d026d69ff9b2545309ac4b118e021491e9369c6b32f9bc899dd880b5bc925c2f09830d64d01a060bfa4036ed577f9b15e7b8023e51c67af147584f73caf5e77d
-EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B d9a5a239e0287f50a2c9fcff4fe788379d94e092261d455fa76b0588e969b34887c2b937a27b38de085645f06529c8c7570be7d5cfaad57bdd461447b924a1d3 SHA512 5f1fe4527a620fe027570c823fca1f8c89ae4a9ab8d9efbc52484a82c239e6049e602acf5968ad163211f60207ae155dcac5ec0c482572410eeba0359d34641f
+DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411
+EBUILD vulkan-layers-1.1.77.0.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b
+EBUILD vulkan-layers-9999.ebuild 1575 BLAKE2B ffae68cd9fc26366b52e443f9ef30d82771819bdc7ae8c8d48a2e2d99b96936fa78bd8d1747ea3896781c3c2d4c7a4ce4faf898e1d844fa0a3a5abf98c6bd837 SHA512 7106d9565d575f9586b40f7db6e555a757260c6eda8a129ed1cb92110d1cadd40c594b64f7c953cc0e6805f91c31eacea36d3242edfc15cb996b4a918f2a006b
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
index 2187d9d65c0d..436c46fc5259 100644
--- a/media-libs/vulkan-layers/vulkan-layers-0_pre20180601.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.77.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338"
+	EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -37,7 +37,6 @@ DEPEND="${PYTHON_DEPS}
 		   )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch"
 	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
 	 )
 
@@ -50,6 +49,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DBUILD_TESTS=False
 		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index c4dcf61a753b..436c46fc5259 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="cd83f4cb83aad4b279642beb9e9d6bd988b66338"
+	EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index d336207148fd..9ca81c798a52 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,7 +2,8 @@ AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 173
 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
+DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48
 EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1785 BLAKE2B b14e7913fb9590f0d4aff705ddd0e70120be563b7e37a33418807b58c99fbf2aef17598a60bb1a3d5b6155c797a69065cf34e42035ed34093d9f66d303c82d7b SHA512 3be5109ba59fa832a27b159354a07a115811f45949c74fde265c8753a3fdaa61ded474584fedd62b5c28e859b39796be1fa3e8021ca3e95b6800747596ddfbf0
-EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681
-EBUILD vulkan-loader-9999.ebuild 1502 BLAKE2B 1286fa5cef46bc3a3a27f247824d130fe7d1b08ebc40ab0486610519afc5ed4d57bbf3b0c68a4b1d8daca6186414b4a544cfd9099b2e6801ed3369338ed8e7bb SHA512 b306b5d6d8df2b5b257e155d94b7bd4a56c8cf48ef84b57f89ffb7157463f683ad848df9c1f8ca481d75118c36bddb2ba9d46537c6799278b86c4f0edc2f314d
+EBUILD vulkan-loader-1.1.77.0.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510
+EBUILD vulkan-loader-9999.ebuild 1568 BLAKE2B 788dd57e183eadd6f3ecda596c87aff15b313321bb85f25a56a96cf33cf97605ba881db3e225c45bbc888c8bc4f9b80d00e0d101eca9cda2ccc84da4ba3d8b17 SHA512 5910ecef53f9dfa3267bd14b461ff70b6fc4cbb2f0e3683d464d0d43accfb8d14ef1f7854642ef8af4ae0e3b9f3bf8716365c27e2a10c8db1e702387be0e9510
 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
index 4bed360605f5..4f7ccd73988b 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.77.0.ebuild
@@ -5,54 +5,44 @@ EAPI=6
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+	EGIT_SUBMODULES=()
 	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}"
+	EGIT_COMMIT="c71d5027a9d7fe4b170c0ff69bad67efd1d530cf"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
 fi
 
 inherit python-any-r1 cmake-multilib
 
 DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="demos layers wayland X"
-REQUIRED_USE="demos? ( X )"
+IUSE="layers wayland X"
 
-RDEPEND=""
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 DEPEND="${PYTHON_DEPS}
-	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	layers? (
-			dev-util/glslang:=[${MULTILIB_USEDEP}]
-			>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		)
+	dev-util/vulkan-headers
 	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}-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)
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }
@@ -62,3 +52,8 @@ multilib_src_install() {
 
 	cmake-utils_src_install
 }
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 9e7474822138..4f7ccd73988b 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -10,8 +10,9 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Loader-sdk-${PV}"
+	EGIT_COMMIT="c71d5027a9d7fe4b170c0ff69bad67efd1d530cf"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
 fi
 
 inherit python-any-r1 cmake-multilib
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 5e50d3b23ed0..aee6b78d44ae 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,5 +1,6 @@
 AUX arm.patch 1188 BLAKE2B 886fd2b177c0e1bc1dbdcb6f6b14219eac807a26dd76e67d57727d9fc523b69388a19b354a6d7c2653d674b8c36dff487ed9533c9d0063721483f9fe2b3bf792 SHA512 2591fdb86494e36d4c44b31ae73c1d544018776f21b4a22410aa48ea3f950c74ee808a8c2759faf9b84e29e4ee4fddd6b1baaa23ac2924da3e408b9947977dec
 AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa4eb3c565962beac47ebbeb35dcdf6fa3d0d19c734310b4032bcda62aeeea8ddc99debe901f1 SHA512 69e3d7c6d987ccbbaa7111eb8efc1e02c1e02096936a0eedfbe7e9e1c1377bed0f50f7b09aec0768e8de31251b8e3d2191aab56f19259c0e4aeda9684ab55bc6
+AUX non_x86.patch 698 BLAKE2B b565a558e521b32ff67b24abb49a546615f42f009dc12ae9ee00a43df3efa657960601109d3023e07322fc47b5e4d87cd8f4d12efd44888a28f52c9c6784a353 SHA512 444623b91301049175624664de58eef6735c1b86c92792e5a6f1d7154e08f46e861e38f7cec23b5528deaffabcc494ec8754a48ae8cdd9e0f8665bdf96c4cd5b
 AUX ppc64.patch 619 BLAKE2B 17ea28b03ee80af9e73222df7d999138a51d6c8836574d005981426465e328cffdde034753fcc510ae305ee061e2aa278fc1a37c3bf2bc439f7c6f21bf991c99 SHA512 7b23e9bdb3cc634206ffd42fc381bb3b7915b7b788b30567e01592d83b3d8aee8ba794a20587a31e5ead02c837deae9c8f3d9e82b2b05409892dbe6ff37fe822
 DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164264ff10f3887bb244ce7e605a82c2cb0a2f2ae4f2749e009baac19407109996e599dc41bc970a610ed086 SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef
 DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
@@ -8,6 +9,6 @@ DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2
 EBUILD x265-2.2.ebuild 5675 BLAKE2B 23cf92f51a8a8fed656a17cf0a59893931d42df5be17357a2873dd0da46bcf12ffd0b6c46d62ccd396566a7f53e8bdca5fbfbfbe72d4ff7d3a6454f1a4272cec SHA512 546d1f76b40c33047ad947c91c698111e8dabccf84562742b8c0142a86ac6148ea1b3efe238952d414f0f27ec24b8f159b76c1d6c53db811e84953ea6cf64ffc
 EBUILD x265-2.6.ebuild 5654 BLAKE2B 6352a49f50d7773b7379be149e650b4721d939e484ed3216ed77c448c226af1e3a66b6da3be6b3b80983224abb78519cc506632728f95e5f01e9fa8374fb8fc4 SHA512 0e75425dc9d4cf7155029aab3f2b522b4556f9fb85df7e845a1a48b56cb302db72c1c3e3b69610eac925b9c3e7daa64982062194a654939632713d7a0fd24d04
 EBUILD x265-2.7.ebuild 5661 BLAKE2B d8c795c3923982eb5a13a290d409c822abd8421b0d1e058202b34204fe79d743c3eee3d4ae579533497595214a7a2de71646ee6e81aec8b4830a287e4c2c1ec9 SHA512 4bad0afbb56a8659ed7ee2d213c59f3c76ffd2a8bc192f083609a53d72e7818c70926293886c9b509e56a11f64b5dc375397bb4feba333355ccd831ba1ef1c46
-EBUILD x265-2.8.ebuild 5661 BLAKE2B e3fb7fe4aa939f13571247cb5011ac31008b10c63813123b3549a0de89231c94f0226a382c22dbea4a2061e1c119e360d7d8b23f0a0437ae25b597992e3c5196 SHA512 9fd54c8d86e26f1ed64f01fc657ed4cb7e8ad916dbfbfae3ffed2e755a6070bb4522baa1c36e67b542a929571f2605d1127fe6b739b1e850255a9c428a278c91
+EBUILD x265-2.8.ebuild 5690 BLAKE2B 582937993f49cd81f20135e8e16cf0d12b43f3637d45567342e8cb7fda68bb0c873add424a1357a58534442c6f53e7f837d9aa2f8b0bfbfd830daea2fa96a099 SHA512 41c431ceb43987411421e128e4d56ba0ad8953ba00bf2c58f96efc5e9c8c929aacbc2d8cbdf555df98ff7bdb695521ccc031fe83213da0b0c19f14274ebc8a5c
 EBUILD x265-9999.ebuild 5661 BLAKE2B c01180df215de891d5f60dd877a0acba88351efe58586ffd1f022e1b337f0b308cfdd096104b4bae667ad2050566ebf6417955ef4f058a804c1cf8a95c36a01a SHA512 d8a48e121ddb761ceec95f85881d4eb164314440af38cd31aec8875aa3f940539838b796fa34da049ad630e3c9f4fe3e9203c7e558dc86e0d3b490fedae808b1
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/files/non_x86.patch b/media-libs/x265/files/non_x86.patch
new file mode 100644
index 000000000000..3c7e389329a7
--- /dev/null
+++ b/media-libs/x265/files/non_x86.patch
@@ -0,0 +1,20 @@
+# HG changeset patch
+# User Jayashree <jayashree.c@multicorewareinc.com>
+# Date 1527224165 -19800
+#      Fri May 25 10:26:05 2018 +0530
+# Node ID 4504219210793536d921ee4e0b3058698c630bf4
+# Parent  cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704
+Fix build error on on ppc64le
+
+diff -r cc2c5e46f3c8 -r 450421921079 source/common/param.cpp
+--- a/source/common/param.cpp	Mon May 21 18:42:29 2018 +0530
++++ b/source/common/param.cpp	Fri May 25 10:26:05 2018 +0530
+@@ -633,7 +633,7 @@
+         if (bValueWasNull)
+             p->cpuid = atobool(value);
+         else
+-            p->cpuid = parseCpuName(value, bError);
++            p->cpuid = parseCpuName(value, bError, false);
+ #endif
+     }
+     OPT("fps")
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index b7f4c3f20508..7f60a7f11347 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
 	"${FILESDIR}/arm.patch"
 	"${FILESDIR}/neon.patch"
 	"${FILESDIR}/ppc64.patch"
+	"${FILESDIR}/non_x86.patch"
 )
 
 src_unpack() {
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
commit	b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree	c66442ced2011c5ca81c3114cc51041e314c6d33 /media-libs
parent	e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)