gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-libs
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
146 files changed, 2485 insertions, 1230 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 58940ef75585..ea9a7391a1b5 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 2dfabecefb21..5b0b87353e9c 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -11,4 +11,4 @@ DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b54
 EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47
 EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
-MISC metadata.xml 1089 BLAKE2B 195c71477c57ae4e873d7abec9ab26e8047e88fc8d0ecc5977a9059f990dabcfdb2ea184f6fe873a96868e684936ee1926ab5a9d15b34a7885e5769c981c23b3 SHA512 55c72ad0b2a1f00004f676e8a603551aba34b8a6cbb491ddfde7938d18093e42e4610d3cf1154196625e92a25f3d08cddca19930a20df312c455d3338fe30a1a
+MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 0c51c0b4e8ac..1a6f9338ec6e 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -16,7 +16,6 @@ and a GUI.
 </longdescription>
   <use>
     <flag name="dumb">Enable <pkg>media-libs/dumb</pkg> module library support</flag>
-    <flag name="opus">Enable Opus codec support</flag>
     <flag name="physfs">Enable physfs support</flag>
     <flag name="vga">Enables the VGA graphics driver</flag>
   </use>
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d9e39eb7a960..92c5acd7b265 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,8 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
-DIST alsa-lib-1.1.4.1.tar.bz2 974584 BLAKE2B f3221fa55dc11c04f4a1bc3ee90d2a679ca9b8bde65e2801ae5762fa456ef8e45532624efa57bf7d62f82e5c172eaf10f2286f9acace5a47e20123acf5ce04d2 SHA512 7b548c4ee29c4a1230a0edcd5d19219831290f96a214180a6530628acc05278d1348376195287d188f4f44d6be1914391c63994f1b50985c3eee74352da26b0b
-DIST alsa-lib-1.1.5.tar.bz2 979225 BLAKE2B 75683b17bfd51c1e54f1a460ed32a170b07eb227bd6b9ee481d123116464f5c16bbb49f29dfc8d08baaf2f69c5333bf71b70c33b5d420c43e56ae4ace76a6ab0 SHA512 c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58
 DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
+DIST alsa-lib-1.1.7.tar.bz2 1005257 BLAKE2B 0ee0eb9db057421d75436bbed49e0a0ef560700d480a5dc73bc0e9e6abaa29892dc4e4482c671996fbc9f6bb5f70ba645010bd714f30959fef897e3dc906980f SHA512 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c
 EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
-EBUILD alsa-lib-1.1.4.1.ebuild 2114 BLAKE2B c604e7b3ed5eca1882eaa54d511d06644e5a0db18ba4933bba410850c89876e2f9592e71cc121d7b853b00ea1c66bd18b69e67290b0d78b3a2a27b491516220e SHA512 ad3f570a0c87c5e5f41d0183abaca0a8f20595d88748bdfa22ecd5a36730ef74f32c7c8ad5caf9a1accad0da89e44a1519a370dc38b259577977e86e66df42bb
-EBUILD alsa-lib-1.1.5.ebuild 2114 BLAKE2B c604e7b3ed5eca1882eaa54d511d06644e5a0db18ba4933bba410850c89876e2f9592e71cc121d7b853b00ea1c66bd18b69e67290b0d78b3a2a27b491516220e SHA512 ad3f570a0c87c5e5f41d0183abaca0a8f20595d88748bdfa22ecd5a36730ef74f32c7c8ad5caf9a1accad0da89e44a1519a370dc38b259577977e86e66df42bb
-EBUILD alsa-lib-1.1.6-r1.ebuild 2060 BLAKE2B 8a2e25921cba37d8e0e5985faab131ca359d363dae7c347dc9ff9f52b206cb3e5b59eb0ebb2b38487e85184a329eb335e2d4a5860cded27195fe64c6d181b8de SHA512 d46f1d30068df97006f3c3d84623bb16015e28a1f79cf0f8b44e8e78cc6d222ad1a4bae3a6957d6e4f55d29593e7916ca791aceaf42142dd5b33a8dc5bee597e
+EBUILD alsa-lib-1.1.6-r1.ebuild 2054 BLAKE2B 1d6cd5ab6fa0c3fb14d4d5e6b53292773ddff9afccf785b2bbcea2330f5133c56da299b9a794ae1f5d64859f96f08f8fe9c5fdfcd28af58ea6d9aab1690bb7de SHA512 7cb9e6af32582681080e82cc4c8ef45941e9ab3f9288bb9e49c6d22648e021a8d2d200eb8b71d258fea877de5bfe0896d41f394f6e95c8042ce24e49931cb1d3
+EBUILD alsa-lib-1.1.7.ebuild 2063 BLAKE2B b3a5a74cfb2772f4a88699067ba8bad9971de795732450eb704eae5ece252830a3bbb2a06b436a1672043ddf138ed1ea5d855e856afba21a2d20e0409ac4915b SHA512 c868b015979edb7cc8a8b1d59c4f361ddd012ad4753c4597413caae27f4a023787e23786f44ba721de401fc696715a8e2837219c53598dca5e19860358b043ff
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
deleted file mode 100644
index 3cfe8ecf8ff9..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# https://bugs.gentoo.org/509886
-	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
-	# https://bugs.gentoo.org/545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-	# enable Python only on final ABI
-	if multilib_is_native_abi; then
-		myconf="$(use_enable python)"
-	else
-		myconf="--disable-python"
-	fi
-	use elibc_uclibc && myconf+=" --without-versioned"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		fgrep -Zrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-	docinto ""
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
index f03ea3f74dac..db2aacef4a4d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
index 3cfe8ecf8ff9..69bf71d7b425 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.7.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
-inherit autotools eutils multilib multilib-minimal python-single-r1
+inherit autotools multilib multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="https://alsa-project.org/"
@@ -15,7 +14,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
@@ -23,6 +22,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -38,26 +41,22 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local myconf
-	# enable Python only on final ABI
-	if multilib_is_native_abi; then
-		myconf="$(use_enable python)"
-	else
-		myconf="--disable-python"
-	fi
-	use elibc_uclibc && myconf+=" --without-versioned"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		${myconf}
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -65,7 +64,7 @@ multilib_src_compile() {
 
 	if multilib_is_native_abi && use doc; then
 		emake doc
-		fgrep -Zrl "${S}" doc/doxygen/html | \
+		grep -FZrl "${S}" doc/doxygen/html | \
 			xargs -0 sed -i -e "s:${S}::"
 	fi
 }
@@ -79,8 +78,6 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-	docinto ""
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
 }
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index ba9c5d7c7b23..4cfa07532154 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -2,5 +2,5 @@ AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595b
 DIST alsa-oss-1.0.28.tar.bz2 291500 BLAKE2B 8884c91809bbdb9a20a7ebad7c076786ac5896d312741abf612598429e3d476530a198d8b4e0adb3abe2aee118b0b4b875b2b99ac636403ec37a583a4e234bcd SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e
 DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e549c46ef4df52d49333c039aa285320a179cb632df5dd48f51d56513499e59c71914236c9be1e0ba493d25bbb270 SHA512 f58ece2a5aeb846032a06d372eec0bfa1cde0bd0590b1700d4f7698aa29b10f13c8d53670297ec95a94448955ba6ea9e94a4a79129eb2cd734c8a3658197036d
 EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
-EBUILD alsa-oss-1.1.6.ebuild 925 BLAKE2B 4e23d01b74363145fdf95cf16e9b019bab71360c3361278d6793147e8061d73ce7c5d6798f5b4e2e24b7e8b847ee5ceb54f9a1981654c65079c6379eaffa4e8e SHA512 71698c735292d40c0d1fc70d410bd9037f9db27a31bca76cb999fc9c1f7a1194ab1e1b05f2b60946189d4250ae894722052effbdfe33a162ad7c390a6afdd466
+EBUILD alsa-oss-1.1.6.ebuild 919 BLAKE2B ddbc603c1614cbb0b4a3fe7669f7a41cdbc7ee05e5617148b190b4763b941baa4af6d269f605f750f9446d20a91b399a3e0e3c799c7f7b4eeba5ae2c37abff7d SHA512 79e807c8cea41d42fe7205dbd13677182043290c601cdb5afb4d3d509ff65d5422006b79e1aee94870f181718b9f4bdb9058144e27a4ec1b112cf971774f6fee
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
index 47cd17be6920..0a64bf50eb50 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/aribb24/Manifest b/media-libs/aribb24/Manifest
index 149ee0d61431..07abd5826e26 100644
--- a/media-libs/aribb24/Manifest
+++ b/media-libs/aribb24/Manifest
@@ -1,3 +1,3 @@
 DIST aribb24-1.0.3.tar.gz 57378 BLAKE2B 72d5c56a214d63e477ed0bb77e5f20e79ff69fe3712623f54f1369b041622aef1853909f3dfc31685b346c62ef36ffe205bf7a8d2c9f0a2996ae378b025228b7 SHA512 622cc0c3928fd6db0b5ab3921f27348c956af20f8c0133ad5d9bf4de3d199077d9f23cc86ae149a9f0d13c7ee5906ec95de3fb8388207160cebd1f0c59078c8f
-EBUILD aribb24-1.0.3.ebuild 612 BLAKE2B e228f4f6252d4e63839d55e4be8a444319c237ab9565b1846c28319ee617b7317082f760933603c7363e74ffa55b81eac15bc295c8f7cf564bb685b4a913fdee SHA512 cb0749166023592aa3694717ddd07316c942c303f03ee5a5cdd3e7e0368166aa3fb6e50981e4db1f0ebeee73992959a21be394a98762b090f8ce5df7a12442a3
+EBUILD aribb24-1.0.3.ebuild 612 BLAKE2B 1a27dce5c7fb21cbe9072cee4c55df3297ee6cafc016e732c510c2377445ed2c2ce6e2c622de84de5359b9ca506fad5dff69cc975b7916148c0e5ddb3276e0e6 SHA512 7927773f548aea207b666633c08d66db5d00f96fe3045362ce61a4f25fcee84fe099033909562f0cacfa00ae53b3549cdf1f6733333954151b696dead66adca4
 MISC metadata.xml 362 BLAKE2B a58d2df31cfb55e76bec5b2055ae17cbfed0de0a0cc85d8d604ee5c4442539b00d40500722b9a589861f6de1e49ef9fe171bdae2219325c93fc07b735a349949 SHA512 0266c8f4f74468aca028c09b9bd61817f1358022ba11020c5f1829581113c0510c4f59228304fe4a5e76f4a666c640e0afc6e96385bae7c0de98c5d4b8a64d44
diff --git a/media-libs/aribb24/aribb24-1.0.3.ebuild b/media-libs/aribb24/aribb24-1.0.3.ebuild
index 96f99da4006c..f1a58d491c93 100644
--- a/media-libs/aribb24/aribb24-1.0.3.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 
 RDEPEND="media-libs/libpng:0="
 DEPEND="${RDEPEND}
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 53d7e67c0c37..b88e78ec5d27 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -5,4 +5,4 @@ DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145
 EBUILD avidemux-plugins-2.6.20.ebuild 4638 BLAKE2B 1ab4804335317d6c12906ec9a000a38cf1665ebcd0223b8dc563ed75f9e23f0631125c5b6521611b96a375a509ad8b54ba82095cb6f626ff122904572a95e692 SHA512 48e038364240357a6c6328b101973b94dd3cc813273ae5e36711aa4b3121b0ac322d2577a0faca8a7455ae6e2063cb4e1b0db3100564f84a77c3a44e4154ddb2
 EBUILD avidemux-plugins-2.7.0.ebuild 4873 BLAKE2B a9a95cea60229f38ac116166cb449f31c9035f6b59b7577d1ade5b19f4218b8977e89292583149284bb727048bb602b47e0a176bf586ca933b3c7c7b13f5c364 SHA512 5d5b7526d4857161530d3c969fed0bbb2eb8b44f073609447e6e62588cb8be137273971038dff24dd44fda8775ca07a0246db9be0c3e0f9661f1ca671096a822
 EBUILD avidemux-plugins-9999.ebuild 4838 BLAKE2B 701319a074861f69f17ea4970006eedf087f5586197f6a9ab158f8120aaed817236f880a4f59d588534c474cf550ef37764f2f44f0f7cff7f0ee3d5c8bda0c3c SHA512 f3b4c8dad3e24a9af37b7593b7a9d6014960eae9ec91bf9422251148bf336a8a7015d72713d4541a8466bf3695707a47731f0373339c4d5343581260dd319b03
-MISC metadata.xml 1406 BLAKE2B 11611c16434167ee45901a059c37d8802c7b605d21cee9f813982cd8e22e98aac1fa0921662178ef532ef060e7d2c61353a2e057caef3b63a9bf5df06fa6f2a6 SHA512 117225570689a4b78a36b18f5e6c50e185d2db2b10ba6d38869105fa5e718d5dc753eb151cba411df8eba48705e0eee29c2acae8c1a491cc343832d9cfa0290c
+MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 410f705011c7..54c157d3ff2c 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -12,7 +12,6 @@
     <flag name="fdk">Adds support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
     <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
     <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
-    <flag name="opus">Adds support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
     <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
     <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>
     <flag name="x265">Enables HEVC support with <pkg>media-libs/x265</pkg>.</flag>
diff --git a/media-libs/celt/Manifest b/media-libs/celt/Manifest
deleted file mode 100644
index c3a39cb0a9e0..000000000000
--- a/media-libs/celt/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST celt-0.11.1.tar.gz 465853 BLAKE2B ca916d03217dfbeda4764d95bd016500cbf482a0a43099c3d3cd2f4f71182b7d12982f426bf784d022db8bde4a2a6c270f6b61a9675281bfd2be134103723747 SHA512 73d17486ae0ef544baf74f7cf7d4b82b7dcba5143f480ffefec2c16ae9aa240d207aac4aa28c6888ba26e925f6d6f5545f71ef157b95906b63d017ce7b7ce842
-DIST celt-0.11.3.tar.gz 465020 BLAKE2B 9f6221edd77c117778eb5ca188c21430905e1e54034816a1e0a17dc949764d6e6eeac87489f98f68fd96962a5fe89046ba52c1c9f98ba064966d2e5382577a82 SHA512 1f7b8c9b0fcb3a31ba81c220f89fb15173f6e7a25f8fa9d6669790cf29cccb5f75fb37a9f41c76bec5e8d8b9de47d65949831d5a843dcffb2f0747801a8c9bde
-DIST celt-0.5.1.3.tar.gz 440772 BLAKE2B 680be58bcca806ef2135a022cd01103c1518c883868abc2aa60a1ff8c555a0646310901cc5bc01d2b330054af8b5729303d8aa6b3ba58395f7272862a5d5a7c9 SHA512 bf5621dc3ec1b0808bdd83f006fd7b88df1b6caffe07e18eb696c268b31c6c7127329ecb4c9582c44e0ecf9577bbe2f3dbe40f15b80f8681bb7f4115f1501921
-EBUILD celt-0.11.1-r1.ebuild 826 BLAKE2B 330e3a87c22bd792be4da505df444c88f3d34f40d1e9ea37a8756ae43f37a0442830b22d402edb6f89c1d76693309eb8502b61e044376ea037c663331ab49e9c SHA512 08e905b2ea0b2ea435faa2f46c09f6d49150140c77a9627c4275db9eef6a175d8f51d0ccc264f1cc271a55dc915157a539c4047b53df539af042f544df27f0b6
-EBUILD celt-0.11.3.ebuild 1080 BLAKE2B e07796888e2471c1db182d5eb76a650b96345de10ef7d8aeaf0e9fc2a80774078810ed93747cdd59d1cb0be8bbc0662ec984940764be06fe5d1f434cf7366358 SHA512 0771df4e2d1223d4b18fa36b704a45d5edaf5464e48b37d24eff49c6c6f4405068d4ce1259ccc1184d7fe5c1049e82fd19a9a4b0f08e19c99a1357a765521233
-EBUILD celt-0.5.1.3.ebuild 692 BLAKE2B 19fb7f2e5acff2cedf7e1ffde9e88c33e7cfa433bc0d308736cf5076bbfc1f5a61e3a20e9ee2f1240431733935930bab8967ae28ee27d67ec0a04d5e92ee2e61 SHA512 490f087ba8a6a857b9c9aa05f6a81663a484ff5d4abf559c8e219e65e8a2795850fc57da5b52219d509a51221e99543ada6c7b65e1a684565bf25712eb6fe575
-MISC metadata.xml 375 BLAKE2B 9d1464b5bbf9fca2dbf6b926da41d7beb3bb6cd0a4fd5f3b887a68e0c953886c74376c3739e041411838c8afd3639a115a0cad1fbd812f58770f9bcfd455afbe SHA512 0e4cadad691e660d7229130c3348b902634c07d0e21100caf352fc1c8578af75c9c4418c30e5e9bb9943c0b72a8b4a18abd056362e07e6d071503330c9443b4d
diff --git a/media-libs/celt/celt-0.11.1-r1.ebuild b/media-libs/celt/celt-0.11.1-r1.ebuild
deleted file mode 100644
index dc9c81bceba2..000000000000
--- a/media-libs/celt/celt-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="ogg static-libs"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-DOCS=( README TODO )
-
-multilib_src_configure() {
-	# ogg is for the binaries
-	local myconf="--without-ogg"
-	multilib_is_native_abi && myconf="$(use_with ogg ogg /usr)"
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/media-libs/celt/celt-0.11.3.ebuild b/media-libs/celt/celt-0.11.3.ebuild
deleted file mode 100644
index 9c9cefa87cb1..000000000000
--- a/media-libs/celt/celt-0.11.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ogg static-libs test"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-DOCS=( README TODO )
-
-src_prepare() {
-	default
-
-	if use test ; then
-		# tandem tests fail:
-		# https://thr3ads.net/opus/2012/09/2124778-CELT-0.11.3-tandem-test-fails
-		sed '/^TESTS/s@ tandem-test@@' -i tests/Makefile.am || die
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# ogg is for the binaries
-	local myconf="--without-ogg"
-	multilib_is_native_abi && myconf="$(use_with ogg ogg /usr)"
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/media-libs/celt/celt-0.5.1.3.ebuild b/media-libs/celt/celt-0.5.1.3.ebuild
deleted file mode 100644
index 8d4ede3a5894..000000000000
--- a/media-libs/celt/celt-0.5.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
-HOMEPAGE="http://www.celt-codec.org/"
-SRC_URI="http://downloads.us.xiph.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0.5.1"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="ogg static-libs"
-
-DEPEND="ogg? ( media-libs/libogg )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ogg ogg /usr)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die "Pruning failed"
-	fi
-}
diff --git a/media-libs/celt/metadata.xml b/media-libs/celt/metadata.xml
deleted file mode 100644
index f399f22368a4..000000000000
--- a/media-libs/celt/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>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<longdescription>
-		CELT is a very low delay audio codec designed for high-quality
-		communications.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 9d2e645b7f8d..022b3451383f 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -3,5 +3,5 @@ DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3
 DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
-EBUILD chromaprint-1.4.3.ebuild 1460 BLAKE2B 5b2c8921ce4a8a6d5d9e17a9a16746ecde239a8c8f6ef9c63c6c2dd2b28baf2d46b1f8a71cb4f87a11469a48d43bf15f602af875b0888ad41fb8f027f424a681 SHA512 9af43db6c8786fe89f8b4457f357ac67328f81975de7d9c382c74c49b18933b4db5cc1a1c675693f64d7d50ed0086266a46209ef53f3b47c401f0d03ce17edf1
+EBUILD chromaprint-1.4.3.ebuild 1456 BLAKE2B 73af00b6ae7346527194ec03525725a491272fc3afdb73b7a9ba44eac1c3087d98a42924281aa794b2dabd1c7470dc3e992ee7289cccae2198a3cf1d9af52b08 SHA512 1c8edc98a94b46d0b2ac4f24b0d5f93ca4635643ba5648d3430ed5753849c2f786e93ca165bcab7ddd655c1bdd5c6be1cc028d53ee3dd5a9a00c2f1f790e3046
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 09a8c7a88e94..2bf949dc9321 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 5ba8aa6a085e..a3072c8a1591 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2177 BLAKE2B 7b6ac84bd6c2552a219e5d7362b075e9db03c759ebd89d4fd6ef99fb270b79b0f1cabd5e4110671767d2ff3fa43d9a80f160b6afa1ec0161a86d6877d03df216 SHA512 c36245fb617a4121ec870a1251607ea872e97e17ed5db7c93ed6a51ecc367f40ac0004bde676eff753094e1b1d4d1fa10cce4e52782be0b381745659abff763c
+EBUILD devil-1.7.8-r2.ebuild 2180 BLAKE2B 8b4399b82387d57421092c37ddc56be55c4fda6b2894299ba294e90d7107e826a045520b5b9b3f38380bc749e53cfb45c218523e0d44022de52b92f948ef6ba0 SHA512 6d6acbe25ee6fb929711e8bdb24f2d0c3bcf52547e0e694ab94d529395da9c0850cbb328d8c4b2288f1467255914fb799f27db7a9ce10af223488933d07fef14
 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 4d74269bfece..63a422bed59f 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm"
 
 RDEPEND="
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 901896093a9f..1382121933d8 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -10,6 +10,6 @@ DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f78
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
 EBUILD fontconfig-2.12.6.ebuild 4914 BLAKE2B 0088f7ef6b497b086c5f90a42330f1727e404e9818b29d25e30340679ddddf3df222cab240ee09021d99660a4fac2a5f16f59faf5b4ff4e56fc6fd6f689aa72b SHA512 7f78420ed60f3b575965e5088cde35c346f6a54ee1ee0ee1321c028a00e60f9df52bf6fcc13b3da53b0c1714209f513e5d49b64e24b5a9a4b4920fa0fadc1e79
-EBUILD fontconfig-2.13.0-r4.ebuild 5185 BLAKE2B ca625b954af37fdd7baf5b763479f07eb455d9bb37bf57c911c548a9a49a42bc9e6b1d06b8bd190f516a2c253f6daa5f46b2128e724bb2913d2ab8835f20b6d8 SHA512 412465dc3d02634e98ee395d300d7fdacc555c1dfeea7ee35819f9f7628962f11b57b6e41750698e6e327fa4077dbb0ca89b6d73b900eefc791a791bd84794ad
+EBUILD fontconfig-2.13.0-r4.ebuild 5181 BLAKE2B d8af0a3e1e4e34392c6559d3a7744d81cef890d71cab8d2de5124fc63c6c5ab8a8f0bb8cbcba01c91012a5ec60fe5b73b9fab324985f7faed429efdcc02d9775 SHA512 20e01258b521acfee63eb1c73b423baad6a7419822ed921b5b8c1c6a39e1c539af55ecd06f5e47637fd603e0f0ffed71ade28c514e69696ee27445f910797153
 EBUILD fontconfig-2.13.1-r2.ebuild 5119 BLAKE2B 4f885e4714892210a8cce5e138ae83a9331df3193e2b72bcfde8c30ba2def370a64435ef63c5ef0a24d09fef9f09845ec14d67dc2893f458b9513b84f8060e10 SHA512 c60092f8fed0fe72dac37e4649945b7e0cd06ed22ef25b1871eb8d113e57e0fca446199368102f2708b61260c1bb020e3932706b7a87722f178a4a2ac7903565
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 490263d1f590..560514f741c6 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 8b15ad353e34..71680c981d5d 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,5 @@
 AUX gd-2.2.5-CVE-2018-1000222.patch 2491 BLAKE2B 492923989fe07fa6993fd9ac7d234d8777b944e45cbce5f92aaf5bc53bd1502039ff75937e829f1ad6bceac8813bf68704a42d3688401a3b55fdfcd19649a533 SHA512 d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5-r1.ebuild 2102 BLAKE2B 25f329383efef1c05fdf1e1a22788a0389bfa2f2b843e90bac2029e239529d241ae3e8067f931bac1958871858167a0657c5db2f8c70a8f13bee7f6538c6ba4e SHA512 10c49a0fc8b4fe124882be08fc868f63e0f250ece4ee7aa6b08f9cdde1ed7291b75ea124bf6d7587658a9d2c44e79fac30087b75e9bea2f7886c13fffdb58bf7
+EBUILD gd-2.2.5-r1.ebuild 2100 BLAKE2B d45aa7853c790af65665387d8530493b1fe7aad4bee1e0affccb5124c798ccc47457661eb34076b49bd4c37d8e8666ffd35c1d7ff85a72e033d2a34203c95535 SHA512 280445bad2ae5184b4c9b983c9a7d0bb07a39d4e3d65b20acc5946403e3ace65a569ed298e845dd1692dc61f0e2e4dc81dd2dea73683da7b1e3967e481e819da
 EBUILD gd-2.2.5.ebuild 2036 BLAKE2B 642b02819339f66ece89a28aaaa68d1d07522b3477b36660bfbfe17f922ed67c3f923ae8a13b709f43d317c4ca30d39699482fbf8789408922314c681a9c5ab1 SHA512 88a1002d150a7e4063832ddd1773536355aab8b0f1af8ee3a3d2ec9804fcd6900292d63db467365830d5cded14c7741dce07c04e7038bbfb3712044372a1c02f
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r1.ebuild b/media-libs/gd/gd-2.2.5-r1.ebuild
index 55b5475f63bb..9ffef8a09bcd 100644
--- a/media-libs/gd/gd-2.2.5-r1.ebuild
+++ b/media-libs/gd/gd-2.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b037b0578a9f..3cf1e848fe52 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -29,4 +29,4 @@ EBUILD gegl-0.3.8.ebuild 5221 BLAKE2B 089d15cd1924d3d859055f39b6914c2084536556aa
 EBUILD gegl-0.4.6-r1.ebuild 5389 BLAKE2B 4eba81cf6624d66ceb3d3e27b9bff465f9b5702e53d12abccc6ccf8bf17e1ccbe439dbb5b9842564da374510ac3c01ffaac28be89aa3cc1b6c3b8493744c358a SHA512 4e010197d78a08ecc574975d3069a1fcfd2cb15b0cbc40f28b28494213369fc926c1e7bd082314213f823381a52b687facfc122ed000c3078b409bd406f79ff9
 EBUILD gegl-0.4.8-r1.ebuild 4968 BLAKE2B 3cdb9f610500db2fd90fbb55e64c22bac6fe13cc153d5b42b5f16509e09efba77e50e5cc803b33d0e0845f61f65bc201f4e2bfec5fcdcbfb6d6eeaf4966f8204 SHA512 5cef00dcb12ce6153a0831a129dedf0051c29abb683b06b5f5e4d85467f293c93de28149ed73946fc63bedaaac22150f6ade4b21c679a6a4cd422ea702ec307d
 EBUILD gegl-9999.ebuild 4862 BLAKE2B 2c3826ec126d5dc69f2ea4d7ca2cb2dbb5604a8da8a3e6f18b6fc3fa77526a289e35d03673d392e7742dea39dacccdf09e8eb1e85ee5a63e044590d16547ae23 SHA512 5b0a2a483dbd1014f7378d74796167462444a23c1da0d66372b9659315c9bb0bb19a1e11159d63c1192dda7803a08b42cf72f3ac97330576124af3fe16ddb823
-MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
+MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index bdb2bfafbda2..dd62df7fdb4d 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -7,6 +7,5 @@
 	<use>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
 		<flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
-		<flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-libs/glyr/Manifest b/media-libs/glyr/Manifest
index 9bb231aea5ee..f77a2434028c 100644
--- a/media-libs/glyr/Manifest
+++ b/media-libs/glyr/Manifest
@@ -1,7 +1,7 @@
 DIST glyr-1.0.10.tar.gz 416414 BLAKE2B 6cc4dbe7f95bb86635c131f37e4a0d0c95cf2027e8d84629e5d2760d9d8baa5194976b119f2759922ad6a3a2986cc22c630260bb85108caf04674d12a43b1406 SHA512 dc5a579c84c321de7c28861e42196d42ef73bbdbe86b5d662d7ace1d79efe8d6d8d0a8086092ed9c32af9651db8cb11bf1678c5582b17192b23e20a66812bb21
 DIST glyr-1.0.5.tar.gz 426382 BLAKE2B c729eb77fac5ab0afc2ab01a83d004678697456f894b72bda45672333068ce0ca24483cd9e60751dfbef9b8ff576fe825c7af9b20afb8201b7d2c2d7d86d3252 SHA512 e630116ae5a673c9b85a0a4f3dfa2a8ede319bdca357225250ab687b7bf08ddf86041316962918d577376d9641ba1128ec95fa24b5784150155acf78959af744
 DIST glyr-1.0.7.tar.gz 425072 BLAKE2B 8d4ac47467232cca06f517a7f60d824c962949fb4226584e3c81e7c65338d28642fc09eb7e691908c1f25a9e225face52f1a565a1454bbd056f686398fee140a SHA512 e6ffe4f1f2630fead1a8593b63e10dacfa3d8d57b241d0f660f5cd35223dd3b2888d6eee8e6089548ed01301326d195e98f50893745ee3567570d498e23b8c1d
-EBUILD glyr-1.0.10.ebuild 741 BLAKE2B c4b7fe3d7efb49f33dd43194c97b2760c1fc6c8ebede35818f7784bdaafa2c646ee8fc052835d61d69a7e8172c0d28acb4492975b67b021162b23af9238d153b SHA512 547cd4687dc28d73739eed0a2c1ac1b6a7a9e4b6cfb5bf53bf7d6f9896e2072f48af3fadcf1b4aa844b06f6cb425ccc511630d3f9f6e8832b97617e6dd60c9ba
+EBUILD glyr-1.0.10.ebuild 749 BLAKE2B 10b60fe5500f077f7f1d9b32692e4facab3489e53c281afd6f738c0b77ca358d6dae4883e282aeb1a67dda5cd01a2e848e79fb354444f82c11be2626bb7a05d6 SHA512 1761a9597c09a5f39e4ad00a3ee3a262c711529fb509ae6bdebca8db84da1cfc8f4e4496b56ee248a5e315a526f1cbe016e9c6519508489523990b3174c32798
 EBUILD glyr-1.0.5.ebuild 738 BLAKE2B 0d9bb1759136ff06a1323a40d1ad26f0f58c6e80c6c5ec7d10e48cf669a951e4fcd968cfde060cdf3f3c34f7ae37c80ec4803c23db5e0379401ff9fb0bb45ac9 SHA512 20a08367b1d539b11089d3c9b602159f13f7486415a815c69ea1081fe2f79565fec8d1c0b7989ce0ec64d51bcca2d39ed826331d164b866c62cc836661fde12a
 EBUILD glyr-1.0.7.ebuild 740 BLAKE2B bc967f1585e495646d1205617fc6f17e4327b23d0c4bde7ff0be25fbb795a19c34a6ecfcc1b40d8eb0ad74464bf3fdc38d6733b4bc5c9398ddf6b1d887aa3b6d SHA512 d31765c40684f756f05360d85add9b9b7df55939463f738252b55050d3be001f720bbe6e7b01a2da5e06a9a85bc8c4cafc51257f9a1c17608a957a896697b5db
 MISC metadata.xml 328 BLAKE2B c97507d3db73635f224a37a2784a491d4fecd0a6f2deca81e1181237722bce07057c9633980e30748367270f248b0a3f90f1649b3a0af070b46806356bf5594c SHA512 7847b18e7a3a1c934df50d022a1807a52ea52617e8edcd4aa03fde59899a15d254148a3dd62460da741142db5e3b3d7ec3cdcdd6d9149d86b4a33d350def84c9
diff --git a/media-libs/glyr/glyr-1.0.10.ebuild b/media-libs/glyr/glyr-1.0.10.ebuild
index c65461f3d9d7..deaae08241b7 100644
--- a/media-libs/glyr/glyr-1.0.10.ebuild
+++ b/media-libs/glyr/glyr-1.0.10.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-utils
 
-DESCRIPTION="A music related metadata searchengine, both with commandline interface and C API"
+DESCRIPTION="Music related metadata searchengine, both with commandline interface and C API"
 HOMEPAGE="https://github.com/sahib/glyr"
 SRC_URI="https://github.com/sahib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+	dev-db/sqlite:3
 	>=dev-libs/glib-2.10:2
-	net-misc/curl"
+	net-misc/curl
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-DOCS="AUTHORS README*" # CHANGELOG is obsolete in favour of git history
+DOCS=( AUTHORS README.textile ) # CHANGELOG is obsolete in favour of git history
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b31fc8ce073e..fc947b129b18 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,9 +3,13 @@ DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d6981959204
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
 DIST harfbuzz-1.8.8.tar.bz2 3862626 BLAKE2B c5b2b89f6fbefa004927c0ed5dc314d3f8fd4ce8c58918f4020a91247d9e781ff1ffb4ba05b138b4b1aebbdcad2041d749301143523a808f61f013e2efb5efdd SHA512 eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79
 DIST harfbuzz-1.9.0.tar.bz2 3870586 BLAKE2B 53aa631145662fc0fa1bb80e6b438de7d68d5f8f55d163e62a7c6153b250ab2e1c4de327194ba566682a4033e632f0ebc2915250760f721a2a2f2b97e9e6c844 SHA512 fed98e4e67a518a7bee4f3222f8e595bfa529cab12d42707577c639b7bf9a6d771646e63859bd70850bbf93300780e3b0538483e6b73332721e6c2ce5a17a0c2
+DIST harfbuzz-2.0.0.tar.bz2 4320539 BLAKE2B 5a28233a956477754e73b5fb556b7ad4c089dc6f3ebd86060ac2a39cdbf39ac64ed5cfe5b33a1454b9fa5c59ba566d6c69bff8ac0d9d6954e3715fc4739e2381 SHA512 1c782d0b8c0b85f2a3d116d6e41fa688cf8d6c00becde89af6e5f7232a5e272563aea325824d9868f68fdca3f3df4375658234cb7d7198940d6f7e67c33b158f
+DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee SHA512 4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577
 EBUILD harfbuzz-1.7.6.ebuild 3241 BLAKE2B 3886cc3cceb195e62d5dd5b31d4243dbbc8ed218609dc3a65455b9e83f98b5471159039f5fef106d361a240af992257da1f87b43a4ad05a1960f9410dffc051b SHA512 cbc34d68ec264add1f34e9c1c629a0b5351803df370dac7bdfd89da94aabb60b22a3be2202a566d3d31b48e187ef1d7a9bf2dd659c8ed7e203f838eede55645b
 EBUILD harfbuzz-1.8.1.ebuild 3196 BLAKE2B 1e66c1d87d91571ac977a0eb6803a9c710c6d16e3590dfc975cbfedd4924103ad7f1a733ecefaa16003aff0774ef0d31cf2cadd398e35a4faaa89b8fd5e4aa35 SHA512 0741642501ffbf7b14d82c2303b44aac104d17ed74c86ac34f5d1173e10dfef243c81b371600d56bce98eccb0a0ac1c662eba28edea9dbc1d81c23225c5d7a81
 EBUILD harfbuzz-1.8.8.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
-EBUILD harfbuzz-1.9.0.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
-EBUILD harfbuzz-9999.ebuild 3037 BLAKE2B 9d0135148304f8549f37c30740bb26caf98142a407dbee87a7214aa78b977a43e5bdfef7054f07a0fb9c4bc07bfa61f89bcd255bd67cc92749a3d84ae00f6ac8 SHA512 22349b43afee4c4e412c8e8f88c8efae35b4ed884862c82d435c1e5760124830783be1da92273fdb802913854d7f4f4e8aae8d85d363b0aaead4dc3ba1ad2d44
+EBUILD harfbuzz-1.9.0.ebuild 3028 BLAKE2B 55735f2884fa899662c2e8737fc1c1e68e388d3943f51775f5d552628ad74164b55821af02f6e10dd24e9e06ee5f41e2a2aa2dece5e18e58ef465afb83df010c SHA512 4c1554d6db2b8942be88de1d498327f0d0aee8d65864c1c914331468545a5a62488dcd53544875ce3cf6c95f741c32bfa6979cac46840e03af03622ea09f6c13
+EBUILD harfbuzz-2.0.0.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-2.0.2.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild b/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
index 243f2a80c86b..ee83fb48ad38 100644
--- a/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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 ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild
new file mode 100644
index 000000000000..85491d783cd9
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.0.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild
new file mode 100644
index 000000000000..85491d783cd9
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 243f2a80c86b..85491d783cd9 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -35,9 +35,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
-	virtual/pkgconfig
 	test? ( ${PYTHON_DEPS} )
 "
+BDEPEND="
+	virtual/pkgconfig
+"
 # eautoreconf requires gobject-introspection-common
 # ragel needed if regenerating *.hh files from *.rl
 if [[ ${PV} = 9999 ]] ; then
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index bcffcf40d586..5fc3cab0e467 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -5,9 +5,11 @@ DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba
 DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712
 DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342
 DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
+DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
 EBUILD ilmbase-1.0.2.ebuild 730 BLAKE2B 018474bd4196c2ee89f1c9e14359d2c4cfbf9b8277ae4cf1e5ee4a2be742ff0884881bf9967c28be6cf27b13edcf5e753222e5991be20239ee9604710fd98e8b SHA512 0e746dc823c5ea990a2f05329c45716ebff1c7094097a3095fd513a0a82f8c5a47688b57d37e9c158574a15947aa85426398aec728a89f825a4c5b1ce371407e
 EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d265227dc5c63e70f7c84d5ea05ac177b416cc37744bc6f5360911ed3d3e112596f14f81aa456cd472682d017efaf2 SHA512 4a5392c5be8b1758dc8c2fc0e59530fafb7d353ca70711060f4e43759a9f22c6524323b3db50774b94d7a40472b4854810d012f5eeee375af8f08b4577eae18e
 EBUILD ilmbase-2.1.0.ebuild 758 BLAKE2B 20825fee87f24bc2e31d4c01e690ed7d6ed4827ea9422dd83354da8a8c85c832f0d8d172ac802193b56a482f0d656f79a5aa483a995ae05e17e91ac8b4e8a202 SHA512 fdb41c8dc58900b21d3dd42e8cd65b99639f343985ae8b99e04a8a4e5eb0b68b13725d03b3bd03776d528d2998f62d0f6496bb6ef13b0cc9dda1d804d84b7e2e
 EBUILD ilmbase-2.2.0-r1.ebuild 970 BLAKE2B 322ac4df65286c9aedaf85b43fc8d1fecbc3816fff231695f59647d55ba978610a3156f072416f7e7f211c59606b4364917d98c93034a6a7a532dab47a401978 SHA512 c3b4313c5f67e0082ec5b0f5d7c793e99be3c1c85f9ce1ef923c784b1307a22ca82c47bb2547dd7db30a4a67a98b729ac34ca32791c0d0b62d66e089ac38db11
 EBUILD ilmbase-2.2.0.ebuild 773 BLAKE2B e2ce76ff50489895805194179dd647ff70f7cfae2e3960689a95c6b9b4d0aa543155c45fa12e461ceaadb6249df80dd75398c7841441adcfdfdbd75b01bc43b2 SHA512 a11bcce9aa6cd8a818ad2d8e9ab391e83b4a2b70155b1524d8b00b0f6c8a726aa1c4ad4f75acec1c8a81cd1d12626e0dd80da7b74a3410c7dc9aa12454b98c58
+EBUILD ilmbase-2.3.0.ebuild 998 BLAKE2B 2160f67f7c9de45bd011b4ef50fe1925c3313798fd7eca4a756fad4eae894bfb099864976b80105ad888d28feeb60a7b4268049b6455bda4463f148a41ff1150 SHA512 7d528e45616c193dbdd60b8dc55adcb2e1bada1e320bd01c423ca6fd9750a92aedfbc12b33a280a755d5af130d7bcefd868b312a04358dce1476f001a05fe151
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
new file mode 100644
index 000000000000..318a31fd3910
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/24" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
+
+multilib_src_configure() {
+	# Disable use of ucontext.h wrt #482890
+	if use hppa || use ppc || use ppc64; then
+		export ac_cv_header_ucontext_h=no
+	fi
+
+	ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides pkg-config files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/jbig2enc/Manifest b/media-libs/jbig2enc/Manifest
index 20e035743419..cbccbef084de 100644
--- a/media-libs/jbig2enc/Manifest
+++ b/media-libs/jbig2enc/Manifest
@@ -1,4 +1,4 @@
 AUX jbig2enc-0.28-leptonica-1.70.patch 1681 BLAKE2B 78de2dd85258d277114c9fdd60e587bdf833211cb8cbcf12856ad3a26647e20c9b713f77a9dc84f983f0d19e38b59a086bf514a0ee81df186b7bad4760ea669c SHA512 2c9999dde1156df91616e42e051b5e0b81339cb818a9c0fd0592c0d77c4b741c80ac876576a7bc87b990e09af587df5e095c87d8893308100b37188e9640d738
 DIST jbig2enc-0.28.tar.gz 39879 BLAKE2B 08cbb2f2a5277085a592d18a8db529d2e5f79f69eaa5392f2b06b920f7d1651c3c73795ba2e43ae843fd5720a1406633b5429ab0b1fe260a6308da4cf10868b9 SHA512 81d194fb648fe7a866302796fd5e2adbb213d52193a279a94dbc5918ce3480561ea204e8497125eed5d6c6e4c6d089f7f35a89ef98bc484ca753ffde23e444c6
 EBUILD jbig2enc-0.28-r1.ebuild 869 BLAKE2B 37989321c52ae5ecc7a10e4aec1ae8ae2775c5d84fb4ce99e2f9437b2d075c32be9911656a79f08e28cd70f6412d5deded9db1b7485444576fc02bfc53433f04 SHA512 4c24a01da97958fdbf11ad6c14b1d06f96a1726ebe1024bc72f11d814d074ed92d7e51de06684eb7197490f3db54f64a4b02acf9f1c74c6f58f623beeac83380
-MISC metadata.xml 400 BLAKE2B 387b075005d0d70d7510a35eff96dc3cf8a3defa66a4d09520b5ffe9613455f6eb3e1d5f89409e6e6806ca44187db99e505e1421c00295e6c2847efce236cf5c SHA512 ee29408ce12e3ad35d23a835b144cbf428cd25e8953a7a0825cc6673d07e517ac6107caeef66acdbfc7f1bb283bec352717ba4b53f3def394b55f2db8e92db37
+MISC metadata.xml 324 BLAKE2B 6b82651c0b2513c62e014a8fd6f931c7edc95c84ed88dcd9fa18396a8ec59306c3bb4a08914dbae815530b031f3b66c97d909da57ba4a6d13177a44e226345d4 SHA512 6a6bdbd18023007787f6790a5004e782c4fd136c64aeb261655f743fd8619b35d280e74e806540156e3ac75ed15cf7053fefffd298b119a43cf430e57d1384be
diff --git a/media-libs/jbig2enc/metadata.xml b/media-libs/jbig2enc/metadata.xml
index 1782f7f1b303..f930d2767669 100644
--- a/media-libs/jbig2enc/metadata.xml
+++ b/media-libs/jbig2enc/metadata.xml
@@ -5,9 +5,6 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<use>
-		<flag name="webp">Add support for WEBP image format</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">agl/jbig2enc</remote-id>
 	</upstream>
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index e27a500d652e..db569490986d 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -3,4 +3,4 @@ DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455bade
 DIST leptonica-1.76.0.tar.gz 12436958 BLAKE2B 3cbb581340531762090f009393b21252d6f7ecbe3dd7c30043f42e8a437f6ae16d3e95229fedcf6845ca47e4323a35ab3e72e349c6fae35f0587c21b44461ef8 SHA512 83c77bebbf739cecab997ee08f7c9abf3ca884019c559b8f77c292ea2676c464cbf9b6812d7f12aefceef86c19d04bb3bc85119de298647a641b984dcdf3b111
 EBUILD leptonica-1.74.4.ebuild 1714 BLAKE2B 0d6f7f596f2ddda2515ec95966cfdb4e9bc7c059fd88c58700a2c05139529fd550fa7a077b30da8fe0f8abee36a9d5b915ac56b5d86a8573c3e44767c2e13338 SHA512 26fcc48126498ab1d7c80f4aeaa0a263bd443e0fd72ceaefdc00e34543fc9a3a91c7cac6481bd334f58f29b920983b3b175cc9091128ce6a096530a1d808a15e
 EBUILD leptonica-1.76.0.ebuild 1912 BLAKE2B a526eae23b91e0f089db992d80280e192462328ad520831d513dcb7e0f5d025de3e0e786dc935552e53b8529ba997d71dff4fd0f5f5e8fb0519ae9947a5f1037 SHA512 ab4f22f918c8c23275b2d5a343bb9952b00a167522722b63c350effaedad0c6ab0cdbc62e5487a4d16d0cc4d2088e050d3fca139219eaa9c1991e929c79dfd6e
-MISC metadata.xml 584 BLAKE2B 577358c352b0d57e1c73e93ec313eb799a577af32893be3d77b2f68769493e5db075af57a2951541036f0a43b19933e9580fcc147d259462e78fb850bbf90a55 SHA512 be7f1725bd6c5807b12b4ef4f1d602e80e79637262c442d98f828fe8f1615092bdf603b56d72203c23bc32c847a7a35fbf7c331787c1afd86b3cbe051d5bf55b
+MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/metadata.xml b/media-libs/leptonica/metadata.xml
index be92a2a304f8..78be582d1df7 100644
--- a/media-libs/leptonica/metadata.xml
+++ b/media-libs/leptonica/metadata.xml
@@ -6,7 +6,6 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<use>
-		<flag name="webp">Adds support for the WebP image format</flag>
 		<flag name="utils">Install command-line utilities</flag>
 	</use>
 	<longdescription>
diff --git a/media-libs/libbs2b/Manifest b/media-libs/libbs2b/Manifest
index 94ccc4344b33..b6c472e9978a 100644
--- a/media-libs/libbs2b/Manifest
+++ b/media-libs/libbs2b/Manifest
@@ -1,5 +1,5 @@
 AUX 3.1.0-format-security.patch 369 BLAKE2B f64d562fca5b305abbb3abed2c431fab6b3daa961406c83db5bfc39e2316dda288c6d6045e9a4f6fd045f8c05308744f7e01b2616a161a0f22aa5097c7a91c49 SHA512 77a803c030c4b6ce782584c9163299289e8a8cc748d08e5040ae912651ebdff92884be70f1efa1db9df4eba3f0060c77d430062dbe1143682685df3c7e7b1fbf
 DIST libbs2b-3.1.0.tar.bz2 606283 BLAKE2B e70becc06078ff72a4a4fb69d9ad4e906f1ca2062cd770e36fcf1ad2a6c58e6284afa7958fca89573ed83cf9a76b42f0c8367942075eb6c77ab12fa6c2e741b8 SHA512 50cf477ff9ce6adf26fa8a696831c3a4f219c80a21ec4c93be8ec3f67f077447c17abbd9588a9de5eeb3ddacac1564a7138807468fc80e853bc78f193b4afbc4
 EBUILD libbs2b-3.1.0-r1.ebuild 561 BLAKE2B ae75f87395d4f051d433bdeaed25e05b789c1255807850ef2d2d2d05c76ce949899de258de3ab60688410a8ba99dd8e106fb3684056906fbe8ba1993a792c33b SHA512 f200dd9e2e9451276d8f084c18fff9b3d2bb3a0fbecbdfd09c0972205e2e736f3b7f3a3ccf12e1fca8b19c1b7d7e12a768b5b0b5ef186b9f0d5afcea4e12b168
-EBUILD libbs2b-3.1.0-r2.ebuild 633 BLAKE2B c6bf795c185236f888447fb2ed85120c3547eef9dc8e817b395b5f20b99e160a53c1b90d2c32c5361913976186bc4b754a78929f3948956b443bac42524ffd1b SHA512 d550b9798b095e8fbc17619548a2f74ae2840caac3c4b180a549b811574b9cdb989f7e715dd6875e2556a853436fc6f4e088af5af38cc4b043e5596dd0d494a0
+EBUILD libbs2b-3.1.0-r2.ebuild 630 BLAKE2B ae92be979f507748834decee3d3e4b50131c5c8049e6961aded2780c84c57b1b1a7f80aec02e8c84602fee7097a6926aa30eb43406c0c0954a8f458f9595f60f SHA512 96ae6999c39a902f7ccb13c965619a90d5ebdf0369cdf9926265c6351881e0fda8786f40df30d8533a19e894068f224bc064f62e8181c5fe78d76fe7ab51aa8c
 MISC metadata.xml 449 BLAKE2B 05ac186d158a3c9ee695b8af52de5f695170ad925c0136422233df9e94010cdcce5224b8938d8b71ff260f4a468ae93898c7999163c8648d10987cdac17f289e SHA512 f9178657883acf1844ac273eaa5af2380f06fbf23641e76f6a32b08f54b410a5be6d6b0d82888637a51ad4ce13396dcdd04907cb1194eb5539be2e6d3c02e99d
diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index 6caaccb7c821..b2dd3a526052 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 242b6344c23e..fa923e007710 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,7 +1,5 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
 AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e8728ad32b328dfe621957edcada1da351d8aa01f221c7de2bcc6242166a65a1edeef2e3babb1735909bc7d59594d379d5e325b SHA512 d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r1.ebuild 1192 BLAKE2B d05e18b15894cc916eeb672b11636dd8f45cef93866a339115fff43b8193ee88d515c063aa31fbbbbda9e812b99509210a8964c31a057316ab5831c4379192f6 SHA512 25bfabdfceafc916f8a1cf162f875741f402a119d0ab4ff3008f805160e2ff5e5e556b4a229689a603546a528b5c7ea02f750fe972adacbb2d5af33c1e979b99
 EBUILD libexif-0.6.21-r2.ebuild 1274 BLAKE2B e6fa22fbb705c7c8492c2c37287f81fbbd3fb3b481cfea9ba3857baa87460aac925800b508b0e5bbef7705da38708aaf9b06666266ec400c19f1e5f2fb06f3de SHA512 1998120c410e70ca42a20fb998bc2db4e931270ae18ef171c4c2df6c9941f08c1eaaca69cff83ea4a1ddcd5dde3e98001a415dd0514ec25ef0502fa116631937
-EBUILD libexif-0.6.21.ebuild 1097 BLAKE2B 5d76f389fcca57a7ba7d1f650c6c268f0e65b3172dbd75a561611e590cd2cf4fda4648402ea6abf386be5d7f16bbd9928f80ecf1df2704094d8f2667c500c697 SHA512 99cf126b1d9b5076d5e835453264f1a9aa906254f84a331b452d5ad0cc62e74b7276370b12cf4f228abd275d0514a7d86ac204b2cbd60ca04f560effcdaca9d1
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/libexif-0.6.21-r1.ebuild b/media-libs/libexif/libexif-0.6.21-r1.ebuild
deleted file mode 100644
index 31e267a53de4..000000000000
--- a/media-libs/libexif/libexif-0.6.21-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="http://libexif.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
-}
diff --git a/media-libs/libexif/libexif-0.6.21.ebuild b/media-libs/libexif/libexif-0.6.21.ebuild
deleted file mode 100644
index 61dd1b2d0ac3..000000000000
--- a/media-libs/libexif/libexif-0.6.21.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="http://libexif.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
-}
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 7cec762e034f..4853f4879045 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,5 +1,7 @@
 AUX libextractor-1.6-CVE-2017-17440.patch 3584 BLAKE2B a50d293c88c95c59d3399a2ca4fee6f6e935bee84d4f7c7a5a85e27f0f1e34edb0713f0e0010491015e0c792de5bbde64c2dc392a01ec3470ecec46ed8691a04 SHA512 defa28c0303028cdb8c2d08d15ff62a56a7548ed57d6b577bc61842e74b69b4da6d82ba48082e89341643db433b7f256423556ab482fd6a61936ecd18637796b
 AUX libextractor-1.6-ffmpeg-4.patch 873 BLAKE2B ebaec46a809c12252c7c6416a9376b86d6af353a74ae4779fb36af93465dee6654c3717a51df0a138ac70aa08ec3a790950e64602547e091eb2dfb3f209ebc7a SHA512 2931a1fe44f3a5d5d5307ef9ae33237e803a4afc6a47df3a465c1f502ed872391957cd81ac5154053cd4d2b6caf690335791b5ed0cede7227291450bb7dd4a9a
 DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
+DIST libextractor-1.7.tar.gz 8075299 BLAKE2B ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07 SHA512 00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
 EBUILD libextractor-1.6.ebuild 2903 BLAKE2B 8ede2d00e886629456ff76eff0d9dd0b4186d530eb833670ef4b29145f2428aad33505b1d341dddf1c2e28c64802593ed04fc85d76aa4e95e39bd8c34756f6c5 SHA512 be91cb7483cd04dcbee3b07d638da2b604b499389b355f2a6f43701e3c27b396d2f595ee0986c410e97f855bbbe47cb642a4b2f9a1fd0edbf39d4f07565e847e
+EBUILD libextractor-1.7.ebuild 2756 BLAKE2B e0d8da460333a504cc039d1aa3817b2bbda780603912cac22bc3b74b36d7a46f42437ebc9630f8f8406050cac8860da66abeb55d4c9a3f4a4a0baa410ad223d7 SHA512 8408b9c28324b94a1212e268adc6231b956c611fbf29798ffba84bd54649a6e81be7383dfbaf74b5f756b86bcfd9f75e3f0f70ec28250dcea0e5e183b1fdede3
 MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild b/media-libs/libextractor/libextractor-1.7.ebuild
new file mode 100644
index 000000000000..74dc8b4f10b7
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to extract metadata from files of arbitrary type"
+HOMEPAGE="https://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+DEPEND="
+	app-text/iso-codes
+	dev-libs/glib:2
+	media-gfx/exiv2:=
+	sys-devel/libtool
+	virtual/libiconv
+	virtual/libintl
+	apparmor? ( sys-libs/libapparmor )
+	archive? ( app-arch/libarchive:= )
+	bzip2? ( app-arch/bzip2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	gif? ( media-libs/giflib:= )
+	gsf? ( gnome-extra/libgsf:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? ( x11-libs/gtk+:3 )
+	jpeg? ( virtual/jpeg:0 )
+	magic? ( sys-apps/file )
+	midi? ( media-libs/libsmf )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpeg? ( media-libs/libmpeg2 )
+	tidy? ( app-text/htmltidy )
+	tiff? ( media-libs/tiff:0 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	zlib? ( sys-libs/zlib )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# test? ( app-forensics/zzuf )
+RDEPEND="${DEPEND}
+	!sci-biology/glimmer
+"
+
+src_prepare() {
+	default
+
+	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+	sed -i \
+		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
+		-e 's:tidy/tidy.h:tidy.h:' \
+		-e 's:tidy/tidybuffio.h:buffio.h:' \
+		configure src/plugins/html_extractor.c || die
+
+	if ! use tidy; then
+		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
+	fi
+}
+
+src_configure() {
+	e_ac_cv() {
+		export ac_cv_"$@"
+	}
+
+	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
+
+	e_ac_cv header_FLAC_all_h=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
+	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
+
+	e_ac_cv header_sys_apparmor_h=$(usex apparmor)
+	e_ac_cv header_archive_h=$(usex archive)
+	e_ac_cv header_bzlib_h=$(usex bzip2)
+	e_ac_cv header_gif_lib_h=$(usex gif)
+	e_ac_cv header_jpeglib_h=$(usex jpeg)
+	e_ac_cv header_magic_h=$(usex magic)
+	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
+	e_ac_cv header_tiffio_h=$(usex tiff)
+	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
+	e_ac_cv header_zlib_h=$(usex zlib)
+	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
+	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
+
+	econf \
+		--disable-static \
+		--enable-experimental \
+		--enable-glib \
+		--disable-gsf-gnome \
+		$(use_enable ffmpeg) \
+		$(use_enable gsf) \
+		$(use_with gstreamer)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index f810a8088365..8a9c1f2c83f3 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,3 +1,4 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2.ebuild 1537 BLAKE2B 53e329bf85c0b48810421a01d0bfe1318b2b359554a2da9cf1db70e0f694f8ef79a27fbbd21438f28123f789e0ef82fd85667b5b4c00d278ef7ee4048999d6fd SHA512 065164ff763594e84626095446fcc2c96fe2913e5412d2d41df8f2839ac27c954960e5097464799b5b75c21b56aebdb644c0b53359c7d08c3dbd752ab77c5485
+EBUILD libggi-2.2.2-r1.ebuild 1388 BLAKE2B 4e1e42a293ee0524caf314c88c5764e30a6faf197978903214ef0a8b0a2e269974fc0167900ef928d6775e8f88022f7e81fcf07705c1f8767e015deab1fde338 SHA512 77c8476e7e94fef937f102c9081037b10b983ec8f05e9de51e0fe2a39d59fbe92fb719a13101c1a2b355394140fd1bb6dc3776567fc3ac46b9c43d496861142b
+EBUILD libggi-2.2.2.ebuild 1529 BLAKE2B 24954c7d8d9f3fc779f6840dd3fda3bda764a3f7eba14466875e91de15040dac99db642f0b0a92cf4f14f5bfb5e19b7af083d9e804be740164657f7af3e561e2 SHA512 3f4e4d5783949f2aaed32037955869910d86c180c662453b0b6c93aeb9da7a050e88f19c560a5526526e5f618126c62a82d2f61ab5c0193559b516d5627e7741
 MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..eed2d23eee7e
--- /dev/null
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Provides an opaque interface to the display's acceleration function"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X"
+
+RDEPEND=">=media-libs/libgii-1.0.2
+	aalib? ( >=media-libs/aalib-1.2-r1 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	X? (
+		x11-libs/libXt
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+	)"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
+
+src_configure() {
+	local myconf=""
+
+	use svga || myconf="${myconf} --disable-svga --disable-vgagl"
+
+	if use amd64 || use ppc64 || use ia64 ; then
+		myconf="${myconf} --enable-64bitc"
+	else
+		myconf="${myconf} --disable-64bitc"
+	fi
+
+	econf $(use_enable 3dfx glide) \
+		$(use_enable aalib aa) \
+		$(use_enable debug) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable vis) \
+		$(use_with X x) \
+		$(use_enable X x) \
+		$(use_enable fbcon fbdev) \
+		--disable-directfb \
+		--disable-static \
+		${myconf}
+}
+
+src_install(){
+	default
+
+	docinto txt
+	dodoc doc/*.txt
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggi/libggi-2.2.2.ebuild b/media-libs/libggi/libggi-2.2.2.ebuild
index 49ee65b7e717..521bb6974d00 100644
--- a/media-libs/libggi/libggi-2.2.2.ebuild
+++ b/media-libs/libggi/libggi-2.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Provides an opaque interface to the display's acceleration function"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggi.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libggigcp/Manifest b/media-libs/libggigcp/Manifest
index 9dbbd40c6674..141555607b6e 100644
--- a/media-libs/libggigcp/Manifest
+++ b/media-libs/libggigcp/Manifest
@@ -1,3 +1,4 @@
 DIST libggigcp-1.0.2.src.tar.bz2 365368 BLAKE2B 797b1e739319e3982836ec2a7eb14626ea39c116a593703af4de4486b0f43b4ffad89fb4a5245d50f434a97265651554f450033fa66b086a35c76837227b2d6c SHA512 88187eac6f9cae56a2e4d184c0eed2f46c8e53c8b69143479775330abc3f03b48f463ecc944788daade871e4bedf86948c2dcae714c037f8c1284b1576428b3a
-EBUILD libggigcp-1.0.2.ebuild 497 BLAKE2B 95bed7e2c330f1fe777e53893813e97d31574fb65380c66667d747b35846eaebbe70c2f4ef8f339ca416eef693997d237abf58253ddeca2bd45178fd8c4cf39e SHA512 84df45d7c57cdb272a887dd9d465ffe5cb93e7f5d7ec458b5458178a6c5583b3e786a14a6b4776eddcd4957566441256cdd119d83e9e0b5eeef6212cef2e8de5
+EBUILD libggigcp-1.0.2-r1.ebuild 625 BLAKE2B 0aa3fff7df61e1e3b30cd2ccf0d6c14b3a6699c6a2fa7eae2693b41940cf764bdc194f80e366985c481579a5886d20c00824233dc4582193341092dd7905e377 SHA512 27d0f8807d207c95d735d94de89612f39a798f8c8252153f4797a4d12b8f9b3258385f9bf5a3b2031b3547ed4c41f078f70b31b8c9e27a98f31f78d41f13d435
+EBUILD libggigcp-1.0.2.ebuild 537 BLAKE2B 085097b8c3bb994a0ae8629cf2dfb3970f50aff1b137c01c0f3751e87aa47f968ecd202fcb5f7f1fadd4791cf4a6fdb79d8810701448afe7be6b87765c975364 SHA512 f961d9066175d78b0f5a75b23b14de4871843d7229031cf5f06f6d54de5351889b3cfde234a7bc86f4dd9eb2d1717d38889796ccfe6e824664ca3bb6b84bacd5
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild b/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..f5f1281c5093
--- /dev/null
+++ b/media-libs/libggigcp/libggigcp-1.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Libggi extension for advanced color and palette handling"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggigcp.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=media-libs/libggi-2.2.2"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README doc/TODO doc/libggigcp{,-functions,-libraries,-structures}.txt
+	doc/colors{,2}.faq )
+
+src_configure(){
+	econf --disable-static
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggigcp/libggigcp-1.0.2.ebuild b/media-libs/libggigcp/libggigcp-1.0.2.ebuild
index ae928f370a3d..3ae8950cd253 100644
--- a/media-libs/libggigcp/libggigcp-1.0.2.ebuild
+++ b/media-libs/libggigcp/libggigcp-1.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Library for General Graphics Interface"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Libggi extension for advanced color and palette handling"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggigcp.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libggimisc/Manifest b/media-libs/libggimisc/Manifest
index 30804c4cc20b..ade83762d3de 100644
--- a/media-libs/libggimisc/Manifest
+++ b/media-libs/libggimisc/Manifest
@@ -1,3 +1,4 @@
 DIST libggimisc-2.2.2.src.tar.bz2 320084 BLAKE2B a63c6f3111fe577be4d75483982c4ea504f649b9ccff01ed10d6b40da3e36a5a6c44801e1dbca9f62fba67551c644607d90be0a009e4bc30a95638d822dff30a SHA512 1b4fcc7260d03a7f5f5b1679adec4904284f370ab428c4f3ce1a6ef9fe73b2c9b86acecbcc90a8375f2c271e82a07622782868a353dea55523b8f6a66ed05ccc
-EBUILD libggimisc-2.2.2.ebuild 768 BLAKE2B d7a1f2c1d195513d8967939bd2e57776fc14e004b2a53403f88f0cba3dbc56900f09662556b54f96aaf7c227e3a1d0333d00eba6b7476d150d09705b56d06de0 SHA512 8a1757b03d771b202e38aa3263438fa60937c8d2e6295873c67a529acb25a641b341701579e0b292c98447cc03f6e2acf99cc44bf74c06eb53d6be4549ebd743
+EBUILD libggimisc-2.2.2-r1.ebuild 860 BLAKE2B 372cd3bc4a36996d576a5894dcb7773d54052ed7b34245e36b4aa686d627844a88d39e2f62905f55af59c8e8003296205942c8d419b4360a66e9480ab1119193 SHA512 99c73c728728af794eb10f12d10863a06a3f901471ed3506d73988d81678b4be62ef6f17c9fc3322cfbb5ea1c2ea456555507b7465eda36f790ac7627646f9d7
+EBUILD libggimisc-2.2.2.ebuild 808 BLAKE2B 923be77909f7339823ef204e9a60ab3bdfc4e299799dff6f4aaf7b2127f7ecf01c3eedaceced3238e2ffff17edeac6a7666c5646b335edd3ae6f6a495ecf37f6 SHA512 4aa4eee8da4473bedd39d47cda9f3f213a8c79100cddf78343f331fd8a5fc0cb5aa17b1cc92ef48e005ac7b0670dab63993005d3c64e5d290d8f140f17718321
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggimisc/libggimisc-2.2.2-r1.ebuild b/media-libs/libggimisc/libggimisc-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..d163051ef487
--- /dev/null
+++ b/media-libs/libggimisc/libggimisc-2.2.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Adds support for some special graphical target features"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggimisc.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fbcon svga"
+
+RDEPEND=">=media-libs/libggi-2.2.2
+	svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README TODO doc/ggimisc.txt doc/libggimisc{,-functions,-libraries}.txt
+	doc/retrace.txt )
+
+src_configure() {
+	econf --disable-x --without-x \
+		$(use_enable svga svgalib) \
+		$(use_enable fbcon fbdev) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "X extension for ${PN} has been temporarily disabled for this release."
+}
diff --git a/media-libs/libggimisc/libggimisc-2.2.2.ebuild b/media-libs/libggimisc/libggimisc-2.2.2.ebuild
index 23876dbf158a..abf922bfdd7b 100644
--- a/media-libs/libggimisc/libggimisc-2.2.2.ebuild
+++ b/media-libs/libggimisc/libggimisc-2.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Library for General Graphics Interface"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Adds support for some special graphical target features"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggimisc.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libggiwmh/Manifest b/media-libs/libggiwmh/Manifest
index 304807fa27fe..eac1b8db6c10 100644
--- a/media-libs/libggiwmh/Manifest
+++ b/media-libs/libggiwmh/Manifest
@@ -1,3 +1,4 @@
 DIST libggiwmh-0.3.2.src.tar.bz2 316669 BLAKE2B b14f8df0849bbe6e4a59d2285423238c3409bea3a00ecb066042df095ea8c7c4f75de9c4b3a79f0c1eacd436aae71b67be1e084dd23243dd3cfcaca5dd137077 SHA512 d12a9f158ba76ca8077568cd48f26f0fd8ab561b68cc33e74a8898f7fd594b417cd514806f827a63a4315c546bb35f5b71a5f54f5a2b54562f276e37146224b8
-EBUILD libggiwmh-0.3.2.ebuild 716 BLAKE2B b0f5e1f61d8d9f2d6a1edd20533ea3b03279fe51607f686e64831bf94f24ae98dc36e6d9928c2e981a2e2fc27f94dea5bfa18e09069bd75868f33dc4f5bbb554 SHA512 84aaddc0b71c2563f2794932c9bcfbda310026d50c6500b6db6df0a6a9bac00b5cf3b005f8a3b85d6d1383448d97375894c51fe1db71fd51ea2be0f19dfd09d9
+EBUILD libggiwmh-0.3.2-r1.ebuild 778 BLAKE2B e21c242a10c0c3aa834f1bf40f671331c8f1b0a9db5282dcefb6274c714ba64af60a0a5f42942f001be832c963308c76747475f4032ee9fb321f7b6c42cf3392 SHA512 3cad8908f3b186d14e90dc0726f551a09f44c27987d761b52c5449b613170c6c5e10eddbede34dd65d9403452075a398100466d9eed6e62a4e9e0d3b74307ace
+EBUILD libggiwmh-0.3.2.ebuild 742 BLAKE2B 5619df6c6a13d59149d7b3a6f7f8fd14d81841eaca9fe9794c6f7b9094ef4fc32e2c5494fa7b2e2656707a3fae0cacbd49c75d9f28275d621dfc527005c95391 SHA512 ee93e804304fce560d4dddb8fe05f615ceac8150aeda62b802df02da66125f1efdbe13b77c743f322ca3d2ba673d1abadad2d51d15593f990ea328ce668524fe
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..67cd8c2664dc
--- /dev/null
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Window manager hints extensions for libggi"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggiwmh.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="X"
+
+RDEPEND=">=media-libs/libggi-2.2.2
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+	)"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README doc/libggiwmh{,-functions,-libraries}.txt )
+
+src_configure() {
+	econf \
+		$(use_enable X x) \
+		$(use_with X x) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
index 20e6757cda59..ae533a708091 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-DESCRIPTION="Library for General Graphics Interface"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Window manager hints extensions for libggi"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libggiwmh.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index ab27516aa0cc..155210afec40 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -1,6 +1,7 @@
-AUX libgii-0.9.0-linux26-headers.patch 419 BLAKE2B 703063f622eb6c71586a951097dd533b01d69a9865dff71011708d134798038dadb7c4f3bf3832800340fbfeb338b49736230220240ee06008eafa75df6eb96b SHA512 a6f6d04037948fd3f6d5bedcc28f7eb15f705205e204b767d6bdb30bcdcce289067bb54777a9676228db0269b96ee2ff17600a80ed795661680268f9e7fc91e5
+AUX libgii-0.9.0-linux26-headers.patch 422 BLAKE2B 630d1c98cc2e9b5424dbc41d2453eb1e8780ef46c217a38e4907f37c70dea859952114458d74299255b034ba3ca184b4105a850e1ec0ee1fd4229788fea4ebc1 SHA512 3686d3f33c3b40b24a5258d8bec158eae32ee86a14e98a05dfdff918c1c64f5264c87cb7072f4faa943e5630b2e5969fcc6acb2d9245c0f74e3b7194061f9a3a
 AUX libgii-1.0.2-configure-cpuid-pic.patch 451 BLAKE2B 2a19985eda7c5cafaf40d68b20338193996d18cfaa11639e31ea2c38c3e4eda5808c8efbbb39b46dd9ad2570adabf0195b287c9307a603c2e5497e6f5dfb1074 SHA512 94aa2b1996ac7ccc1275853c72bda6a0f050c79010354d87dd551484c8bf3fb8eaa2cbc6b13620cb317bddc9da938c3106af71e2f0da70f9b62db7e27c404743
-AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 376712dfee05976fb9bd14e5fff31ab59318c963422246165bff8ff7d65ccd497e24b618b8d10477a9490b52fb87e5d297f9dd823696e7fd193c777e5ad275e9 SHA512 bae66a72ba24409222e9836baeca654b88398c2ac5df4008787c649e26ca87c6c0ca86cf703cfc5d16f3f55d3ae182afd3d93793e99797d597b464a940170c7a
+AUX libgii-1.0.2-libtool_1.5_compat.patch 468 BLAKE2B 32d18ef7cfa6e14be36e8eeccf321a988990b3f48caa422ec07988dd8cde0d4c5c1ae7233700c696e45933b56f7555a1b00efd1062be1f4f5d73074b1695cea7 SHA512 c7c2d3cd91ba91cdc60778f5d599f2ee428c3b41a213193f733c4fe86b8e2a778009f8816d6314ad7519e5732065cf51016441306bb05f7ba669ef4000769312
 DIST libgii-1.0.2.src.tar.bz2 701099 BLAKE2B 29e23c4f0b0045e05dac855bba10d03e5b38cc3b2fdd494892c52954b4c4bbd990148aff98540bef73048ae26bab79db3369e7731707bfa4eab2b39d256681ad SHA512 d45b236e08bb8c6a7a7741ae694650dfc5681712a174f923c9132c41acb388d0d6dbc5589104a7a6bc73c98088f2b5967ee726d83c1f3e913602661c8d30bf07
-EBUILD libgii-1.0.2-r1.ebuild 1165 BLAKE2B 996561072a1f39a91689829d56b439d76cc79627dfd0e83f32625267e3786f276b546ed04a0dedd7c750a23a021ed02a585834739b9be3457721ae09a1c7e5f3 SHA512 9fb1072389744b3b7334e373dd8fc4eaae5388b2eaa786666b2eb53ed0c150cc3bde407fc3cc4668faf95f7a72e1ac15347a9a38daad03aebcb50f6fc026946a
+EBUILD libgii-1.0.2-r1.ebuild 1155 BLAKE2B 4ac207317deab100645039dd0635fd754d85d5a87ca549b96d82f90338aaeb8760da250e623fd12f6a0c8759b498ae812ca7d54fd7a85b15c968054d05116ba3 SHA512 c39b140534146d94c2109dd17896e66e31dd4174deb440e83d2d1415fbe2378aff5d6836c3b2103dbe03e172795839a12c604798f7c6ad08606f9aa3bb412978
+EBUILD libgii-1.0.2-r2.ebuild 1268 BLAKE2B 4fee5252b99104efa4b6c75257b138755feab9e29c8657fe5c7a122d2647400501056406435d7b24a03d0c833919b428a979f8736a584c29f40d84bbbf4832ce SHA512 63040b95731d7f12aa63b0fe3990c5741fbe57e80132aa772c61177b420381d1777e75778c5bc1efab2def608c6d1226a3ddbef75f7a0858ad9fc84d079e6598
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch b/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch
index ff77c33c4e9e..f46b6ab8cadf 100644
--- a/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch
+++ b/media-libs/libgii/files/libgii-0.9.0-linux26-headers.patch
@@ -1,5 +1,5 @@
---- input/linux_kbd/linkey.c~	2002-02-23 06:51:05.000000000 +0900
-+++ input/linux_kbd/linkey.c	2005-03-28 12:05:43.000000000 +0900
+--- a/input/linux_kbd/linkey.c	2002-02-23 06:51:05.000000000 +0900
++++ b/input/linux_kbd/linkey.c	2005-03-28 12:05:43.000000000 +0900
 @@ -25,8 +25,8 @@
  ******************************************************************************
  */
diff --git a/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch b/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch
index 851216540b47..f71add4f510b 100644
--- a/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch
+++ b/media-libs/libgii/files/libgii-1.0.2-libtool_1.5_compat.patch
@@ -1,5 +1,5 @@
---- configure.in	2007-01-16 14:52:56.000000000 -0500
-+++ configure.in.new	2008-06-10 15:40:14.000000000 -0400
+--- a/configure.in	2007-01-16 14:52:56.000000000 -0500
++++ b/configure.in	2008-06-10 15:40:14.000000000 -0400
 @@ -12,7 +12,7 @@
  AM_INIT_AUTOMAKE([libgii],[1.0.2],[-])
  
diff --git a/media-libs/libgii/libgii-1.0.2-r1.ebuild b/media-libs/libgii/libgii-1.0.2-r1.ebuild
index 7d9e41b79dbd..043293c47a66 100644
--- a/media-libs/libgii/libgii-1.0.2-r1.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-multilib
 
-DESCRIPTION="Fast and safe graphics and drivers for about any graphics card to the Linux kernel (sometimes)"
-HOMEPAGE="http://www.ggi-project.org"
+DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
 SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..6de82d2c8483
--- /dev/null
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Easy to use, but yet powerful, API for all possible input sources"
+HOMEPAGE="https://ibiblio.org/ggicore/packages/libgii.html"
+SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="X"
+
+RDEPEND="
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86dga-1.1.4[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0-linux26-headers.patch
+	"${FILESDIR}"/${P}-configure-cpuid-pic.patch
+	"${FILESDIR}"/${P}-libtool_1.5_compat.patch
+)
+
+DOCS=( ChangeLog ChangeLog.1999 FAQ NEWS README )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/ggi/system.h )
+
+src_prepare() {
+	default
+	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4
+	AT_M4DIR=m4 eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with X x)
+		$(use_enable X x)
+		--disable-static
+	)
+	econf ${myeconfargs[@]}
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest
index 037fc1536a49..dc5f179f153e 100644
--- a/media-libs/libgroove/Manifest
+++ b/media-libs/libgroove/Manifest
@@ -3,5 +3,5 @@ AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e
 AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0852b36dd30665d655cdb3402c9d0ee1e286bc1a19988f992d8913560f6f943890cb7c993e2fdb798b23df4a1b0801da SHA512 834f760a7c7b51abda55f65d6fad1ce771d293ace9c7e4e39aaf5bfbc6763f9e3750e0aa3e8e6548893593b5c776bce357d557080b946b3425339367f21f2790
 AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac
 DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705
-EBUILD libgroove-4.3.0-r1.ebuild 1177 BLAKE2B 65a597cf4f2564f0fb9fb3800d90e82e6fd789e683e95a63fdc0de13b50dad1a7d71b6cdabfc3b79253bb962d4d07435d051b44e04a83675db355201d48dde12 SHA512 b254cab5750412e33291c7c129f8215533bdfc8a44c575d33302d66dd5c8bda55f4bcb5fac83f75e87db99dba3ca3d5cec5cc5cfb8a44dd44a350bc9c3e24618
+EBUILD libgroove-4.3.0-r1.ebuild 1152 BLAKE2B 8999342893cb791a789a1df0e513815700a083c2c91a2f4c4f551d482284b409013cd3896382754d3e8653ced4131a11eefe36b3be6a93b1aed9a2d3bb10a2ed SHA512 ca437c9ffb94c74c1befdd9dc44d2ce3373788f6c43acbc0baa1f454a212449865b737c359ea9c0c066ad2a51b4258f1ec6f6c40f2d21522ae9ca4c7be62aadc
 MISC metadata.xml 1202 BLAKE2B 4949a299d75c9e9d7bd40df94fbe3fd16c608d0110ddad43fb5717751bb0ed174c7be81b1913ad2313b7b7a8627a3c079bc125e5d50a8a0544ea961e7c89b0cf SHA512 1173c515ba13bec73cd60fc78b5b9936d47563c89cf2968ef49eefca4efa8c75badbc1cdb26cf8cea8c7737e7972f9d236009b829ce5fa9f07875bb7db003ed3
diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
index 9aac876f1dea..f780eb9949c5 100644
--- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
+++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="Streaming audio processing library."
 HOMEPAGE="https://github.com/andrewrk/libgroove"
@@ -14,23 +14,26 @@ SLOT="0/4"
 KEYWORDS="~amd64"
 IUSE="+chromaprint libav +loudness +sound static-libs"
 
-DEPEND="libav? ( media-video/libav )
-	!libav? ( media-video/ffmpeg )
-	chromaprint? ( media-libs/chromaprint )
-	loudness? ( media-libs/libebur128[speex(+)] )
+DEPEND="
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:= )
+	chromaprint? ( media-libs/chromaprint:= )
+	loudness? ( media-libs/libebur128:=[speex(+)] )
 	sound? ( media-libs/libsdl2[sound] )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}_cflags.patch"
+PATCHES=(
+	"${FILESDIR}/${P}_cflags.patch"
 	"${FILESDIR}/${P}_sdl2_include_dir.patch"
 	"${FILESDIR}/${P}_ffmpeg4.patch"
-	"${FILESDIR}/${P}_GNUInstallDirs.patch" )
+	"${FILESDIR}/${P}_GNUInstallDirs.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_disable chromaprint FINGERPRINTER)
-		$(cmake-utils_use_disable loudness LOUDNESS)
-		$(cmake-utils_use_disable sound PLAYER)
+		-DDISABLE_FINGERPRINTER=$(usex !chromaprint)
+		-DDISABLE_LOUDNESS=$(usex !loudness)
+		-DDISABLE_PLAYER=$(usex !sound)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index c96c35baa398..a1385f74004f 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -5,5 +5,5 @@ AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810
 AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
 EBUILD libmad-0.15.1b-r8.ebuild 2262 BLAKE2B 83fc39bdfc1c0b0da64c42f3e46c2a38d627415c37ee04a587e73b5e6cbbb12bde3209dae4132a8057eba9db16439e92c190b42f2708193638d188c7ff729ff2 SHA512 bbb6344c0e0c5d6644d14d09c3c4cfaa9b8837c37e27a16232cd0d10af8776e099ca90b79939a077c7a4f8e86f17171a17ce323240c7c65a507bccaa9537b052
-EBUILD libmad-0.15.1b-r9.ebuild 2213 BLAKE2B c588af11ea6b22a4ac5f5fbb18f85bfc3bdbbd2e7010945c0697823a9cf6c8d9da86b74fb71a5e2192d2b7a9a85934e6429cacd793515758c6f17885e24b9b35 SHA512 f32f57cca05a0abf2d4a237c05fe5178a21c32dc0d41ea14e295e8ebf6a02d5a4967880cf3e7e4964978592aed682d29adf9aeeb6aafcb9bf7d2f688ff58e079
+EBUILD libmad-0.15.1b-r9.ebuild 2212 BLAKE2B e79813887af626d590a748c39c1da72e529154a6d2eaa1b40d5e65cb04d342d4c4df8fbf77092c2f37b6978edfd0b5dede657d3aab3c1f19afd204107714837d SHA512 450b9c5a877d9440ff61dce7c8730f4618f225959b6b1c68e3aabcd03ad08c97d661ca2bdbe735c44493379e7be1e5576c3d0389c67a96b93c8106cf9bf29a43
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 42745664ae16..9d408b7cc86b 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 20574cf16264..132f2efeb894 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,7 +1,9 @@
 DIST libmpdclient-2.13.tar.xz 56964 BLAKE2B fdd393543ac3c15572a6f6d56ec0113dae301c90e852620ef4e17ac6bee1a26eb20580859ea59cb78d6ff7b5b9fc9e5374d407e017c35bf767a824fc7a6612df SHA512 a2aa4e1e4fcb4ab390a0a38e745e59a9764c40bfcd07d449fdc7fef7b0c5fc0c2e795ef545b6fa6d62c00861d306cab41ea43011510ad1e3a60603873a3c1b28
 DIST libmpdclient-2.14.tar.xz 58268 BLAKE2B 0152b34cc29e5c3c96136f00ea5ff3dc1d60f64ab6e8aab2b6ada0fa2d90742b32025be85e12703057a00014d72c035177de03345f9c16e151242a26eee9e314 SHA512 50bf27a739ca784d5f182cc90b24fad4dbc35752e455c1ce7c2fcda78342bac5480927af199c7f790feff136dc1fe16e4eb19803ba5760ec508ba65c9737e13a
 DIST libmpdclient-2.15.tar.xz 59212 BLAKE2B 35ca605681c98d1aa97fb9ef11b8a29244cab7ccb3d5743b5f7e49e4dc3ef28b8c14534ee793af4a76ea5dcb01487804d9f08d6ecaf6d7b80c5b37bf157408db SHA512 244b89f4976b62b41c95263479771162d9c059808aa143efc9fa0a092e110b9be98ce1ab2bb1ae100b15019df826b9a8e510e3819e3fd89f6d664deea3c6260a
+DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5
 EBUILD libmpdclient-2.13.ebuild 1048 BLAKE2B 6339e52139ffea93ff33196139693a87dfa7ed2346dcf8e46be6eb161e77f9da1668f37a748acb0b8ff1004a22d28f917a0ba9f8276b0b1357ff95192b0f0132 SHA512 f72f00afc0e4adf5ce732c58f0da02d13e06b44433746d9b4882e269929ee8bc95484abb12fe0062f625c58931a8d365fbef4c61c7c5e6335798a1efaf703edb
 EBUILD libmpdclient-2.14.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
 EBUILD libmpdclient-2.15.ebuild 1054 BLAKE2B afde1ee289bd6bcb7d8ecfee925d2fe1731305d9d6503645aa855c409e0580c3ef69eff7f026a02fe82e2b89389e50a03d17912538e2df01cf966987ebc11736 SHA512 f621f7c78b0127cca2afb53f94fd6a820aadf20f3ac357bd190cc3cda74bd24d647bf710b1ec1afe5f9c49b9cd113cae4efe914ea3d4c80c9d21999c7bb9b4c8
+EBUILD libmpdclient-2.16.ebuild 1051 BLAKE2B afaea12993515d091fbfbef4a35d20ec5297f5912bacf925fe998aaa21a86e44a05fc74f9e6d5fc06427cb7ee5ff6cc4516c11a82ddc5b11ac4875597e274e5c SHA512 afe1c98f8d2c92da1a1f68280955a464a057a5b630049bcf1f9109cb5d1fc84887df8099df85dd0b1522a694b5b132dfd13e1a4acaa4433830d759ac4811cae1
 MISC metadata.xml 348 BLAKE2B 6c3a4f4924ca11d41c0c7fdcf062dbfd43f23f1181a83d4154a4a36a015999786962adb716f751e046127d37d2b88649b2ea9968330a85ae8f9307a96c7d9f96 SHA512 75efcb39f67cb2dfe31846b08e9daa02845a07006fe2002f43feabee680dcc57bd41a0fed3bbfe9e184892a5adad64efd3ed83931a91b924739355ec689f5b00
diff --git a/media-libs/libmpdclient/libmpdclient-2.16.ebuild b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
new file mode 100644
index 000000000000..0b5cef2b9dc9
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples test"
+
+RDEPEND=""
+DEPEND="
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+"
+
+src_prepare() {
+	default
+
+	sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
+
+	# meson doesn't support setting docdir
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "/^install_data(/s/'COPYING', //" \
+		-i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc true false)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	use examples && dodoc src/example.c
+	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
+}
diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index 572e75e125fc..8fa0ee38e112 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,4 +1,4 @@
-DIST libnsbmp-0.1.4-src.tar.gz 462626 BLAKE2B 20e00640f6e693a499adb087443c565ea29e89d6d70afd8ff0755f5d14bd9123e411c9e50c4863b07e43edb254515c5125a0b091585ffaa7be3231e2f42a02bc SHA512 b3ca907ae59e2bbcc8d26f083b5544589d87403116aaa6000c3527e886ae18841b15ae2d6b014d52d6cf2d62ecd67d22bdcdc9d6f4e2732a39ed7d361319c78b
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libnsbmp-0.1.4.ebuild 426 BLAKE2B 8ebef27cc37329a7a77369473e23037ad62136ff1c60627c01ae3f30e1c47c500ffaf3de9c032856ba28600b57e5ab75ff944ce4f04c102b7749e83127720993 SHA512 e3fd8190e2901422db0f7bb4ccb29ec8f71b14f2810cdc9dfc74a8c2fa45cf7572f60476cab2f4df8be9920faeda5b7c9b851442891c77d9ffc910b7289ba287
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsbmp-0.1.5-src.tar.gz 463299 BLAKE2B a9aa4f682262c4bfb5007c623e3da324f9ce2ddb732737b8217def899e8507ae41589607a1e0b71b34190542981ad4286f64f87795f0043049626c101001fd85 SHA512 2998de98db05a04fb860fdea258961d66aebc78d58614054311ed4cafa2f265472ad19789ab1e343d39ca293e0a304baee4941bd04948d9cc7c39bdadb0756e6
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsbmp-0.1.5.ebuild 514 BLAKE2B 52547b69038b98714b0cee0953a13af5311fbfcefc9efe27c3993c9124a7c5e806355dd9b7182b5a10228bb8778c5529aa5055225e1f09b64e1bce93e38af388 SHA512 ad0e0d1a3659cd55aedf35db47fc5d29029e9ae6b63a8ae6033243cd89f8ff30e71d6e62459b16a61587c975c419fa38fdfad3c59417fbca1e8c34f56e82d8ad
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.4.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.5.ebuild
index 67fdaa9448e5..aef68809045d 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.4.ebuild
+++ b/media-libs/libnsbmp/libnsbmp-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
@@ -16,3 +16,9 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/libnsbmp/metadata.xml b/media-libs/libnsbmp/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libnsbmp/metadata.xml
+++ b/media-libs/libnsbmp/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index d377c53caf09..c04f67aa833c 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,7 +1,4 @@
-DIST libnsgif-0.1.4-src.tar.gz 242078 BLAKE2B b70249caeecf3deb80e16491062a41a70771118179a07e43302203c84dd9bcebbb85ec1dbd3b592141f509d6413e72f86aaf6beaf8a86bc70b97c2f164ad526c SHA512 7b6e57b32d26ebf04cd5c39ebdb9e4dd134caebd7e7e9da9f365250ec320873bcae685b7f1a6099c41ec3ac060ca986d8ebd44fef69a9f726f800d62eb9dbe20
-DIST libnsgif-0.2.0-src.tar.gz 268300 BLAKE2B 21ddbb258113f1b7aead4d5c09dd4a50403bac0e3f12749670d6de64d4505cf53d01f2bde4485036b523b68a1546acd8f7ec67623912ddf2bbe8bba8d666bfc2 SHA512 4c021e91b55c55e9f275c7a2b38de2480a8280853e373cbb6ec19487c5aa711cb5e88c9a244f8656265e25948105740b0032822e0a0c7de1865b6ffb87eb97a7
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libnsgif-0.1.4.ebuild 415 BLAKE2B df8b5f6a6173c0a4ac9ae86053548ecdcbfdeefc63f1a578ad189f3a6ad23dbe63a78d405abf51f311800901240381f14cd64ac57c4e80dc0ed9e50c11b5838c SHA512 faa009d2f31e6d55f60ff98f524f7898fc5f5cae9996b420be6b520fa3f27984e5c5d256ea56f1beb4c583865aec70e2820ab4ad101ae1f4b8756341c6ba9905
-EBUILD libnsgif-0.2.0.ebuild 548 BLAKE2B 023f1ae0a5257597e6ef2d9243857ec90cd54c93f28dcd3d7189c961275b16fa6012113b0ee2e29f9aec00fb8586aff51223542de512a85282b5af0f91af5ea3 SHA512 c206216ab8f1257eb285ac9e190b5f479daf404d5c21bd8a534415a4b735b4d750b280a30dd2a7d10ee0e014644b1da38e339bfc19bc017104656955313d859f
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnsgif-0.2.1.ebuild 596 BLAKE2B 8bcf454dc04e0a1c68f80dde52b7a486163a3bdde3134ae239a1f1501ee12e1ea65bdf4e181be39680b46586929c1bff271b9548231cd545375a81c99e117818 SHA512 2758805a709be3dde95505a09f89d13838758912c826262607231fcb95101a8c01dbaed2f343f2939f7270d24eb671c3001aa74dcaa7cfb23bda7700f060f252
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnsgif/libnsgif-0.1.4.ebuild b/media-libs/libnsgif/libnsgif-0.1.4.ebuild
deleted file mode 100644
index 727a4482a0a4..000000000000
--- a/media-libs/libnsgif/libnsgif-0.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="decoding library for the GIF image file format, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libnsgif/libnsgif-0.2.0.ebuild b/media-libs/libnsgif/libnsgif-0.2.1.ebuild
index 60e45209c367..55c0a619874a 100644
--- a/media-libs/libnsgif/libnsgif-0.2.0.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.6
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="decoding library for the GIF image file format, written in C"
@@ -18,8 +18,10 @@ RDEPEND=""
 DEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	# working around broken netsurf eclass
+	default
 	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
 		-i src/lzw.c || die
 
-	netsurf_src_prepare
+	multilib_copy_sources
 }
diff --git a/media-libs/libnsgif/metadata.xml b/media-libs/libnsgif/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libnsgif/metadata.xml
+++ b/media-libs/libnsgif/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index 4e351da1bf14..b69964835672 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,7 +1,4 @@
-DIST libnspsl-0.1.0-src.tar.gz 299718 BLAKE2B 77e7cf73aa7c270711d400bfe56db0e8fcfb3dd77466fd1d12a9ddfaf8c6be534f44b13bf80589f7b7e002b46381eb184d3f5905b36f1cee842eeaebad00db83 SHA512 de850ee3d94ebcc243c73ee1f8c80f2bb3ab10459023594157876f9e18a27bf13d16417dc68a68a58f34d412b7b607b5240cc28e78b7bcc3027668e3e99f9b55
-DIST libnspsl-0.1.2-src.tar.gz 305693 BLAKE2B cb4e0bafab35049112823bb95216ff3ba5ebb522eefa4e5b7a97ecbefaee52c2670eaef03fc56055cc57081dc3c952d964e6555e359fc1007e1b378922eae06a SHA512 99910674b8685476fd8be995b3436f966f0b8351596eff4152dc9aa0dd795b634b57ba6d17ee866f8947fbb9002f2237936f29ea9c5d9b4ec6a4c7b07c64de44
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libnspsl-0.1.0.ebuild 417 BLAKE2B 7423cc8c3f7886a3f323b17f6912803336de4256b7f45bf656f7278512c51ff13fc6c361f7651cd9e48bf14332a9462408a79723c2cce83f49282e5c5f9ac70f SHA512 a89db3345f6412704e20ea6c69797d8d3f251f37ad6fd504cd3e55c2bc3aa653ee20bef0ea08a4d9692065704f6994d469338378d7cc6eb46d9a6c802d3c1538
-EBUILD libnspsl-0.1.2.ebuild 417 BLAKE2B 0fda39b9d0b9d9c758072919b8bc60e3e9dc895c6b70349979b6ad0249656650ee85c74b740ffc9d64af53ae28c85a4dbf05d13b0d2b82326233a45803ba2e90 SHA512 68f6e7857abe61c414e9d89dc4916881d933bb317056445c2daa48e286fa20208fcac9cfe165de197873d17f5ba88883adc41ef0074e4630cb6cfd63ab883d29
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libnspsl-0.1.3.ebuild 505 BLAKE2B 21a8cf413c9bfec9c96af6f03dd8f858149f7df1bff5a452728b78a4428bc034fa8f480660d76bdbdf311cdc1a3a552703276340b7385b29f427cd8f9774d02a SHA512 c20d17e999d3636b80dfe036aca368e83e45cae4db9e46164878c4c3688ee14a11b57a240223efd46f1f2c716425183dfc337f3e077984c9584212b010ecc2d3
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnspsl/libnspsl-0.1.2.ebuild b/media-libs/libnspsl/libnspsl-0.1.2.ebuild
deleted file mode 100644
index 43ff354386db..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.6
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libnspsl/libnspsl-0.1.0.ebuild b/media-libs/libnspsl/libnspsl-0.1.3.ebuild
index 84dd9c24e0a2..1ed50ca57f22 100644
--- a/media-libs/libnspsl/libnspsl-0.1.0.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
@@ -16,3 +16,9 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/libnspsl/metadata.xml b/media-libs/libnspsl/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libnspsl/metadata.xml
+++ b/media-libs/libnspsl/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 514b42e2d353..4be3af3fe327 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,9 +1,7 @@
-AUX libopenshot-0.1.3-fix-tests.patch 1084 BLAKE2B a3bfa594403f36e37e7cf5078d7975384a5e0af3dd4fb1e2cb20b969b4fa5554e5dd6a8a9a55d7f4e76a23cfb5c9e3f04a01786b84c45dd8854a6757fdc35d5a SHA512 412320163c30bc4ee6e9dbedeebae37d6fcb71023c3513171f93d6108c53df2e0dd6e0e31657f9c16f3206356c876ddb9bb84abf3ec7f036997dbdac43139d92
 AUX libopenshot-0.1.8-fix-tests.patch 1073 BLAKE2B 1ee4f19a3251924c688c49059a55510e620df9f2cdfd30bcd23b32e3cd1b4a8b1976e29837322f3ea1bb74e88a69aab60f6fdcf39747ce1e34a8d76654d6539c SHA512 0adaae336fe5d8a8eaf74b5c0b39eeb6845c54d60d506eb6ba24238a1064c536c0d1e903a673175c3d498bb6c1926a4ff1d3fb1d2d1c6d00dd8059bae3dba157
-DIST libopenshot-0.1.3.tar.gz 11019740 BLAKE2B a706889f709024300ef79518406da861111a8445b5ce23364b8492a72e74e7944c88ba9b4a29da356ca21500253d19e8c32abe7b5aaa0ac35bebec85e52ba970 SHA512 d59817505812868db408a88dc1d30b5b1833910f45dd0df03937110b7d4cbd85a270773008e75a1501f4b3b89a09ea798ed9b580755adf3ae79ac24d403f6982
-DIST libopenshot-0.1.7.tar.gz 11022594 BLAKE2B f3e0836ebb6dd89ce42085dc9d18dd3bce9ab3011550958bec41eead2c62b454459d219d2efeece1a43eb0536cb99866eaf9b478205d717da4c173e954772a46 SHA512 4c8871ff30c03a14766e35a64052695768311afd81ecc55598720ad146f53c122ef3b1293467670f7dd48da77bf6cb4f4f14a18c298a649b8827f901ed653709
+AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.1.8.tar.gz 11019495 BLAKE2B a86994a09328e24705fe06ec3c47cbedb89815e6ec1440237dc58babfc066655f1c7dacc19257b02b645a9415c63cd4e0c1191fa452b7632cf531d98a1b073c3 SHA512 02630d7ce9fd378ad648d034622d4f971728a2074691d7facc8a36dcd52b87c1372dd5a9588c0ba852589105bdbf78941083fd6b1eb1bcc0a33d4ca49634162c
-EBUILD libopenshot-0.1.3.ebuild 2138 BLAKE2B 97297a5c170ad398c4c9df91ba503493f2c335beadf2414595fa29f2bba80e4ab9e229d7b0bb71271e8ed52b5ecccecb9a49d3c326b22baba82baa38193667fa SHA512 7b6b6ae56d2a89d4fc899a989ae567f91269566e8c979a1763a351bd149747d2e45b93b5ef6b429cef9d57eb09830883d6b45e552d8b479e3f9f692b98ccf73c
-EBUILD libopenshot-0.1.7.ebuild 2139 BLAKE2B 1a68511d4bcfe9d0ee5d55a7ebec2ddc36c7ff6d43e527cfc256ad6af6bd5e26203a7de738d797de17fbea0245f67b104a5360b550fd945d24e7930eef5ba48a SHA512 2d6b2ff9d9818b2b59cb55411ab430fe0bb6b56a03bbfbe671f7dc6455ef787807677545534a3c601ce38a18d0cee46ee8a8bc951c0734f5e75dfc3bf9f40a3d
+DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
 EBUILD libopenshot-0.1.8.ebuild 2185 BLAKE2B 34b9556926c8f76c570a470b34dd66d2e722e712a557536b6d7c01a45493eb5e0401962d03ebb9a4633e232330d3c621ba42718fd968f58d2ce755e76bb42f98 SHA512 1c0d40239e19214ac3a0162f75e07180aebb94bf79da82e6f3752a2d5a9cf794a4babeab17fdd2160899a2a60bf46d36292b3f305502238a954adf4872fcdae5
+EBUILD libopenshot-0.2.2.ebuild 2211 BLAKE2B ed168c1fc226da7f3d237836e5225f992f52011ec92175bb6a88862c436b0c8063f218eb608477e169a3ce0051f678a4534d8160ba446b9bec3b1073530268ad SHA512 e320c0ec38d3bf9414bd5c549ad89b3319a3f2a493ed818e43155caf17f76792ee0a669ff12b4786c2f5415140c06ac97d96864bc8e507342bb44f07c8b150d9
 MISC metadata.xml 374 BLAKE2B cc763fd4cda8c70fc654d85ebaa8a3b748499308a4633c6f70aeef1cbb767f5b5eaad0f6c4402a74862e8ebe392b6862722835e92cb53ef4b88a9cc87b2315db SHA512 2a1810910f38b67624eea2d8778c095bbe884cf8a06ababaf595a295d8fbb904e13a809ccc888b8d5956e87a2ddf1295982133741596a08e713f9cbb6a6347ba
diff --git a/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch b/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch
deleted file mode 100644
index 8ed3102b7adc..000000000000
--- a/media-libs/libopenshot/files/libopenshot-0.1.3-fix-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 29fbe45..ff67cb5 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -24,16 +24,19 @@
- # along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
- ################################################################################
- 
-+SET(TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
- 
- ################ WINDOWS ##################
- # Set some compiler options for Windows
- # required for libopenshot-audio headers
- IF (WIN32)
--	STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH "${openshot_SOURCE_DIR}/src/examples/")
--	add_definitions( -DIGNORE_JUCE_HYPOT=1 -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+	STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH)
-+	add_definitions( -DIGNORE_JUCE_HYPOT=1 )
- 	SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath -std=c++0x")
- ENDIF(WIN32)
- 
-+add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
-+
- ################### UNITTEST++ #####################
- # Find UnitTest++ libraries (used for unit testing)
- FIND_PACKAGE(UnitTest++ REQUIRED)
diff --git a/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch b/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
new file mode 100644
index 000000000000..bc5f738d7f63
--- /dev/null
+++ b/media-libs/libopenshot/files/libopenshot-0.2.2-imagemagick7.patch
@@ -0,0 +1,78 @@
+diff -Nru a/include/TextReader.h b/include/TextReader.h
+--- a/include/TextReader.h	2018-09-22 21:47:46.000000000 +0200
++++ b/include/TextReader.h	2018-09-23 16:17:21.212888285 +0200
+@@ -91,7 +91,7 @@
+ 		string text_color;
+ 		string background_color;
+ 		std::shared_ptr<Magick::Image> image;
+-		list<Magick::Drawable> lines;
++		vector<Magick::Drawable> lines;
+ 		bool is_open;
+ 		GravityType gravity;
+ 
+diff -Nru a/src/Frame.cpp b/src/Frame.cpp
+--- a/src/Frame.cpp	2018-09-22 21:47:46.000000000 +0200
++++ b/src/Frame.cpp	2018-09-23 16:21:44.921563711 +0200
+@@ -29,6 +29,9 @@
+ 
+ using namespace std;
+ using namespace openshot;
++#ifdef USE_IMAGEMAGICK
++using namespace Magick;
++#endif
+ 
+ // Constructor - blank frame (300x200 blank image, 48kHz audio silence)
+ Frame::Frame() : number(1), pixel_ratio(1,1), channels(2), width(1), height(1), color("#000000"),
+@@ -904,7 +907,7 @@
+ 	// Give image a transparent background color
+ 	magick_image->backgroundColor(Magick::Color("none"));
+ 	magick_image->virtualPixelMethod(Magick::TransparentVirtualPixelMethod);
+-	magick_image->matte(true);
++	magick_image->alpha(true);
+ 
+ 	return magick_image;
+ }
+@@ -926,13 +929,14 @@
+     // Iterate through the pixel packets, and load our own buffer
+ 	// Each color needs to be scaled to 8 bit (using the ImageMagick built-in ScaleQuantumToChar function)
+ 	int numcopied = 0;
+-    Magick::PixelPacket *pixels = new_image->getPixels(0,0, new_image->columns(), new_image->rows());
++    const Quantum *pixels = new_image->getConstPixels(0,0, new_image->columns(), new_image->rows());
+     for (int n = 0, i = 0; n < new_image->columns() * new_image->rows(); n += 1, i += 4) {
+-    	buffer[i+0] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].red);
+-    	buffer[i+1] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].green);
+-    	buffer[i+2] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].blue);
+-    	buffer[i+3] = 255 - MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].opacity);
++    	buffer[i+0] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelRed(new_image->image(), pixels));
++    	buffer[i+1] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelGreen(new_image->image(), pixels));
++    	buffer[i+2] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelBlue(new_image->image(), pixels));
++    	buffer[i+3] = MagickCore::ScaleQuantumToChar(MagickCore::GetPixelAlpha(new_image->image(), pixels));
+     	numcopied+=4;
++    	pixels += MagickCore::GetPixelChannels(new_image->image());
+     }
+ 
+     // Create QImage of frame data
+diff -Nru a/src/ImageReader.cpp b/src/ImageReader.cpp
+--- a/src/ImageReader.cpp	2018-09-22 21:47:46.000000000 +0200
++++ b/src/ImageReader.cpp	2018-09-23 16:22:32.330865516 +0200
+@@ -59,7 +59,7 @@
+ 
+ 			// Give image a transparent background color
+ 			image->backgroundColor(Magick::Color("none"));
+-			image->matte(true);
++			image->alpha(true);
+ 		}
+ 		catch (Magick::Exception e) {
+ 			// raise exception
+diff -Nru a/src/ImageWriter.cpp b/src/ImageWriter.cpp
+--- a/src/ImageWriter.cpp	2018-09-22 21:47:46.000000000 +0200
++++ b/src/ImageWriter.cpp	2018-09-23 16:22:58.380031419 +0200
+@@ -97,7 +97,7 @@
+ 	std::shared_ptr<Magick::Image> frame_image = frame->GetMagickImage();
+ 	frame_image->magick( info.vcodec );
+ 	frame_image->backgroundColor(Magick::Color("none"));
+-	frame_image->matte(true);
++	frame_image->alpha(true);
+ 	frame_image->quality(image_quality);
+ 	frame_image->animationDelay(info.video_timebase.ToFloat() * 100);
+ 	frame_image->animationIterations(number_of_loops);
diff --git a/media-libs/libopenshot/libopenshot-0.1.3.ebuild b/media-libs/libopenshot/libopenshot-0.1.3.ebuild
deleted file mode 100644
index cc13df34d2a1..000000000000
--- a/media-libs/libopenshot/libopenshot-0.1.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit cmake-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="Video editing library used by OpenShot"
-HOMEPAGE="http://www.openshotvideo.com/"
-SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+imagemagick libav +python test"
-# https://github.com/OpenShot/libopenshot/issues/43
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	net-libs/cppzmq
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	media-libs/libopenshot-audio
-	imagemagick? ( media-gfx/imagemagick:0=[cxx] )
-	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
-	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	test? ( dev-libs/unittest++ )
-"
-
-# https://github.com/OpenShot/libopenshot/pull/45
-PATCHES=( ${FILESDIR}/${P}-fix-tests.patch )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
-		eerror "${P} requires a compiler with OpenMP support. Your current"
-		eerror "compiler does not support it. If you use gcc, you can"
-		eerror "re-emerge it with the 'openmp' use flag enabled."
-		die "The current compiler does not support OpenMP"
-	fi
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://github.com/OpenShot/libopenshot/issues/17
-	use test || cmake_comment_add_subdirectory tests
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_RUBY=OFF # TODO: add ruby support
-		-DENABLE_PYTHON=$(usex python)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	emake test
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-}
diff --git a/media-libs/libopenshot/libopenshot-0.1.7.ebuild b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
index 4f9643afa9b0..4b0aeae13e16 100644
--- a/media-libs/libopenshot/libopenshot-0.1.7.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils python-single-r1 toolchain-funcs versionator
@@ -25,8 +24,8 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	media-libs/libopenshot-audio
-	imagemagick? ( <media-gfx/imagemagick-7:0=[cxx] )
+	>=media-libs/libopenshot-audio-0.1.4
+	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
 	libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] )
 	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
 	python? ( ${PYTHON_DEPS} )
@@ -37,10 +36,11 @@ DEPEND="
 	test? ( dev-libs/unittest++ )
 "
 
-# https://github.com/OpenShot/libopenshot/pull/45
-PATCHES=( ${FILESDIR}/${PN}-0.1.3-fix-tests.patch )
+# From Mageia
+# https://github.com/OpenShot/libopenshot/issues/60
+PATCHES=( ${FILESDIR}/${PN}-0.2.2-imagemagick7.patch )
 
-pkg_pretend() {
+check_compiler() {
 	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
 		eerror "${P} requires a compiler with OpenMP support. Your current"
 		eerror "compiler does not support it. If you use gcc, you can"
@@ -49,21 +49,26 @@ pkg_pretend() {
 	fi
 }
 
+pkg_pretend() {
+	check_compiler
+}
+
 pkg_setup() {
+	check_compiler
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
+	cmake-utils_src_prepare
 	# https://github.com/OpenShot/libopenshot/issues/17
 	use test || cmake_comment_add_subdirectory tests
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RUBY=OFF # TODO: add ruby support
 		-DENABLE_PYTHON=$(usex python)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick)
+		$(cmake-utils_use_find_package imagemagick ImageMagick)
 	)
 	use python && mycmakeargs+=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
diff --git a/media-libs/libopusenc/Manifest b/media-libs/libopusenc/Manifest
index e8ddb2eb2c0e..0bbf31421700 100644
--- a/media-libs/libopusenc/Manifest
+++ b/media-libs/libopusenc/Manifest
@@ -1,3 +1,3 @@
 DIST libopusenc-0.2.tar.gz 388027 BLAKE2B 5822d09ec56ce9dc0182241e7182b71c9c21def5645a2ef3472af380b25af1b1f8a08311c2cfb8bacdfde845dff81ee426401f1ab098b6598e41e664ccaf9c34 SHA512 82b9a60bf6fa0c8bc485b221bc633456245f8909875fb9e86876076bc37857d53a366bbc66f2e1e331adddcf12c4d5a29f0047e21d0fae2f8bd8a3199bd6f78f
-EBUILD libopusenc-0.2.ebuild 617 BLAKE2B fc97085948053856b22956a8d010c33b2c0b14d8ca025463db0bf61807540d1a9c2db5b795170e9c6ae613b331438db552cfe73785a8029034ef0ebd86d1c0b8 SHA512 e5fb8ca1e3d34e2c1b27189f1880087d67b41e5b0673fe634fdeb401a23bed7b4b036020d16610fd7111ae964244710438afaa3f7989210c8ea931824d4e4e4f
+EBUILD libopusenc-0.2.ebuild 629 BLAKE2B e96df2a2e4f82998005c081c499ab97c94980b89be20521a2a6a296afb2b8896dc4543817139e0a1b613e1461edbe63624598061dc02809fd31bee6da4c3bf5a SHA512 9e387028b5f40c4a0d4423eec21a6542011fdb923a9b27d9309b42874dd257a3a04c63293e965258648040ad8259ff4ce6b003844d9b7cdc3ed104de528c74de
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libopusenc/libopusenc-0.2.ebuild b/media-libs/libopusenc/libopusenc-0.2.ebuild
index 473b64aa39d0..a75cfdebe970 100644
--- a/media-libs/libopusenc/libopusenc-0.2.ebuild
+++ b/media-libs/libopusenc/libopusenc-0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 BDEPEND="
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 3308ea055898..9a5bf0ea0b6e 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -6,5 +6,5 @@ AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
 EBUILD libquicktime-1.2.4-r2.ebuild 3879 BLAKE2B b464fdd272c974633dec17eadd38dc0f295ba81a63f8233d55767b63e31e0bba7670f27a8e04f47ecb8f367702249621834eac6f4a7346b41fa188fd67908d86 SHA512 4c5c9bb52ad4826871f7acb45fb00c90e603465084dd375b85b07a412dd59c43b9aab791350d14579d1dd29476389fa49d4a98fb4a517a595aa396add5e0e529
-EBUILD libquicktime-1.2.4-r3.ebuild 3847 BLAKE2B fabeec02ba29ec31cbfd774438ca4f4821b20259fff311883d3e266695e9e69beeaac99dc4c521bb10c7d62c60a6cb341f845f539004720eee9a57e07d7c44ad SHA512 f43fe852b41829bce1c8d04a1e541c889694c9c9ff46f77923c269bd0a925dfee0c874b85d7189ca4bfe0df1c741c02f97599c308521f28c476e2aefa3ca6563
+EBUILD libquicktime-1.2.4-r3.ebuild 3843 BLAKE2B 20df361f2ac990a3ef8f730e76b68101a27fe6bedc1c1a6f528eef47aa381a424beae2a93498f27f0eba702ea8223c2c03127ec4c61177384b58c008a49da619 SHA512 bbb80c9a5c057bfbcca25c7d2906026696376a4ccfe7cc32d5980900082344518e5596d8029c7d8111a2b5bb25faac93d3ba94442ef7c335b86907431b029812
 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 93fd2e6a3bd8..27006b45311b 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
 
 RDEPEND="
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 6de12efe4bfe..fd0ffb95617c 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,11 +1,7 @@
-DIST LibRaw-0.18.11.tar.gz 1283643 BLAKE2B cd217a0c40d0f30ff95968c5238ad349d32f6ae44aca3847b32c236e8e82e7ff25ba5d6bb0cffe8d73b288239830982d074a306b682160bfe8c73b0df9fcff09 SHA512 4d114bdb589c96d95f646b1d016cfb9546ea7a53b9f23af1dc5d0e38cb4d1b2aa7270f2d4dbe7c6c323fb7f21403914a0bb75afa7b6204d0a99c72ecf0c812c9
-DIST LibRaw-0.18.12.tar.gz 1283491 BLAKE2B a0e23bf58ecf331ef52e529be5dd27acf8458d1a6de700b36df6172b7cfde2da62561e29c197bc360237b12c7a427b1d07a0c64862fe1cead461a6989e488218 SHA512 8fcf1e24295457f09a654a14d77869ca401a21e9f4386d91fb0fd5bc9aa20a882bf490a64c183108e645b5fa70401f97868c83837a057cb707f58fa31a417d44
 DIST LibRaw-0.18.13.tar.gz 1287631 BLAKE2B cb335dd21b897222a80ae7b486d751a080dafe93d9c4ce72ad337bc724707831a70428323027f5f343c4b0ff08820b6f68553436240a85d115eaaa30b6b0c269 SHA512 80e6ca48b00176e7c4dd21d8249c60e71e987c01e719abc3bda8b859645301b9dee4bb365bbcb79cbe0067220d3b966add4757b35d4b6ada0a59bbdb29925254
 DIST LibRaw-0.19.0.tar.gz 1300662 BLAKE2B f182f1fd7d02eaa34f8b8e2336cbc59cd8c3345cddeace2ed305d048d160bf8d6ecdf04129829b3202a16e70d987a5b2a83c036ec95d1b7b6c748dbb5b46271b SHA512 33d0e9a031add901bdd10ffcde6a0f7837a4f4bec0bbbd21ad661e518dadcb1699133f17b3b2f6cd6cefe87ef3017cb7e1b816c4ce3dfebaaf5d9b2ff6b65238
 DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
-EBUILD libraw-0.18.11.ebuild 1843 BLAKE2B fd6d9bd5537532bf7fdb2e2f2665b3cb9915dabf8f07677ead3c44e53418eb3440d1a86fb4983834d436316c25f3a854066511c66e7b7352274e73e0ef1d2fd1 SHA512 d2793037aea9672d99ea1d53f4b8b8a16c62b0a0aa74b8d470b207a1b2a196640ee93bd630a7b987fdfe34b49f9f63f514fb73adc7573764d16145784b9acf46
-EBUILD libraw-0.18.12.ebuild 1850 BLAKE2B 3ac45ea0a2adbd0e593bbe72ce9b2d8ced1a0dcda0bf327114f0a3e7c9d7158928e5de593e2150ce78bbd260d75cfdcf2c18d198ca882ef6516fabca0256813b SHA512 e2aa30b3a5acc40416f04aef1b15f74c9df5c3772e78844bf7f99706c244c6a1dcbc85b7d20895f48a7e12ed3abe47424333bb8dd5f9f19e827b8fa5192a5b1e
-EBUILD libraw-0.18.13.ebuild 1841 BLAKE2B 5c119ff15b7f58f665ffb2dcf150b83ce2b37c8fcf48a4f04b05a5e784445ed755dbd824346b4fed7dad6fb49626ed57cd6a82d67bcd685f54d3632216440d59 SHA512 db2e44241d73c9ec2872fc35a91e6d4954dce90db9d7bb84f21fa0e70221f877319774a04a04b71f9363924ee76863a9bcdbe1da1b6aee8ad09e77361d9c07fc
+EBUILD libraw-0.18.13.ebuild 1840 BLAKE2B 7b86c52d8ae048f2287455ab34ed05a69192ceded8f8a68b97fda2647517afd90983b5b45991809d87cd7d219e11087bc6a506f00749d0a4719d2451ab85b562 SHA512 9681595927e116f9b97815745b097219c3dfac4fa3020ddaf2ff320a9315327d3e02fa2964b468dde2f981035516e2ad49e8e6cdd69221841011f54764dfa90c
 EBUILD libraw-0.19.0.ebuild 1448 BLAKE2B 4506ca95f728795307d7d18673569cf10e809ba4003247f3f017570d16aa8678953c8ff261315bb251d6d31a6e3d687b5f9537e33f404946fa78894365df0711 SHA512 bb628315cc48d486a336213c82a4e959910aa33acd5037dc00fb0f8674fdcd4ac9392759d53f345f13e50ce5eca162961ebb5cbcea9edfb97c601cd9fe613598
 MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
diff --git a/media-libs/libraw/libraw-0.18.11.ebuild b/media-libs/libraw/libraw-0.18.11.ebuild
deleted file mode 100644
index fa6cf6a88c19..000000000000
--- a/media-libs/libraw/libraw-0.18.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-# demosaic package sometimes doesn't get bumped.
-# Otherwise you can set it to ${PV}.
-DEMOSAIC_PV="0.18.8"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.18.12.ebuild b/media-libs/libraw/libraw-0.18.12.ebuild
deleted file mode 100644
index 6412dcbf97cf..000000000000
--- a/media-libs/libraw/libraw-0.18.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-# demosaic package sometimes doesn't get bumped.
-# Otherwise you can set it to ${PV}.
-DEMOSAIC_PV="0.18.8"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.18.13.ebuild b/media-libs/libraw/libraw-0.18.13.ebuild
index ed73dec8a403..1510fc0e5b09 100644
--- a/media-libs/libraw/libraw-0.18.13.ebuild
+++ b/media-libs/libraw/libraw-0.18.13.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/librosprite/Manifest b/media-libs/librosprite/Manifest
index 29c3b4baa080..8e448b81fbb2 100644
--- a/media-libs/librosprite/Manifest
+++ b/media-libs/librosprite/Manifest
@@ -1,5 +1,5 @@
 AUX librosprite-0.1.2-Werror.patch 393 BLAKE2B dc5794093ac33e7b65ca42a9ab4dd967cc44b9c8e890d404021f995cbaf7fe83be2549377c503dc8d7b3dc692f3a48eeffcd1709d9cad840b4f9522b4b9fab15 SHA512 1f72277eadc2c958ff58c9a23e78bf5a8198c76502cba45e5619413f3dba4243e7a5f8650a11436cc87dd9e63257a874cf8b1805b4dcfe5f3db88733ff08e1fe
-DIST librosprite-0.1.2-src.tar.gz 31146 BLAKE2B d6a949da48e75e0d42187a6875ab9eef019e5d75c09fff5ef362ee84272a12d9025a875e93d83d90903df9b9ed1d855443943fdc4bdce5643ea598f2ea98d3be SHA512 7b668ba618e78604ff6137b202feeb5e191aed11e0781e10cee4d70a218d894ec5d95ac3a2bd0bf3517d0bc1096d2e8e8d021246596ffbe7ab8ad0cebd92eb6c
-DIST netsurf-buildsystem-1.3.tar.gz 37906 BLAKE2B 38612b1cd013baf20da71a6b529252cd1fb5468916cf840463e04b38ecb7766d175a8b030a10987eccb740ff049a8f85990cbe1d3fbc15a97061e9ffe31836c0 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5
-EBUILD librosprite-0.1.2-r1.ebuild 409 BLAKE2B 77dc6660f8f079d432231312ddbb3b0f4167b053d9b9acd4455077e9dc826e78899ad4bf0b8de500981627e459519b4640e4b3c768c62c952e7ad85011a7e533 SHA512 45f8ec8d30f456085fe590d7e99099ab7e08780886059e69a076f39fe795310f84590198fb37557aadfd5990734bfd426f39b7566edfb7bc20640d60543bd695
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST librosprite-0.1.3-src.tar.gz 32816 BLAKE2B 553f5046eac8b7de5940e812103a545ee1d599bcc30d4fd6bb14449e0718364132e76e3992b224d0d2dd3c7582100fe6d9e4d433f245a89b23e3f15542329e0e SHA512 ab039ab12df7f527a86a76247bc5cb70ebe550591f81a1b987abef73fb3c6bd25c9a36afe17bd6717f4f33b1a133d847bb5acad53057aa3c406efe4ebcdc601b
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD librosprite-0.1.3.ebuild 504 BLAKE2B fb4f75e7d876b2f57f90657ff5de5fad63e3390d85a07d62dfe0fc2c7a6b88a371b9159a141c446ffcc218353dbdc0578db085350f1061ef2640e9a578d6c8ff SHA512 d2604e5c4f9ab6744d807e40af1349c01aae3c3eadd27818a4aeae508ac994444f849124bf9cd8e3fa5d9ba0204995d055003554b5efe341bc8f09daadb9ef3e
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/librosprite/librosprite-0.1.2-r1.ebuild b/media-libs/librosprite/librosprite-0.1.3.ebuild
index e82ee2074a6b..1f18c60fddd5 100644
--- a/media-libs/librosprite/librosprite-0.1.2-r1.ebuild
+++ b/media-libs/librosprite/librosprite-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.3
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="framebuffer abstraction library, written in C"
@@ -14,4 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
 IUSE=""
 
-PATCHES=( "${FILESDIR}"/${P}-Werror.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.1.2-Werror.patch )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/librosprite/metadata.xml b/media-libs/librosprite/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/librosprite/metadata.xml
+++ b/media-libs/librosprite/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index bc40387608bd..abfaf10a236d 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -3,5 +3,5 @@ AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab
 AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd71b58fb53ff6e5efce8486e5009d05babff6fd5ee46e46bcea7386555bec0078d894fe81e211844fd6a366c855e2d72799932 SHA512 fdb54d6a8ee1fa1596dad2cf16cb389038167e4ccea123f68e54bd096600e90d86de254667c7dfc46f80ca62edae9f0f47fb3307c72bce5c142afb146870a9b1
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.8-r1.ebuild 4742 BLAKE2B 333677b4ed0a69eb34ba2a6d2da4140e23009d9780bfa297e0c85f74da31fa68ae964b68423232bfad67d34c8dffee86ea5de2db88cf3135fd2631d029aa56aa SHA512 99400ab240ec25f85f5b0a549a0d56b6b96d600ad9705e68af99ddb717e542a140eec7211a5435b5a1169772efa169581f32a8f6b1c758cad0a8aa70c7268c24
-EBUILD libsdl2-2.0.8-r2.ebuild 5261 BLAKE2B 373f185ebda59076e6f7a9894304270a2620d0dd761ea5126a720040f20fa83606fc82322b40780e9d19dca33f7354e509f511346418953b1fd2cde069fcfff9 SHA512 14a678416cdf94db65483d4c5023c1ada0cd287a6f4edd679d2180f90ffc363287f74f6ec284f01c2b8e5c9a31aba2b42037af7da101cd46adeef33c2da60e41
+EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
 MISC metadata.xml 1602 BLAKE2B 600168481346aa4a72024f35a35640f8c415aa38f6c337a9995cd61c1f0c438fdd533dcf50b2506c7b3e638f9144295037df69bdcdcb3fcdd0821358caef2984 SHA512 c16d7e97a45a8897c806ef6087242710c95a0602f858947bf68c240075fbdc69ea1ae4c46eed567341f493868b94e1b63160a8b2cb1c1d44da232273c9f46001
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index adab5ba5df21..27ba581990ae 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index 0e0c2874009a..77e4f36a6a95 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -2,9 +2,8 @@ AUX libsfml-2.2-no-docs.patch 432 BLAKE2B 617c83033c6cafc6455937f1a7a149b73e31e0
 AUX libsfml-2.4.2-no-install-extlibs-mingw.patch 3417 BLAKE2B 4619083ec961ba9da52a3db4d77b157c4bdc1f2c08ccdd3c487e729b14551d0043fcbff3e5dad2d63b269b961f315e2930b082afd5f5c0c7aa372e60391a2bf0 SHA512 8239c021143d7e5ce9ae33d3a3c639b8568fceafe900f0b9d70221402a2f38ff7b5c3a297ffdf8aaaebef7d379b1733749d579f831efa3c85ea252b57721e8cf
 AUX libsfml-2.4.2-pkg-config.patch 9244 BLAKE2B 7b5a2bb09d268ad5b5c9686874bb585bb33e11937b3467318fffa89391d1277d21e66d23ebbaf1690f46316fe0569e4b44f84e3d0e884ad2cfa2724e36852c6e SHA512 6937bcee330961ec578947791142012a9fd4147251a603ec0ee0de47e8dd23122fccc437ed191ccf65a81b385ce275e717c5a524003ad56137a8c787d9c91aab
 DIST libsfml-2.4.2.tar.gz 24576150 BLAKE2B 05d1c06cb360aae6ec8a53225666119168075ab61dd87fe86a105f2c104d21b5897c4b35e66f5c0dae7193697437d168a963c018e3d39bd7b8b6bed957a63d94 SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972
-DIST libsfml-2.5.0.tar.gz 22864874 BLAKE2B 69f3a98e6db2cfbd6208167cd9cfaf92d980a7da878b026a12db646cc3638edd237ce61c123934c8169f7bc204cca64618aec89c51e7667aef03b6c72ee84a63 SHA512 94306dcbed7d68bb7e226cd91e25950a07bcf393988c4bb79f9de3555c18c78cae4573e911235f712e711a7c02a614bf370df32b8d85240d2f08142327e05076
-EBUILD libsfml-2.4.2-r1.ebuild 1634 BLAKE2B 408d034ee53e9af9fb7d8c7aa5c33e8128936a3b0f6bd8e7f817928859540394a742b0f5c6f8e68c2b779e049788fb76d814884931ca679c6c961b551926a11e SHA512 dd31edc609d736d771ce2a192942cbbb1aba37655eec6e2dc9de93e8d8f8c8c6e012420c7ed764ebe4b00b25907a03e4584d74bf438f228cfb47aca4bcfc5add
+DIST libsfml-2.5.1.tar.gz 22868556 BLAKE2B b6c70b75a778ffeb141438153fb1e5693c3e92e277919b8f8befe98f55dfd519a67c86504bb5656961b947fcf60758b16a18d5a4ae7585c7c5256f327529ae31 SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59
 EBUILD libsfml-2.4.2-r2.ebuild 1678 BLAKE2B cff23c8ef3b13eca3cc957cdb0265ba80620e6a33530a2bd82d31dce14181ce6e8ec647c88053bdcdefb507faf0adab52a7f29c5af0fa3e90e8c65b8e54947ab SHA512 e12981574f9a6a9969052333854f00f9639ec76b5f13aaefbad7130d68d6f5f1563c4ecf7ce27eff392e84019d91b7706e549381624c34ce49ef502e28c55b7a
 EBUILD libsfml-2.4.2.ebuild 1488 BLAKE2B 7823ad6b11566f9b2587528851067098d504db7d7862d5efe8fb57018fb56ddfe551e5467b057f8f85f0778e700424379b7cf146d1c516f1528e6999df206c7a SHA512 250f27afd60470dc9667a504da415621a63cb9f71c23ec64557c7407f683871681e5e98b023984425ebca57b61583a405281cbbc343dae1210e33b02051c75ea
-EBUILD libsfml-2.5.0.ebuild 1542 BLAKE2B f01dee0d1f48b22c899c78e447a0bae319c60bd9ccccd1adb27b79741a2cabb82d8113287865593df8bf4fa182bebc71d4706b56063f58e573b3a5b6b6bb6c5d SHA512 b96ffecc688504f0e67e9cc76813413d470940d22e798d8f1539a980d9453e9e3a3d56e6b6724de11b90d2fce1598657d0a2eda8ce23bc6c7d578ef9394be1e9
+EBUILD libsfml-2.5.1.ebuild 1535 BLAKE2B ed68f15a69a922c85b24967aca0a2f97e864dd1d3723b02e397efb725798a1e34e28ffaf01a0008a641d054d4e218fe1362b55ab7a8f94b5efae54f309f77427 SHA512 0db65cf914903dbfee593dc25fb80b7f0315263e670f57e4712d02b8442021239ecdd36c7103456a1076483d2c2f84dd9c5c76e1570100bbbc36a6aba4dd66f0
 MISC metadata.xml 732 BLAKE2B 598678c33da33373a1669f4b9048b95503d9c430730b571b985e4137e034e5104dc509cb0a6605834ef463c6d6438b25bd2bb06ec6ce41d7e1c52fbef7219e3d SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2
diff --git a/media-libs/libsfml/libsfml-2.4.2-r1.ebuild b/media-libs/libsfml/libsfml-2.4.2-r1.ebuild
deleted file mode 100644
index 7057c2f13469..000000000000
--- a/media-libs/libsfml/libsfml-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-MY_P="SFML-${PV}"
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	kernel_linux? (
-		virtual/libudev:0
-	)
-	virtual/opengl
-	!kernel_Winnt? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-libs/xcb-util-image
-	)
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( changelog.txt readme.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-no-docs.patch
-	"${FILESDIR}"/${PN}-2.4.2-no-install-extlibs-mingw.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-
-	find examples -name CMakeLists.txt -delete || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSFML_BUILD_DOC=$(usex doc)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-
-	if use kernel_Winnt; then
-		mycmakeargs+=( -DSFML_USE_SYSTEM_DEPS=TRUE )
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.5.0.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index ad093d203a3b..d7b28cb87d90 100644
--- a/media-libs/libsfml/libsfml-2.5.0.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit cmake-utils eapi7-ver
 
 MY_P="SFML-${PV}"
@@ -25,9 +24,7 @@ RDEPEND="
 	media-libs/openal
 	sys-libs/zlib
 	virtual/jpeg:0
-	kernel_linux? (
-		virtual/libudev:0
-	)
+	kernel_linux? ( virtual/libudev:0 )
 	virtual/opengl
 	!kernel_Winnt? (
 		x11-libs/libX11
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index a2b6864b3bbb..99c49f06a93f 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,6 +8,6 @@ AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 EBUILD libsndfile-1.0.28-r3.ebuild 1755 BLAKE2B 84df10cc6ee06a0604c0a764a41c3aec77aa78d8c500f79333b39d1f3948850ef9d508b29d3329927fdd967b74b55f916d59a6be40c9b5a80cd20dc4e0030027 SHA512 827aeb22ee8219e15501b6b5e3695989ec23afc6dbc3655a95369d8ccefb3cb63af36abb46429b6610283cb730b1aefee06225127ece017331cfd3f41ef9ea0d
-EBUILD libsndfile-1.0.28-r4.ebuild 1882 BLAKE2B 8dc9b02cc32ed2f5626a2bcb1f7740e33bef58610e94146d08eb7ed41bc8bee5b8cb73685d59c0a86cc33bc11ce6cfa9ec889b21262bb90641cf4478e0fc8c41 SHA512 8b824843434bdec455fbed944a9fb9ba1b40105b21ca94dd8f29dc8733af981e9f5fbda2ab071f8f812603f23d17199327a88d541bde6135cd8e512234f3f3a5
+EBUILD libsndfile-1.0.28-r4.ebuild 1881 BLAKE2B 20c85cf60b86d6f5c6f049a06b5dca0acb93cba0ab8e71491d37f62d0a88da8bed27d21cbba82439d1722b2195d1880b808f8d1d1bbcf26118e2df3427b1a7c6 SHA512 d786771e152074b4be26d531bf8975f55b210798a6c4688e2c65f7db054d4f1248a1f1f4cc41896d8e3b5536faf9bbdabd29eece6ab4611af2539914dd85cade
 EBUILD libsndfile-9999.ebuild 1772 BLAKE2B ca1c5369618ff9a92681c7899722248dd3c2ac13960838f8e7eae709dcc0ddbe2ab7ee935de136e409c5b96f2899c54959b90512b7d01491b062e66146b33e01 SHA512 82049c5932e75b23d14909128b3d051da1857df7d96059b2035d24940641aad37c6e00a39868bae417114fed754744a1aecd7dcaaa39da9143f97553b6e41814
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index a4b36932a335..c2ff18be5f4e 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index cd36aa369257..9d4450690694 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,5 +1,5 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
-DIST libsvgtiny-0.1.6-src.tar.gz 760475 BLAKE2B 69b991e92ad34ce39b40c49ffda88517a737515c6f6f6a3525786e626ec4148c5f66ab2edd09bbd84e38f6a7646ad05f25055a5316f7cf9bab77fc619cf27f84 SHA512 d8c2eaf2bc11b3e054ef2e8181da816aaa1fa45a537574541d174eb9ad23d452e85179c3f2232035f133be1497b080bc0494d080b77da1eb4112c19fbe712928
-DIST netsurf-buildsystem-1.6.tar.gz 38204 BLAKE2B 58ac4aa2676c019a69b53f5115c82b522aa7db7b2a039a36f227b06b1d031ddc1eed463b09bfd13aeabddc421b2de396b58f2f8f131c261d5633fcd7a85272de SHA512 65ecafb54fc79107cfdb0fbea6acd4cad1fc9f338dde2ed9a48de066e245b7804a16337769c7602c7ab96b0d7544970f533d8c4615913c09b5a9ca4b9386fb28
-EBUILD libsvgtiny-0.1.6.ebuild 626 BLAKE2B 429ea531638edaaa5edbf91811b2be9067052989d3f48232b87c63b2deaf3d0dbe4c8260f8dd95f1d51d9c71646c39ffe244c266c6439c57777e25c3cfb5b8df SHA512 c2552ab6c41ed2ee105bbde786d579cb9dc2831f8bb67fb85a79e411263ec47d0eacfa88150c0b58599a458c84f61692fc138e7c318580311f2a60f5ba8d4f97
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libsvgtiny-0.1.7.ebuild 714 BLAKE2B ff3ab89b720b2bea1a1d631c49f96546c2fbc585b6b9f81392028e09137092a188bf1001f712e62062f4f18c2c4010d8043174ab4268061c25f074fd3c941dbe SHA512 c7b0453507792fb57b8ac5867580ae5c4e6bdbe261505135e52d3b67f354d25447bf9550fc80dd433e78e7c1dc325941d3a5633365eb91d2862f2255e6d13b7e
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7.ebuild
index d69b7dcc88c1..c0ef6c188573 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.6.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.6
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="framebuffer abstraction library, written in C"
@@ -21,3 +21,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.1.3-parallel-build.patch )
+
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
diff --git a/media-libs/libsvgtiny/metadata.xml b/media-libs/libsvgtiny/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/media-libs/libsvgtiny/metadata.xml
+++ b/media-libs/libsvgtiny/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index f160a76eb13e..8c51cae798b4 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -4,5 +4,5 @@ AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b4
 AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
 EBUILD libtheora-1.1.1-r1.ebuild 2281 BLAKE2B 07dddc9f1faf461c15a81ce1fb8d6026c0de6d103589e7f1baa61370e890b5a5fa5b467667e8e53c87eefbb865e4cf4b09ebdca843e61b1b57e82e5d32e40597 SHA512 931f75c09195a979b830a824b053db327ae5e52bd5bc5da2b23d3b1ed0acd1ec1a862b9a68d0582143e2ef0d4a4b72848454ca365b59f780f6e8bc59f16de1b5
-EBUILD libtheora-1.1.1-r2.ebuild 2376 BLAKE2B eed6fdbb48d80f705b3271e4fe8d5accdbce6f3526938ea3251505eaad06fd0cefd250b6699de47aeeda4c2d7fe8ada671f1cd96bce5d2442bbe7a32b442d2a6 SHA512 7cdd9a27c6813303296eeffd7d837890a2484fde67ad05f70db374d66ef0401ab8dc4aa6397363d01631b7d6c3385db89c401be1e5f979e22166c1214cc0e59f
+EBUILD libtheora-1.1.1-r2.ebuild 2373 BLAKE2B bb8dc1b6f75bb03cddc2851191faaa6c8bd8a9d1bd828d132f0aee4b2cefba82cf6cab568f26bd22176ba6d6c973935ed60d2a4e4575c2627c3a7a7345706ca9 SHA512 1cf38a45eaccf7e9d2150429a7ab8adeb89586496ceb64b8270fb8fac86eb0b40b5e04a8d10b1b3c15635c1b661076adf57bfd8054850590243fe1b86b86078c
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index 2ca7578d0ec0..c3c7980cada9 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895
@@ -78,7 +78,7 @@ multilib_src_install() {
 		docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		install
 
-	if use examples && [[] "${ABI}" = "${DEFAULT_ABI}" ]]; then
+	if use examples && [[ "${ABI}" = "${DEFAULT_ABI}" ]]; then
 		dobin examples/.libs/png2theora
 		for bin in dump_{psnr,video} {encoder,player}_example; do
 			newbin examples/.libs/${bin} theora_${bin}
diff --git a/media-libs/libtxc_dxtn/Manifest b/media-libs/libtxc_dxtn/Manifest
index 0a4c839e9980..425a83073a6f 100644
--- a/media-libs/libtxc_dxtn/Manifest
+++ b/media-libs/libtxc_dxtn/Manifest
@@ -1,4 +1,3 @@
 DIST libtxc_dxtn-1.0.1.tar.bz2 214038 BLAKE2B a342bda7375dcbd4001adb5469c90a043fa039bc2505c9cf717613054b494fea9054136b25ac80b016c62aec248085a60ab5e71190cd5c2d90941bdda6408d16 SHA512 56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479
-EBUILD libtxc_dxtn-1.0.1-r1.ebuild 888 BLAKE2B 4036b3d209131cb43495b342701142c745d9943ffd008f2a47e9b70bf1a77b3e870768ea98cdba83bcd3d77a9c754f9f3bccaae7d64c4344cac5babd5c2f87f7 SHA512 aa78415fc9c1bc06f8dbda9413dddb1b8d2ba7fc624cdba37e306db49bc87ff3112a06557aead9417f4a26bf9cf37857048165e2a8af6fc5823e341bdc2627a6
-EBUILD libtxc_dxtn-1.0.1-r3.ebuild 970 BLAKE2B 7b461ab1cb74f21fb4eda25ba7826b863d34990184bb3168b4492735b1e67327b1d54d90481a702703645b5c9af049b40b5367897627fb19b15742f3f4c4ceba SHA512 343a4d26aeaf14559810f94c929d8407385c70ae5890c94f06d4ff83541d0b906f9c3fc620c5c2671c1fc386d2ddc49912bcab132d2157dca6466a911ea2a66e
+EBUILD libtxc_dxtn-1.0.1-r4.ebuild 633 BLAKE2B 4358733b08ef1ce6602181a12f308e7b1b2719f2db7e3f07b6fa160c52c4ce207c0c1c7188ee3881a0ad10ba0e3e2d47d91ea23f196425f5dca935fd6ee7b575 SHA512 bfe27812486322690fd926587e69d6d3e7668c30350546f854d3ee982d9961da6ffb9c651b375703db3da9608db2bd607cd5adca78f542438d0321e1ef654c03
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild
deleted file mode 100644
index 33b3c218982d..000000000000
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Helper library for	S3TC texture (de)compression"
-HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
-SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa"
-DEPEND="${RDEPEND}"
-
-RESTRICT="bindist"
-
-src_install() {
-	autotools-multilib_src_install
-
-	# libtxc_dxtn is installed as a module (plugin)
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	ewarn "Depending on where you live, you might need a valid license for s3tc"
-	ewarn "in order to be legally allowed to use the external library."
-	ewarn "Redistribution in binary form might also be problematic."
-	ewarn
-	ewarn "You have been warned. Have a nice day."
-}
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
deleted file mode 100644
index e44c81b33584..000000000000
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="Helper library for	S3TC texture (de)compression"
-HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
-SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-RESTRICT="bindist"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install_all() {
-	default
-
-	# libtxc_dxtn is installed as a module (plugin)
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	ewarn "Depending on where you live, you might need a valid license for s3tc"
-	ewarn "in order to be legally allowed to use the external library."
-	ewarn "Redistribution in binary form might also be problematic."
-	ewarn
-	ewarn "You have been warned. Have a nice day."
-}
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
new file mode 100644
index 000000000000..f520acc99906
--- /dev/null
+++ b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Helper library for	S3TC texture (de)compression"
+HOMEPAGE="https://cgit.freedesktop.org/~mareko/libtxc_dxtn/"
+SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="media-libs/mesa"
+RDEPEND=""
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	default
+
+	# libtxc_dxtn is installed as a module (plugin)
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 48a2a4a28461..e447d8d29a62 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -6,4 +6,4 @@ AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 BLAKE2B 142852a63e1aaf4166464a3
 AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a45d25a98f13cb93d2b13c85d7e9e59ddfcbf59f73aec859d725ed6ee4bff015cde0d22cdcff1325e6893c965a2b29b2 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
 EBUILD mediastreamer-2.9.0-r2.ebuild 4631 BLAKE2B 25462c1ef45ee9e5aa2aa20a1736ca44a59d5220381ea9adc7c99e1e23c65d3b3b82f8710c0f44cf12e4363d91b484d434769edc297ef6f3817955a0bac14d09 SHA512 096d19166bdd2b0c63786563fc5fc1ecb012e0d12e5a6343dcc6b494486a32c2d20335842edab8bcd3f43a5dee4eaa8086f18d7d0828a6af5e3c6ff22a5a4af3
-MISC metadata.xml 934 BLAKE2B 2e1402da227d8892f2a2e739510ab4b81e2588bb057479976ddfe917a08d4248a3d7c4c286b4a5367b703557b799df57049a42baa46bd6c5fe1058a9466941fe SHA512 8cf01a51dd7bafcbd4ca39c49deacd38104d9640ed26ceab65e3f96ebb9e9be6caed8e8e0a3813946365fd6400141fac0481e3d29d59cef1625f132a81b2eddd
+MISC metadata.xml 881 BLAKE2B 9802cfcae35af83d1ee2da0b0fad0c48b2ffd027605628bb45e1b0ce4126d9e407fae3a6d2e27b5fe52875424414fbf5b850dcea2b1432a330c10b90be81c212 SHA512 0a764a56f797f8294bcc723069ad0d066055594e37cac460d0234ceb1db99a9df8aebb5b19a92771579c0eab4715069d255c4f62e936cda8d7c5091255aa5e70
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
index f49ee62249f2..4f26788fccdf 100644
--- a/media-libs/mediastreamer/metadata.xml
+++ b/media-libs/mediastreamer/metadata.xml
@@ -13,7 +13,6 @@
 		<flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
 		<flag name="ntp-timestamp">Turn on NTP timestamping on received
 			packet</flag>
-		<flag name="opus">Enable opus codec support</flag>
 		<flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
 		<flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
 		<flag name="silk">Use silk (skype protocol) codec plugin</flag>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8528aabad520..2911842add90 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,9 +2,12 @@ DIST mesa-18.1.9.tar.xz 11146188 BLAKE2B 753f0fa3780502d56927f9b0e6124b4728cb5aa
 DIST mesa-18.2.0.tar.xz 11331164 BLAKE2B e4e7c65a0c3c0716451157f7d026df8836399b5a25ca7ce77746b34f82e0c14d0bfcb965732f67c979190c2c2db68f272ffafa51b49613a510f186e9e8a01c93 SHA512 e6e997e166845009f6b97da204384758c797c870b56332652c0a2636734638f9180b7e4dbad144495645308ae4d77981a2493a22d57973723338b658e0655557
 DIST mesa-18.2.1.tar.xz 11374476 BLAKE2B f0f3b766d68550f8c395a1b1d1ffc7a9e532c22ee6b91d698db33a270c152e03ab656d4219301bc2e0e95ba6f0583017c4361add928ad8ab26378a1ec6958f36 SHA512 d249bdf79aad36db9a8d291b3a1a100d283893ac741f58f85ae7e5c90ca25c37f80a5fa6fc57945ffeb0b67b788e7ea146543ec790b22f144578fc4c1525b84d
 DIST mesa-18.2.2.tar.xz 11375608 BLAKE2B 0b2a1b60e72885b2b48335645c04c4d5720c0b426c256781f3e84e22955ac87d9abe19550f996e3ff964befcc2b959e8639dcad585b3ec777dd629f06623e5ec SHA512 35c27f0673abd35d0581db34b6ad646058523dd826ff751df718e1f9d6a996409a0c5b313fbbf177058d9610a53d646f858fb86537e3ea1000df5edbddcf043a
+DIST mesa-18.2.3.tar.xz 11376632 BLAKE2B b693e42918be9980d86fedf136e872d785b92b49272cbd5374907f7c3bc857ef5991852de5cf7da1b4f16420b0cf9926541219d3b1717b78fe6fc6c3cf2c3788 SHA512 20f512b1f3835b1c78b1f05f2e2125dc3437b61b8857e7ec62e0f9ac3be2ccb5b7ebe7e18f444da1117bc100d75e4b03cd2a0180f0f0b1cf760714b43bc7a664
 EBUILD mesa-18.1.9.ebuild 13412 BLAKE2B 976868904cf8b157abafad9d16a3e59bda73a272829e5c74f1d812ace952f77857e4cb3aca17b0fe750e64584119b402a01156b096094249e6cb0bdd136529d7 SHA512 6e2ac62053d96fc7af4311dd6b3dad379726c4c98f585077c31246e4e481e517c8a3a200d0d9b66da26dce08c63c1410c5573490ff74f7313f9f673b9fe78f05
 EBUILD mesa-18.2.0-r1.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
 EBUILD mesa-18.2.1.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
+EBUILD mesa-18.2.2-r1.ebuild 13866 BLAKE2B d855aa91f016cb15b37b93e6eee78908077f77c1ec1011f64086452d34960f577a80f7aef8edde21b854c41850cfd75c4071ae0d4fb1248be5c6ce94e88e2a88 SHA512 0c211170189403117ac8df6e9b120af296977fd4c84fbf416f9849b3858d740c79893519f02467022a5f332a95e2a8cfb793c82dda0e3fd127e4aef1d8dcc3c3
 EBUILD mesa-18.2.2.ebuild 14438 BLAKE2B e684beb2753a05a833dfbf3c1e1d72e6f8df343f38499ad6f225c66b521c54e970c4957b531a5cedb64ef46e3d803c46a9a22d348251e0cfe812f4f9829cd11a SHA512 22b248c80ea9ab171eb21713a8ded77bab938e06876090683a6db4fea34572cbc695ce72fab67a5c9cbad2325551d572326bcf7f31ebdbc67adfb975f4011107
-EBUILD mesa-9999.ebuild 14489 BLAKE2B 10d1551937ff5cc590af4fb3beaa5134f5017ec3cc7b2d6c690af53673fe3015197866a063707011d5ed173c7cd4993d62225958c7750d1908d1444f0432f35f SHA512 5fab6cf4fd2ac64991e15fab63d8dd4827887a915195f597515238b42564d4b2d1eec54c4ad0706575d396ab03428d02c9ed227c73e3fe3cf4a992cd4a119fdc
+EBUILD mesa-18.2.3.ebuild 13866 BLAKE2B d855aa91f016cb15b37b93e6eee78908077f77c1ec1011f64086452d34960f577a80f7aef8edde21b854c41850cfd75c4071ae0d4fb1248be5c6ce94e88e2a88 SHA512 0c211170189403117ac8df6e9b120af296977fd4c84fbf416f9849b3858d740c79893519f02467022a5f332a95e2a8cfb793c82dda0e3fd127e4aef1d8dcc3c3
+EBUILD mesa-9999.ebuild 13917 BLAKE2B c63466b004fb0d38806a65d365774e6425158f0da2069e1264f9a48c239afb0fbcbcba214b22cb7bea8296c54fa389face4147e015490c9c906b749edf9c4be2 SHA512 9b1a635be556b2f173f2985d236362c4c7759b0b6d72e2abce5861a702ab9378613d39bdff5ff5b112ea383e59ce442a725f8286971efdef93829f505e1fac22
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.2.2-r1.ebuild b/media-libs/mesa/mesa-18.2.2-r1.ebuild
new file mode 100644
index 000000000000..7728fa3de19b
--- /dev/null
+++ b/media-libs/mesa/mesa-18.2.2-r1.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
+	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
+	vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="7"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use d3d9; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-18.2.3.ebuild b/media-libs/mesa/mesa-18.2.3.ebuild
new file mode 100644
index 000000000000..7728fa3de19b
--- /dev/null
+++ b/media-libs/mesa/mesa-18.2.3.ebuild
@@ -0,0 +1,526 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
+	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
+	vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=app-eselect/eselect-opengl-1.3.0
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="7"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+		sys-devel/llvm:6[${MULTILIB_USEDEP}]
+		sys-devel/llvm:5[${MULTILIB_USEDEP}]
+		sys-devel/llvm:4[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use d3d9; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=d3d9       since VIDEO_CARDS does not contain r300, r600, radeonsi, nouveau, or vmware"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use d3d9       && ewarn "Ignoring USE=d3d9       since USE does not contain gallium"
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2fd5700404f0..c50d8550e51c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -67,7 +67,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.96"
 RDEPEND="
 	!app-eselect/eselect-mesa
 	>=app-eselect/eselect-opengl-1.3.0
@@ -95,7 +95,7 @@ RDEPEND="
 		)
 		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
-					app-eselect/eselect-opencl
+					dev-libs/ocl-icd[khronos-headers]
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
@@ -424,14 +424,12 @@ multilib_src_configure() {
 		fi
 
 		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			emesonargs+=(
-				-Dgallium-opencl="$(usex opencl standalone disabled)"
-			)
-		fi
-
 		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
 	fi
 
 	if use vulkan; then
@@ -488,21 +486,6 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	meson_src_install
-
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
 }
 
 multilib_src_install_all() {
@@ -517,11 +500,6 @@ pkg_postinst() {
 	# Switch to the xorg implementation.
 	echo
 	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
 }
 
 # $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 1fefc68ff845..ff4a115a4742 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -39,4 +39,4 @@ EBUILD opencv-3.2.0-r3.ebuild 12120 BLAKE2B ec841b5fb9fef1ea6cd7c61bb693830d9c95
 EBUILD opencv-3.3.0-r5.ebuild 17045 BLAKE2B 61f4d401f71ff70af717cf04be8e672705531183b7641cc0d5b26a2bea3486ecba8db844e34d9bce181f4386d7881ca13cef2cbab0799ca1c8161c5e9250e73a SHA512 1c4a1a1d4a36b0c703422cd803613b087c0b6c07d42daa0a00f16e42ee488cc4650789d627d50e4b641f6981b9ed4e40eca11214b3c1182968715fdbb53e6109
 EBUILD opencv-3.4.1-r2.ebuild 18420 BLAKE2B 1d002a35c093aede94f968fe4a8b5bde8af55508442094813b9e701da87e6eef437b2261caa525cf738c73206c894bc1ac1357844230b162252ff0f2208ce7d7 SHA512 78e79f66d1736b3bda066066ff9a2b8ff7034faf1d855f1c479ac79b6ceba6686c3a27865e4506522646cf40b7179e95cf63a64f0fa9d23d8ee52ca839109d48
 EBUILD opencv-3.4.1-r4.ebuild 18495 BLAKE2B 08a3a897c917669691b1c5fb7d7f39b81cd0b8f23b41a5ca4ef03e8b5d619867420001bd466db2fdcb8bd1d9b4f84d5f9f92b94be262146d2e98db80eebeefc3 SHA512 986839e6f74e608fd6d85077314565412f031d814442faa360a25fad04450164df202dec243f980146d865e1222c29f77213d08678274d29f943cb7e7ff5010d
-MISC metadata.xml 2580 BLAKE2B fa071ec1998c6e3daf2b09feb25f5f4a42ebe4a01e3bfa1ca8c6b9a9bc81f73f27b2916eed81d92e252127ca3fb07513f90bc655fd0976b9acd080d4747f55a4 SHA512 fe025e3adf0f6a8f5e1e1c8db0caacbbf871981217bfbcb43ab1bc2e949e2bfe82c19086dbc76d587fef2c4b53bf880e874861148aab61a525fc23df558f1e05
+MISC metadata.xml 2516 BLAKE2B 7fa4e18b8396fef6f78db6ee7d3b0180735cdd76a33b1e5977b507321b677937e0dfcdb77ee6d515211227916c11f29f58a3adcd2a9172dcb4b0f5a424a91eac SHA512 dd98217f83911b1e30193d00becb2b02fb36f9194c64a963169816299bd907816187bd5120adb5da1e01202095b439c1c009823d88dd1022a02520957195f491
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index edc61febd4c1..8414631c16b0 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -31,7 +31,6 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 		<flag restrict="&gt;=media-libs/opencv-3.1.0" name="tesseract">Use Google's OCR Engine</flag>
 		<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
 		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
-		<flag name="webp">Enable support for webp image format</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">opencvlibrary</remote-id>
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index f39daae45863..87fa5a85786f 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,4 +1,3 @@
-AUX openexr-1.7.0-gcc43.patch 235 BLAKE2B 050fea24922fcda2eade967e13121c146306ce53f687e49b6b4a299d4bb08e2a002729ee50bf0a5bfdc93d1a6c8761b33933c4ac803c90b018608f91a13e1f52 SHA512 a19adcf1a8dec253f8577f5905775ea56dc5d2de4edc454a71ec86fda8cadd10a31e473db2341a203ee49b22c5bb06d75b010077ad44766cdbaa9f56b5f6859c
 AUX openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch 2871 BLAKE2B dcc0f9feda88f101e039973d4664df32fa9269794fffdb8686d4197b90615d8b75853ad97813d31a3aabd67589951341a45ebe258e7a9431250b90693939d3dd SHA512 c24365be8c645586efacbd8983a7ccaebb1452afd0fbb45b0e12e77e1442b2d27e19bf155745eeb05b214831f7c081c1f5967d7502bc13c4b53e01ea0e0b9e65
 AUX openexr-2.2.0-Fix-typo-in-C-bindings.patch 649 BLAKE2B ded357550fa531da4288c13d0c0a402bf3c73b53dd028474efe5436b5e22393059d94858ebf9b79760e953b93acd597698baec29406be15cc4ed0f666de5ffb4 SHA512 17ce63c9ad2c39606af83886db34fec3baafe2f9816dd2f6f0189e3caab0015910f89f8eb261a49d8ccb495d36b268b148ce09e2172a7b516b4832fdc8e84fea
 AUX openexr-2.2.0-Install-missing-header-files.patch 1929 BLAKE2B 9695d1c5294d312b5551522044d838db8c19e2a46d970b392ebb2d2889ea1c54f765f3195ce9b1df42b9ac7586a6569e9621b039dde5ab562b0bce5b74a9f33b SHA512 b6d1bb5a37bdf2283da8f45b71f3a8830a96437f2459746c5d354cecaaceee5e35ba3e3cf247e3c5c6f7930490233672542d8f7aaa59b79593d209e66eac8421
@@ -6,14 +5,15 @@ AUX openexr-2.2.0-fix-build-system.patch 17897 BLAKE2B 95f44167ce0590ee591a7b7de
 AUX openexr-2.2.0-fix-config.h-collision.patch 1556 BLAKE2B d7366aeae2a4d5b5496815d844de90c381d3a514dde0e37f86d2b2c5a8fe11eb3631aa44a554a5390cd2a43700cc8a36ff88af4a0e894c4774c45edf0129c4c5 SHA512 15d654f9e1546ea32a6175b1cce24ed9d979afe7dd763ca53a17c1020ca8851c31cc3b8fc0e4ef31722ead91557e24a67958ca9ee5fd0fa4e574304c3153be33
 AUX openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch 2536 BLAKE2B 7eb4db8596cd157f30ba7be564f776598cfa0d893dbaf8f729e8041079e851b0272ba595298e10792a5c74c14b21fbea78a4157d9494501f2c1ca5ef946dc6af SHA512 530088a51d97039e951055361526b8afa2c322351971d26302d21ddd6fdf2d21682df0577872be608b8cd0c3d3fc05792d871e7c724546be42bfa439e74bb726
 AUX openexr-2.2.0-use-ull-for-64-bit-literals.patch 1934 BLAKE2B 616f29857b5cd95c21bfba22ed7df51b1fab88476836eecee08a1befea4f82303ce35bc00eab34762d6cbba660851356198420e6a96092b8eb0a630829d3f132 SHA512 b799c5924bf8dba468236f4d43feab8ca7d8a88444595f2355671337f38d2868957d1372385000c36ed7ae74499925060d402ef9a82a352ea85dc7378cde21e2
-DIST openexr-1.7.0.tar.gz 13542910 BLAKE2B f187aa1b7c703bc912bfc87eb6f9d44f1ed08dcfd466cff46845afd1e338c5cd518da54628a9cd96c08dc796aaf6f35d5a4188ac7c3db3d2cdb8bc20a70edaf0 SHA512 1fb033f909961a9778b762241e09946d19c7e75bbade7b5a942bb159eec3af9200afd722c3170165ad4b1fa602d9dbe6938112aad1716e7c7e6b8c37ee3980e0
+AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd47344137b4c91110a79ab2b685ac048109192f87e41f01aaa0a0fbee222bfa10ffdc58340d7c803b3068bca8bf99c323dfe46252597d SHA512 36889880813acf75a77d3d34ea3f0a6535ca45194ad491bec17df3701d1eabd2bb03d81c525ba96cf695e91ec67abeb1b2395cfa45ff0767d90b4600d63e768a
 DIST openexr-2.0.1.tar.gz 12609335 BLAKE2B 25adcf5a679a0419a7ff0ddd29d4d1c5f1c28cd3fd6c81b0a5c0cc63d907e741eaea378f4ebaa9a66afce0349edf7231ebd2bb3e493aee484860c89f05f45960 SHA512 b35e3e795496f9d4a56352c907bcffef14ae062b189c4e1df35f3ab08c5e9abf829fa9149db3198d60088fa9633816650011e5f7871e07324801b95549d6695b
 DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
 DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
-EBUILD openexr-1.7.0.ebuild 1181 BLAKE2B 13e1628151f4bdb52e961338990b2fba921fd09570c0763327685a16c80337eb81f029d00d0d064a74337f22e31f99ea56f9e280988965df8bfb44a7faaa6d27 SHA512 69d3ec9b799f7b5c09d5d9df76a234929334a2ca9ea95dc2903b62475b53e5ebe8ed06615c59f0a79885eb18311c4b042d3ff8c384a618a9fae3029e6e91ca34
+DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 EBUILD openexr-2.0.1-r1.ebuild 1255 BLAKE2B 23d26effb4996d82e843a5811fbbf2e609ba93a5383eb3844e4c53253c9748a915a08df1cfcedfa4393d695e000ec201eb92cd022b9fe9d607f3b78ea993dfdf SHA512 e46119eb545d174f1565746600df038e0028340f59f7670e1c0975a9b7a4c4a266a80970dccba054041b0bad31a98763b8aa5d4b9db32f83e65679e3fb0bab83
 EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
 EBUILD openexr-2.2.0-r1.ebuild 1578 BLAKE2B fd0dc90294f80362a6575e445a6510efa7f218566b97869dbc9f12c6187e3b0be0cfb24aebb2460925b40bced9bdb42b058974a9789d4c775494a6257f16cc2f SHA512 830f0c476b53b59bec9e65e0859c1623425a0b3a5bdd5081c1cf62be9f274b452c373e8ed2e7b4d6b92d8a20c9f477bdac9a80f604d3d8866ccdfac3a924849c
 EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda
 EBUILD openexr-2.2.0.ebuild 1248 BLAKE2B e4926afffcbf1f64891ed5ebdae8d4ab5895ffde3d79e3a29eeef121d8214c4c1528ccaaef62e35830b09bd1f54d1ceafd0b62d3652cff76160d7ce155e26955 SHA512 1af7a2a6c95ddd32b1688495b65954982974fa5cb3c0374ee16d6f89f049191a14a7e79fd6fdbefc8cf25ba67e0450e684015798325f2258982528909ee2ed9d
+EBUILD openexr-2.3.0.ebuild 1933 BLAKE2B ec44faffda4f70c5a9964dc09d6ec2e3c068fcb6463524d64a3cd0613e48d9f3b8250d3a9b8f7a05414b9df506de67c90df08c24dcc1b71a83306eb4d738180a SHA512 502493e8c7793954b4255b7f6e73835c068a70287ada74f2a21bc42377830258e0420400276808d8c21a0ecb00ac5cdcae1aa4d9cc5747b492e64eb390773add
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch b/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
deleted file mode 100644
index ab99eb9a19fb..000000000000
--- a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
- 
-+#include <cstring>
-+
- #include <blurImage.h>
- 
- #include <resizeImage.h>
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
new file mode 100644
index 000000000000..811a7af38758
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
@@ -0,0 +1,68 @@
+diff --git a/configure.ac b/configure.ac
+index 067f9d0..fdbe2f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
+ AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ 
+ 
+ LIBTOOL_CURRENT=24
+@@ -28,7 +27,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG(
+     [ILMBASE])
+ 
+ dnl Define the version string
+-AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
+-AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
+@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading,
+               [multithread="${enableval}"], [multithread=yes])
+ 
+ AS_IF([test "x${multithread}" != xno], [
+-	ACX_PTHREAD(
+-    [
+-      AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
+-      ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
+-      ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
+-      CC="$PTHREAD_CC"
+-
+-      AM_POSIX_SEM()
+-    ],
+-    [AC_MSG_ERROR([POSIX thread support required])])
++	AX_PTHREAD
+ 
+ 	AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
+ 
+@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip)
+ dnl AC_LANG_RESTORE
+ AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
+ 
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ 
+ dnl Check to see if the toolset supports AVX instructions in inline asm
+ AC_ARG_ENABLE([avx],
diff --git a/media-libs/openexr/openexr-1.7.0.ebuild b/media-libs/openexr/openexr-1.7.0.ebuild
deleted file mode 100644
index ac9a2a1e958b..000000000000
--- a/media-libs/openexr/openexr-1.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils libtool
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples static-libs"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/ilmbase-1.0.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:/var/tmp/:${T}:" \
-		IlmImfTest/tmpDir.h || die # Fix path for testsuite
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable examples imfexamples)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}/pdf" \
-		examplesdir="/usr/share/doc/${PF}/examples" \
-		install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use examples; then
-		dobin IlmImfExamples/imfexamples || die
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
new file mode 100644
index 000000000000..99f63d05e1f9
--- /dev/null
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/24" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx examples static-libs"
+
+RDEPEND="
+	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2016.09.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch"
+	"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
+	"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+src_prepare() {
+	default
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-imffuzztest
+		--disable-imfhugetest
+		--enable-threading
+		$(use_enable cpu_flags_x86_avx avx)
+		$(use_enable examples imfexamples)
+		$(use_enable static-libs static)
+	)
+
+	# TODO: check if this still applies on updates!
+	# internal tool dwaLookup fails to run when linked with gold linker
+	tc-ld-disable-gold
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/openexr_ctl/Manifest b/media-libs/openexr_ctl/Manifest
index 95541198c926..b76963eab676 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -4,6 +4,5 @@ AUX openexr_ctl-1.0.1-gcc44.patch 457 BLAKE2B 574e0a606769c996ec8eeb556165a0327b
 AUX openexr_ctl-1.0.1-namespace.patch 348 BLAKE2B 4bb257667565106034c687efd5d142380c5e1bb662c9d552d8abca29f1e5d0bff96ce1fcbbf6aefc205c7921dd930b21e56a33ac1aef54e5868c8e6a838fde82 SHA512 28f3b0964ccb7ee81dfc4c4600f0747e28d11ada1fe3a3b5beec17c56bdd8d66c37f6d4974272d6a0c54a397445665eda06a81f5ada64cfd96f74c2461cb896f
 AUX openexr_ctl-1.0.1-pkgconfig.patch 632 BLAKE2B 2adfca932aed12a83634c917b5af224e5fceb3e404fc0c4aff3fd4ac225c21813d919d2d2d05902193cd9fb47532c7692deb5eb9b4c04a1641416691ce3973cd SHA512 38c683204ded3aa0c0e5d83506a2eb49cdf33dfa7b44f5dce1502783f18aa154f8f4b5357aa4a07932ccacafb3d8cf32b80ce288cbcf0e75ca917adc2ff5e271
 DIST openexr_ctl-1.0.1.tar.gz 362864 BLAKE2B 4ac3daaeeab91bbf9d8b1e23ade7934d5917b69df4e6b717a1b5a2b27a73b68d6e0fe06eb2b420d7fb5fe3e284c1615a56cc46973eb2de3604c2a321c5456cfb SHA512 831a06dc83ac53ae9b520629dbd24d3a7cd24f3ab5f484de37d1b232dd16fcf71392d163a7b9f9059bb8f30ff249f7f5a9fbc35730211ff98c8e13dcf386898a
-EBUILD openexr_ctl-1.0.1-r1.ebuild 819 BLAKE2B 4028585cd2732b5bcb77943a9092d2dc6e8c54f8b1b83d0be22d366baa560c80d6d47d8c16a4f7b4f5af9bb3323baee766fdcf27908b5b04ebcd61188e3fe729 SHA512 c3735a51c956e92301355870d58b5a48ef84df9c2f6a945b1e2e961ad22e462cb33aec57efde77407d359fbb0ad0e47cede9664866873c73881a1e6964a34ff9
 EBUILD openexr_ctl-1.0.1-r2.ebuild 860 BLAKE2B 3102272cfe46534bbf986870e26771fe7003b15e064798fbb05fa4c903ab9ace8b57113a19b50770c2b5f66a7258b53dacda04ae9441d29b75cbf35eee3eaac4 SHA512 a8e703006dd4ee0586ad583c1c7e9948fff4053930728e3a1013434b3975e6e1597293ea936646c136f51e47a1f923491db487bf1d0eaf5b99027fcd0b7df74d
 MISC metadata.xml 301 BLAKE2B 149874bca2d8b5957909f8749f1b274cec115425510904811eebe3cf19b76b28924a060d86f57f3fb6953c8e8ea55da59dfd8c4d4f83fdc8ee0b7f23f9dbf264 SHA512 6df4d1d337a4c00e4a2415c19a46d07d1a151135fbf29a92de300b077de3ae4fb64277b639448edeb0e64bec87d120f67d829f569cce2368388f3b4478dcd1bf
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild
deleted file mode 100644
index aab8afc2af60..000000000000
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="OpenEXR CTL libraries"
-HOMEPAGE="https://sourceforge.net/projects/ampasctl"
-SRC_URI="mirror://sourceforge/ampasctl/${P}.tar.gz"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="<media-libs/ilmbase-2.0.0:=
-	<media-libs/openexr-2.0.0:=
-	media-libs/ctl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-{,configure_}gcc43.patch \
-		"${FILESDIR}"/${P}-pkgconfig.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 6c80989a6f6a..95bd181fd69a 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,6 +1,6 @@
 DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
-EBUILD openjpeg-1.5.2-r1.ebuild 1950 BLAKE2B 5b4ef91a75eb0f8196c49fc96c8801b41aa56023beef1ade06288a4c0a2e18671c8f3502fea5062fdeb5bd80a4f413c81795866f1560934b376e342207fc46b9 SHA512 37659e14af22aa43470897c3a057c7b7afe445982cac3967bdff0d669ae80420f354482e3b8a1c384665a8b0baa1e5985c136cde8de3337ce0d9bce0753b46fb
-EBUILD openjpeg-2.3.0.ebuild 4071 BLAKE2B 784812951b98f3f4fd114ab22961e10422313202006b2b4ad64fc0104225ccaa7294b1f5718b2e4196da8b33d3fdf3116ec39eb7d4eeec812f4c63d48afe4048 SHA512 70aa6abd0d7be04667f3ec4ee8605637c588a436555dcbfaa63d38406a659810c5d5bb9e4ceafff6714f0d5d64bfd943e41b80f175d4abd78cc211de060460e6
+EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
+EBUILD openjpeg-2.3.0.ebuild 4061 BLAKE2B 053eaa5be9d8fea70993aaa213bcd1cb7c295a65f1b0b0d0a486603119c1f68d853e5d54004d99e6b3c73ddb264371aeaa2bb27fd992eb08173d8f8947dd24f9 SHA512 755ce46efd8ea987b1d4cabae47b5d342955454a4a02735e9c504e19b6a0d11324caca8e20e2a97adbaf048c361833991c24cad397e31bb285be237ab2e5e3ff
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index d0044af48162..a12928765e77 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-multilib
 
 DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
+HOMEPAGE="https://www.openjpeg.org"
 SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 44197fb431a5..e447db85d6a1 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib cmake-multilib
+
+inherit cmake-multilib
 
 # Make sure that test data are not newer than release;
 # otherwise we will see "Found-But-No-Test" test failures!
 MY_TESTDATA_COMMIT="c07f38fae1e67adc288c2d6679df5d3652017fbe"
 
 DESCRIPTION="An open-source JPEG 2000 library"
-HOMEPAGE="http://www.openjpeg.org"
+HOMEPAGE="https://www.openjpeg.org"
 SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20170814.tar.gz )"
 
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index afdcf3fe2a21..31972a24e359 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 3087 BLAKE2B e84ba635d7192ed9730012df422bc92dacff710d140544f015934bd8a6c71dcf6b5080fe5b0e18b0f20ab069b4c727aa2e1b29bf0d4f77be17b613f1a4ef0d63 SHA512 24e5420c9569513d85cc7c21face7d6b825b0e97140aec10ae6174b0effdc9a42cde3f8ad6656a40219e2184b310de643b5f74911f032a8740a5a0fbdee5cc84
+EBUILD portmidi-217-r1.ebuild 3067 BLAKE2B da1098e9a9199d82dd3e2f005da51cb5de79b3cd76a45444876bb28046fcdcdb4a8d51170926e67b107af3ba2d7c6bf3cf9b81f0d6c06b3a70847b529cb0d0bd SHA512 43955227cae9c7558f833131c3052ce8119c2c285aa4a10dc5c79ce2a9c4bae14f6e2127d5bbf4dcbd63e4992b869780275c575026bb45e3e7091ad6b0ff4416
 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 a515367b7ece..0adb4d32f4bc 100644
--- a/media-libs/portmidi/portmidi-217-r1.ebuild
+++ b/media-libs/portmidi/portmidi-217-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
+inherit cmake-utils desktop distutils-r1 java-pkg-opt-2
 
-inherit cmake-utils distutils-r1 eutils multilib java-pkg-opt-2
-
-DESCRIPTION="A library for real time MIDI input and output"
+DESCRIPTION="Library for real time MIDI input and output"
 HOMEPAGE="http://portmedia.sourceforge.net/"
 SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
 
@@ -17,25 +16,27 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
-CDEPEND="media-libs/alsa-lib
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	media-libs/alsa-lib
 	python? ( ${PYTHON_DEPS} )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.6 )"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
-	java? ( >=virtual/jdk-1.6 )
-	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
 	doc? (
 		app-doc/doxygen
+		dev-tex/xcolor
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
 		virtual/latex-base
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+	)
+	java? ( >=virtual/jdk-1.6 )
+	python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
+"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	# fix parallel make failures, fix java support, and allow optional
@@ -72,9 +73,9 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		$(cmake-utils_use java PORTMIDI_ENABLE_JAVA)
-		$(cmake-utils_use static-libs PORTMIDI_ENABLE_STATIC)
-		$(cmake-utils_use test-programs PORTMIDI_ENABLE_TEST)
+		-DPORTMIDI_ENABLE_JAVA=$(usex java)
+		-DPORTMIDI_ENABLE_STATIC=$(usex static-libs)
+		-DPORTMIDI_ENABLE_TEST=$(usex test-programs)
 	)
 
 	if use java ; then
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index a9ab8830bcff..31b9417f0197 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -2,5 +2,5 @@ AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc083
 DIST raptor2-2.0.14.tar.gz 1877454 BLAKE2B 9c427d9184951d7fa385c12eaeffa35b504ddfc887a10d2bfb9cffdb34b8d0d16fd56a1033f57de3096a9bfbf72a7933a6dd4859bbbfdebd671386128318a2a0 SHA512 399e23f2c549df8f1d709d67129d3fcf7899a8cdcdd8071c165f2b4106f397cce05fc69a6d7b176857011bf95723c0909b6510eded12f82217f89925bc1ba7c2
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 EBUILD raptor-2.0.14.ebuild 1654 BLAKE2B fc1cc4bdfca9fe92c0db896255cb21e92461b6c05141afc974d35ec03e6cdfc4821ab3dbb9da15de4365416088244b5078f2d349b1dda90e167dbeaa9640f193 SHA512 5ad6857a52489f1703ca5acbdc460d315906cebd955dd98b2135423f79699ccc6034a8acfd83d144b52a9f39938f7e6bd5cdc1b554953d930ae1e1106242ec1c
-EBUILD raptor-2.0.15-r1.ebuild 1581 BLAKE2B 345991be990091a194dd9605a981ec91fdfe60d427a4bd456e55ca6844d1bc39257909d3d9934023b11488962578c5141ddb526ae339684d1b8c592edd911978 SHA512 c30e4b1da375d0951dc3ae4ea34f90a2b7d6c13be3e48131f4ff8421dcea06be7f94adce2f1afef8c63429427315ccef2b86e2355c2758ce83eac0dcc7ae8f47
+EBUILD raptor-2.0.15-r1.ebuild 1580 BLAKE2B c469e05439a8c7c5a3964403089ba42c39bb8497379e1a20aedb3abb43393bee63d5a005dc9e26b36e43804a5bea1043b41ba43220bcc014eed06958d6ce67aa SHA512 36332021d7cd17f86fc4fed7f77aeed96ba76726d14f27f64a63a033600860b2b39d20b9a4cf98ef5f7547cca6678d6676d3c64572cf8ef657c94f6564df046c
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r1.ebuild b/media-libs/raptor/raptor-2.0.15-r1.ebuild
index c9104d26d5aa..f0b6ba1ed110 100644
--- a/media-libs/raptor/raptor-2.0.15-r1.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index e909b619bef5..efd23662402a 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12.tar.gz 2231074 BLAKE2B 0d63e0b2207d1d347ec882e610eb37a625811febc215f089eb00dddec92b1a9fe026d2ab7823677c46e595585f3b5e176c35f9ac1f9ec2debf430ecc3ea950a6 SHA512 0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136
 EBUILD sdl-image-1.2.12-r2.ebuild 1571 BLAKE2B 92b4f2bc93405c473d994dff82967804a8c88b6ed55df5fd7a5f9ea58cedd9f666480e354e180a88566b8847c0c0ecfdb9a2159c1e150da1cb362db2a886c5ef SHA512 8e1a1ebc29e9bc250c819707afcdc38cbee4ad10f5e79e207db677dc6745529e53456fb34d30de0ea61678fc04d0b17bfc4f17478eb1911f389ad27956edb959
-MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index a92c1a1c50db..26079e608bed 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="webp">support loading WEBP images</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index fb4170292ca2..740f4098abcc 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -12,6 +12,5 @@ AUX tiff-4.0.9-CVE-2018-5784.patch 4251 BLAKE2B defd555ebc53e178439331cd04f3099c
 DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6d2ec497067761895cb2de7674108e8ca2f35f845dcd2e45801777fe25d234af1c308acf59846c2f5617ab53 SHA512 ca89584a9ffa33b4986e4bc2165043cec239896f1f0ab73db00818d0442b570efaa6345b2ed422e884202324d359713df849bf14782bb0cf3b959655febddd77
 DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
 EBUILD tiff-3.9.7-r1.ebuild 1941 BLAKE2B 38e7fc7b06adec30d32dce66390c5174fa8ca514d8fdc12d6486ed3b8a78b95ea2efb3e083c959892ea65e46853b4c5b7236508c9812736ff0bebce26961d64f SHA512 659c879ae594501bb3a88dde00797d67fd004cbbefbb4403a2374876a6c909cb38f4a7d56256325c5d53fd7ed107849e7c2862f9de777ab6b6d996ec279fe997
-EBUILD tiff-4.0.9-r3.ebuild 2253 BLAKE2B e22e677bf03b5ff4ee7e3e074bb6a3c8f86aa636f3f0700326fd4a4552c4ea524711f954e32729240b43206fb2bd318de3e91d2217e730bbb85653b286c8a12a SHA512 b32c074d598f94498ee81e59e347e75dcbbf4ea7ef2b456c2e98c219b960f42e8d36cce85f8ee2e71010f8fb260ba3a86b5b993e22c1cef041a9729febc643af
-EBUILD tiff-4.0.9-r4.ebuild 2348 BLAKE2B 2c0710e9996242def120cd22fb5764a125ed97de0f319b1ccb52c1910f811908979931d5f3b424592cf8cd5ecb6e7f962607c938a29958aa5f50a7beeb8aaef4 SHA512 cb99736a791d372161b048b9468be0eb35c516b5d6d750b56c84ac9031957c7e150b0a548ae999afcdcd3125b851e408aea9fde107316a8dd97a0fefa0eb1162
+EBUILD tiff-4.0.9-r4.ebuild 2354 BLAKE2B 272c6c559ca76d81689caefa8dbd66aa22b8e29fd2cf35ba0699abaf2e85fa1f542237c9eb3b85735921617b76790bdbaede55b0c113a7cc2d35b192d3821e85 SHA512 ee3c1ab75d4694bce0e9523394ed0bf9daca1de6bc276199d96b655192a59f72ddc4bbbc7981e26c6f44531da334bbaab94fb9fa72191d6c241e861b71e78e4b
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild
deleted file mode 100644
index c65a11571722..000000000000
--- a/media-libs/tiff/tiff-4.0.9-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool ltprune multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
-	ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs test zlib"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${PN}-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch
-	"${FILESDIR}"/${P}-CVE-2017-9935.patch #624696
-	"${FILESDIR}"/${P}-CVE-2017-9935-fix-incorrect-type.patch #624696
-	"${FILESDIR}"/${P}-CVE-2018-5784.patch #645730
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/tiffconf.h
-)
-
-src_prepare() {
-	default
-
-	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
-	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--without-x
-		$(use_enable cxx)
-		$(use_enable jbig)
-		$(use_enable jpeg)
-		$(use_enable lzma)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ tools//' \
-			-e 's/ contrib//' \
-			-e 's/ man//' \
-			-e 's/ html//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_test() {
-	if ! multilib_is_native_abi ; then
-		emake -C tools
-	fi
-	emake check
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -f "${ED%/}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
-}
diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild
index 306c44a85853..97a274e6ff3e 100644
--- a/media-libs/tiff/tiff-4.0.9-r4.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 
 RDEPEND="
@@ -49,7 +49,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--without-x
-		--with-docdir=/usr/share/doc/${PF}
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable cxx)
 		$(use_enable jbig)
 		$(use_enable jpeg)
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 3f8f6f5567c3..697b74127e04 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -2,13 +2,16 @@ AUX arm.patch 1188 BLAKE2B 886fd2b177c0e1bc1dbdcb6f6b14219eac807a26dd76e67d57727
 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
+AUX x265-2.9-detect512.patch 374 BLAKE2B 7123069c19e85ac5953434eb6c4a80135e60178537f3598e796cf6550cc4efdb5bcd358bc96401d948d26f36676892bb344c097143a310a1e19c8b2a921cd44a SHA512 6be1540b89f0f622476d3511dd01cb3dcc24ff4823cef57d08432e857fd7da3c9810904a02d1583896767a33f97140651d3a4c163952ed459338623999d93e18
 DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164264ff10f3887bb244ce7e605a82c2cb0a2f2ae4f2749e009baac19407109996e599dc41bc970a610ed086 SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef
 DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
 DIST x265_2.7.tar.gz 1282742 BLAKE2B 5f7290a71009f1ba177b2a653c48b62d8067930e8e53e4f9dd149037d3cbc69acbcae9c5364d46e6cc127f7d70e2acaaed2abf3ef065ecae303088132f341757 SHA512 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094
 DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
+DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
 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 5683 BLAKE2B a3c6fc5a38d1fcdd6a03848bdff86777ca38adb83643eee6a04d11f14c24d2894b859fb1186b9dc2d9719eca74283afb40df9e43a2946bd535bed2dc05677a90 SHA512 333d2ebc2b136c9ce81c2c364c6a49dc3adc07cdf701c612bd64a7ea4def282d08d2e11af5aeb9df97c4406e0fb3474da00242989adfba9984c295e7db608846
-EBUILD x265-9999.ebuild 5661 BLAKE2B c01180df215de891d5f60dd877a0acba88351efe58586ffd1f022e1b337f0b308cfdd096104b4bae667ad2050566ebf6417955ef4f058a804c1cf8a95c36a01a SHA512 d8a48e121ddb761ceec95f85881d4eb164314440af38cd31aec8875aa3f940539838b796fa34da049ad630e3c9f4fe3e9203c7e558dc86e0d3b490fedae808b1
+EBUILD x265-2.8.ebuild 5680 BLAKE2B 0ee62251a5dc184a5cda01be4d0c779e5101b3f90f1d9a5921c5ba300798fac1acb298e7066d715d6923ce4505292ebafdf005b04745b1e3f615f0d8319fd3a3 SHA512 9e75cf8f636fa69550739f0fa56cb94b564a257d97f776df22e9c90a79adbf3ebcf86a0a62e3cec9e672caeb6798e1ffa639d15edd293b7f2e068fdfb3ac8d98
+EBUILD x265-2.9.ebuild 5699 BLAKE2B 7ee30b5f06d51afdebf6ee278eb0e7ca8908fc703e2fcdb80c0b7095d9ae9edd83393e61c699343a53bc0d0786f1e558431e826a281d8ebd943ae5825e6bfb20 SHA512 cf9da7ce4f15df6afd31915869f426bde0306a381d8a7f1fb05987ccf2a618123d361c553d24d28681382022223e8775342cb575e387df87c28a327c5237f0d6
+EBUILD x265-9999.ebuild 5658 BLAKE2B 8d49a15d453de1f14490127df3a87cb54a6cd5ec537d168f96e14bbf86112c83250b9c628d0716775c822f2d09ccd03f72a14d4e338b951f35e9e3ec658b7edf SHA512 86e7f61a3614e7e40cb2570a0bb613187d419ff7e0551974cd0b2504e6c95ab1b51c462bfb2031b7d68f5cebd80ab79a62fda5c3bcd7f900ae8d21cd011965a2
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/files/x265-2.9-detect512.patch b/media-libs/x265/files/x265-2.9-detect512.patch
new file mode 100644
index 000000000000..8437ed09b884
--- /dev/null
+++ b/media-libs/x265/files/x265-2.9-detect512.patch
@@ -0,0 +1,25 @@
+--- a/source/common/cpu.cpp
++++ b/source/common/cpu.cpp
+@@ -110,6 +110,11 @@
+     { "", 0 },
+ };
+ 
++bool detect512()
++{
++    return(enable512);
++}
++
+ #if X265_ARCH_X86
+ 
+ extern "C" {
+@@ -123,10 +128,6 @@
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-    return(enable512);
+-}
+ uint32_t cpu_detect(bool benableavx512 )
+ {
+ 
diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-2.8.ebuild
index 5f87da893e5d..c60b19162d5f 100644
--- a/media-libs/x265/x265-2.8.ebuild
+++ b/media-libs/x265/x265-2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-2.9.ebuild
new file mode 100644
index 000000000000..38316ce55ea2
--- /dev/null
+++ b/media-libs/x265/x265-2.9.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/165"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/ppc64.patch"
+	"${FILESDIR}"/${PN}-2.9-detect512.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist=""
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake-utils_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	append-cflags -fPIC
+	append-cxxflags -fPIC
+	local myabicmakeargs=(
+		$(cmake-utils_use_enable test TESTS)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DCPU_POWER8=$(usex power8 ON OFF)
+		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index a8bb14b86fa3..b62476a545d0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/161"
+SLOT="0/165"
 IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-libs
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)