gentoo resync : 21.12.2017

39 files changed, 471 insertions, 297 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 86ac6b0e6879..7286031239b7 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest
index 152e4d9410b4..5bc8334e3599 100644
--- a/media-libs/clutter-gtk/Manifest
+++ b/media-libs/clutter-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST clutter-gtk-1.8.2.tar.xz 326964 BLAKE2B fb9a764a8372864ef45fe30669bfdf7227b47171ce6714ac7a36fc9abaeab3aabba790fa45cebdcbe75da8034836cb2b10761939153ca52a392e779d9b216369 SHA512 f895e43c4eb2d49f5e514f4c29f406d587d6bdf15027c0632e5caa4c8a1f8048dfbef5674d7ec663379127460826c1d662b59690c8db2d3e54bedf78e357f765
 DIST clutter-gtk-1.8.4.tar.xz 331508 BLAKE2B 4e21b361fb0ebf8e322601e3a9f148125cb489cb6e14a963ee6e7fbf845556dd37fc1fedc89e8288d24bca559afe079cb7efe65c7be5c59c59b21461cf38834a SHA512 810f879a56cd71f1e9c4678ef704a997ee652d052cfea56b3ed9478f7a813a35dd2fdcded028ce17411ae02da52fa31e0fb8d1f4130c7b9f6d25eeb774b51ada
-EBUILD clutter-gtk-1.8.2.ebuild 1067 BLAKE2B 3f2e067c5f26b67cc0aea0c178d8bea263c8e69f86526d4d155afd9a14f8c4db6a50f3801387e73a0eda4a946c7cf4dca27485a95b79516fe6ef71f07662a175 SHA512 28be58913cb9ec6d00e62701348fd37cbf1af3dbd2a4b849503ed1ed25b114663256af972ccb29913a91483b96cd869babe794eb92a7ba7b7a50fe50ed7102f8
 EBUILD clutter-gtk-1.8.4.ebuild 1065 BLAKE2B 1b71d302c059aafefdb65ba8dad64d3f1e6578aaa8f74aa7ec60da7a4d72eac1258b254f3f979f87efc151041a64efd3aab3f79f3a6a7042389bfb7c2fa83e6a SHA512 77550227a730d0994cad9cf01665bea0a0dd9ba524cda4566259859b5bc5dde8848bcea6cf8a5f930cb96d9bbb7167132501a83ad555f1bfbad2f0d94337899d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.8.2.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.8.2.ebuild
deleted file mode 100644
index ace0507cadca..000000000000
--- a/media-libs/clutter-gtk/clutter-gtk-1.8.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
-HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
-LICENSE="LGPL-2.1+"
-
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="X debug examples gtk +introspection wayland"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.21.0:3[X=,introspection?,wayland=]
-	>=media-libs/clutter-1.23.7:1.0[X=,gtk=,introspection?,wayland=]
-	media-libs/cogl:1.0=[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-maintainer-flags \
-		--enable-deprecated \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,redhand.png}
-	fi
-}
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 2cd38637a246..84dee03132d8 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -3,9 +3,9 @@ AUX faad2-2.7-libmp4ff-shared-lib.patch 867 BLAKE2B e66bfc5c6709f114f294013baa6f
 AUX faad2-2.7-man1_MANS.patch 405 BLAKE2B f239c7a2391f21c5a056d09a8beb27795bb030a7dc5c40db95d903af8a37d780d611d1c31a27c1041a42e9777fd60ef57c866c9a8fce30e9814a626bcb15aaca SHA512 fff6f5dbc0ad086a4131e3ecd66a5db74dc8d9ce908c51a9e94c138847b91d62c63bbad15d32d94a220246db113cc7d4768efa888c82ae95fe5dd3c83b94cf4a
 AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
 DIST faad2-2.7.tar.gz 1137407 BLAKE2B 15f82689e671d8cc4ff21bf6f048aadb407abdaeff9ce59982e17b3b97e56c9e848664624e751fd8f4cc7876ab1a8e4c373e7b4a20d9970f5c085d8a0a9006e2 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
-DIST faad2-2.8.5.tar.gz 1025674 BLAKE2B 92ea53535f567a9198016f8370fac3c0b8c0a20a957b29ba09ad4bff841c41f2964feb8bf4a419c8fb829403325b0a7da3e28057e335e148a4e10c5c87d3091e SHA512 bb3445aa82b18688b32d7ac9983e5fbf47b6c717486e58c711483967cbf3887540e8a57840a76e686eb990eae341496457ec39278f1c62256708b2d5ef4587ae
 DIST faad2-2.8.6.tar.gz 1025654 BLAKE2B 16d5e08ea8f0ecfff8d1f5eb17f219d481afd9bc774c42b1cf4bc604f1d57eeb9bfedc0d5654e52d887a4bdf3ba8e6a215e51343a34f781613e588502532bbe2 SHA512 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8
+DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
 EBUILD faad2-2.7-r3.ebuild 1462 BLAKE2B e699c3a456709bf59b576402510347e33d12537fa256898cc5933ebe443e914d69e7264897a7591340f8c23211d3f83191d2071e53d364bce52e231b34b37a9d SHA512 d59e688d540477838ff9faa5f23857ff6f0144caff8aa8c32aecd03fd7ad47eb1be79fbadcb2686808d1d307a46d69d91d309d52076caddaaa9c49bc3267e63c
-EBUILD faad2-2.8.5.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
 EBUILD faad2-2.8.6.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
+EBUILD faad2-2.8.8.ebuild 1246 BLAKE2B 0ed1c6985c411391db68a12c9cc74eb7a41e0c406a06086fb95fb9c0e2241b36eedca9f8df1119d3c2aee079ef3e9ed60e433fbd8c2ff64d6c29c66b0e299b9e SHA512 d9281740cd1aa9fd1bc609e6779f209b894909da092a2485b68cc5f57061a5dd202e77e3c9dddea21d69c64e44196996f1417620d729b9cc5a7ba8d5947ed284
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.8.5.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 3429665fa71f..3429665fa71f 100644
--- a/media-libs/faad2/faad2-2.8.5.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index c4ca96b76bf4..36bfd4e759ed 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,4 +1,4 @@
 DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
 EBUILD ffmpegsource-2.23.ebuild 940 BLAKE2B 88cf60aeece0ed73f2704f2d2728ad41b1ef2b064e8c581a147112962ca1cb9951d01de736bf75e65d81d9f1dd9ee5002274f3d9f520c5560c93abf3ac06415f SHA512 016aa1092cee9af16e1b4362f960976ffdd63f22bb09f4eafa3cb28e4ffbec797469706c88f404f6f294012951c2d66dde965461f7f8eb08d0ea44da5cd5cdc7
-EBUILD ffmpegsource-9999.ebuild 899 BLAKE2B 800d71cc3e7c5719367713848452225900c3baa7769a29ae86ed075ae9bd2800e433d478932e6256eab02a6c1566786f03ab00bd4f9f10ed58c03730d07a4b06 SHA512 49c88b0fc42463516b2aed26ee185489fd1f764c55b97b281f37a448f154f4686264fb2a6d05fe481b59a542e6413e13929b78f4e0161459c58d45e783e4e02c
+EBUILD ffmpegsource-9999.ebuild 927 BLAKE2B 1d6d0723c92ed3fcd78987cd9edcc6e684449c80e110001d85c2994e77c86a5da1ffba110ef572f9c664bd38bcffec947833175b1779d7dffdbc712ba13a5d4a SHA512 0107b996a1bed26c046a774a61fbf58b7d1a044f6c949f7d7163d02fc62af9e0ba674f435ee2ea350d2781e5ec4aae42d6734d36ae33709907537f2701b7efb0
 MISC metadata.xml 507 BLAKE2B 6ce2ceb8bd9827a50784948705d2ffc4169fdc376db667c3e3297b2fb0ebf3855933893bc0912f8f6acc1622255877330485ad25dcd00da332144f1a97fda1cc SHA512 c3e00526e12e471551692e9d8c5728a0201fc9d71c6f4ecab7a7ce44ccba492a0c89073a47a49f73f6c2569e4d1f92ba0ad586a2c544d4e65ff5caae6b8f6c9d
diff --git a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
index 7f457d85c064..8f773c387ca9 100644
--- a/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-9999.ebuild
@@ -38,6 +38,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	mkdir -p "${S}/src/config"
 	default_src_prepare
 	eautoreconf
 }
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7b4a80931cf3..7b10e69413c6 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,7 +6,9 @@ AUX fontconfig-2.7.1-latin-reorder.patch 1701 BLAKE2B 9ac50adca6b257ebd12848ac09
 DIST fontconfig-2.11.1.tar.bz2 1516095 BLAKE2B 4f78c606d198c4d721dd7fe61181f4433a562fee7f69372e64b661e4aac7750928bc158691fdbaf5ae932bda373d007f95a6d0089cda2eb50f15f599c4eb9d6f SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
 DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
+DIST fontconfig-2.12.91.tar.bz2 1678752 BLAKE2B bb34ec8559a372696e72629aaac517c24ee5a9503ba6f8c20fdda22f5e2eac49b94323c18e6d90cbcba72fd00b0ad8a88c12c9954b55c90f78e7888129773abc SHA512 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301
 EBUILD fontconfig-2.11.1-r2.ebuild 4782 BLAKE2B 4bcd94fed5731033e8723f723b60bb459d126352e3c08dfcfde9b115e3f97dc6264dbd3b8d388903b3a7b7c6b37ddb397c33db3e54fdfecf2c1c9bcb7d10f663 SHA512 9062067b0c39210ce14f4ad02ca6c603db6d5ec766e2d250fcf617ad3f6f360e684ae148eaf12c0dbbb334d62f021081c9b1b59220a4f3afd77f0b84a3a13f33
 EBUILD fontconfig-2.12.4.ebuild 4942 BLAKE2B 4a9a8de85fccc6334116363078fd2638af1a9d989afe77930b51d1c8345541c1fd1d40411dd46a1d1b2db962cc1e4c5212f9c39b12d19ee8091c57ebdfaaf6e4 SHA512 ad239f720f3e2d7b41dd2bfd4a59e4a9fac956729caf96877d00e4a451b489c3b553cdab09b7e6555da3fa72760249962bc983c583a6f36620e10fff39ec18b9
 EBUILD fontconfig-2.12.6.ebuild 5020 BLAKE2B 8cf7acfca96c7ed94e598fe4fd41ce574907444de05b1b51dbce5d217acd22b2ccfe2974890aea6b2431f63911638e2a3a1454942437ad50baf17d26542072f3 SHA512 20223c6d58392074ef8658564005fd958b0bb67a6845b63e229290d6b5f9df5a907633c146ad5dd992ef4d0753d3e377209c42e47a9e638d281c3f1e98c58443
+EBUILD fontconfig-2.12.91.ebuild 5021 BLAKE2B 3fe1149281104d8ad95cf2cad63946810aeb10f09cfd38c8b4a7b5a2505f8b8c26c058f4a21c936d759f0e33aaedbaa63b0fe60d4e804ea368676bccc496d0c7 SHA512 b18ed264bf25a44d06ac0d37ec7fc5c78788d90856133018fe8cdad88e2f1a387d552ddfcbc837420826f6baafaf197b9e8b8c97b584aeb0436bed5193daaeca
 MISC metadata.xml 729 BLAKE2B 31b153dd3c6706c13959ad9f2c90a627ea4adc18531c4cf60f9459f040ee915286a303936e53b49cc07e1bfaf800c80f38cbd62105aec88c0329e251a4dd3f47 SHA512 1564dd34d88ce11248bfd5ea6b508eafbc30a4e6ff47f3b9076fbc9f900cf8fe4722a2095512bf7bb659e83fc690d4dbc6b82746a8a38e862577dd09ce7b4a7b
diff --git a/media-libs/fontconfig/fontconfig-2.12.91.ebuild b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
new file mode 100644
index 000000000000..7bbb78c79d99
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1.0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc static-libs"
+
+# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
+# default and used by every distro.  See bug #283191.
+RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( =app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex] )"
+PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
+	virtual/ttf-fonts"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
+	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
+)
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+pkg_setup() {
+	DOC_CONTENTS="Please make fontconfig configuration changes using
+	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+	overwritten. If you need to reset your configuration to upstream defaults,
+	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+}
+
+src_prepare() {
+	default
+	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
+	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
+		configure.ac || die # rest of gperf dependency fix, #631920
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local addfonts
+	# harvest some font locations, such that users can benefit from the
+	# host OS's installed fonts
+	case ${CHOST} in
+		*-darwin*)
+			addfonts=",/Library/Fonts,/System/Library/Fonts"
+		;;
+		*-solaris*)
+			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+				addfonts=",/usr/X/lib/X11/fonts/TrueType"
+			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
+				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
+		;;
+		*-linux-gnu)
+			use prefix && [[ -d /usr/share/fonts ]] && \
+				addfonts=",/usr/share/fonts"
+		;;
+	esac
+
+	local myeconfargs=(
+		$(use_enable doc docbook)
+		$(use_enable static-libs static)
+		--enable-docs
+		--localstatedir="${EPREFIX}"/var
+		--with-default-fonts="${EPREFIX}"/usr/share/fonts
+		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
+		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# avoid calling this multiple times, bug #459210
+	if multilib_is_native_abi; then
+		# stuff installed from build-dir
+		emake -C doc DESTDIR="${D}" install-man
+
+		insinto /etc/fonts
+		doins fonts.conf
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+
+	# fc-lang directory contains language coverage datafiles
+	# which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
+		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
+		rm -rf "${ED}"usr/share/doc/fontconfig
+	fi
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf we force update it ...
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	doenvd "${T}"/37fontconfig
+
+	# As of fontconfig 2.7, everything sticks their noses in here.
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# Bug #193476
+	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+	# config files.  If we install as-is, we'll blow away user settings.
+	ebegin "Syncing fontconfig configuration to system"
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
+		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
+			f=${file##*/}
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
+	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
+
+	readme.gentoo_print_elog
+
+	if [[ ${ROOT} = / ]]; then
+		multilib_pkg_postinst() {
+			ebegin "Creating global font cache for ${ABI}"
+			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+			eend $?
+		}
+
+		multilib_parallel_foreach_abi multilib_pkg_postinst
+	fi
+}
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 34f1160c53ce..f88f0ef3fed5 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -2,4 +2,4 @@ DIST libgd-2.2.4.tar.xz 2478528 BLAKE2B bec49fd50465549d13a403e6f2d487ef83633842
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 EBUILD gd-2.2.4.ebuild 2084 BLAKE2B 5900122dc6e6213e502f5fd34993d04e27c78ca3d2a5e7660f9ac3b17c48d8de0920aa253135363e1a4a8efbadf5b26c1d34695d735f0ee1f7d78f214a794bc6 SHA512 aac99cf6d28eda87185f48387607635dd9a4edebcd7b17cdeb403ed5360356d51fbcea1836d93eda72c1edbc1509161139481246034835a6e82e737f33eb0f12
 EBUILD gd-2.2.5.ebuild 2059 BLAKE2B 8e354b11becdda2afeff752d2e1c6510ab4fabd4768a806bf6ee85f066cdae08b31c46fac645b6993e64dd595cdae69d4376c48f935b53288a7cf892402db646 SHA512 5b144d82cdb20dd6c3c9c7adc3c386b10637feddfd38c203a4e0206967a1086707ae6b643d824d0900ea9248e5a7811781ab9490138d58cebd0099e28cf1db20
-MISC metadata.xml 1585 BLAKE2B d339f0ff3ea77543b8ec83d4f416bff0732c53ad095e9f71e132de53015f6a38fb12ecacf0450db401192c1cb2682cb940c9546a1378f137de01889a032416c9 SHA512 b153415e14980d822fd0fe3c70e132e9a7bee930da527d0181fa608d4f869cc678bdc06214bfd5187d631f82f821f997de4995d3f11e7621175d6628a2e40a7b
+MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 35f504c1b9be..32fa1e5daa8a 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 9c2333596f03..720893b87aca 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,7 +1,5 @@
 DIST grilo-0.2.15.tar.xz 627196 BLAKE2B 3277f2588413e364835954f971c986451837b6992858d48273280d511a4d1ef4a8075924aaa3d4426818952e9f4d65c1b2dff7d3e255b2cbf30a8f73f740f91a SHA512 ac0a76d9075e5383fe1a56277b23986a8ec8e86f01f3f782ac7dc79539904712c22295c679243604b619f24088a1210622e0699b5601678264bd7651012ded3e
-DIST grilo-0.3.3.tar.xz 641440 BLAKE2B eb35b3344b34eb8d2986bb92e19d6de41f1906c1b9bbe74317790bf820a2082a2b912bebe7d41d818b2a7d7f5a776151a8700c1b017c5ebb34a296ff09a930e5 SHA512 5ea94903c7ce0360eec0bb72c0a6c211a83da087538bac1274e8521360364bd852d0f63a27f85119d75541d323f0fbc89b21a577109cc3ee4faa6e33b105be5f
 DIST grilo-0.3.4.tar.xz 644616 BLAKE2B 4e8a7ba7da065b91cf780e4ec5da96b7a63534c2ef22d80cea21853a9373bca59359d2384e6f549689221a4eb1da495037c88e9adaea6c786005963c97a9aa1e SHA512 d3800a1873364dc8b56748924eee71928f9e08ad82d8ee2ffaf265cca7e26476081e543f42f26db57c088b2b063f86244e6718116710fc39fdea623868992145
 EBUILD grilo-0.2.15.ebuild 2168 BLAKE2B 194275416887ac3e9d0c02cc68bac9945f3d0b7b35967ea0322a8b3ad6fbf962feff735f02c761cf02eb89c2215880eda473bab60a87345ddd795374a1dce12a SHA512 a3c16193769a111bf219382eec548de6bde3088646c02c579a553f5adad9e8949791fb9d06547bb58aab1b67505965c39bb8063cdc708b549779fed31c7109d2
-EBUILD grilo-0.3.3.ebuild 2297 BLAKE2B dae2b80d83636ffd8f331e59bb38e0ae5e513aa9e4812dc35f55308b5f27e8a6852ec735a934e64e9f1141429883d9bfd87ed42144e8d7bdaa38210ed854ddda SHA512 9e0ec9c435a33a9b3d19dc9ae1a6d5d352fd2ad2377c22999d18a0f0ef2d308d85a9dbd51024d304767503659e2d278f2de2916d699097e9b1f5e0b91d3efbd9
 EBUILD grilo-0.3.4.ebuild 2297 BLAKE2B dae2b80d83636ffd8f331e59bb38e0ae5e513aa9e4812dc35f55308b5f27e8a6852ec735a934e64e9f1141429883d9bfd87ed42144e8d7bdaa38210ed854ddda SHA512 9e0ec9c435a33a9b3d19dc9ae1a6d5d352fd2ad2377c22999d18a0f0ef2d308d85a9dbd51024d304767503659e2d278f2de2916d699097e9b1f5e0b91d3efbd9
 MISC metadata.xml 484 BLAKE2B 56ca18d39e67d361c060c6b08bb8da562257cdf8a3f8ca208a745cc628ebd4607bb3bd84f2269d54c914fcd83123b152258ed888691c510b856d8f16f3eaf2ab SHA512 b72030308a92f0c105f71df30321e2aa52d7e7bedcaaa8a2ddc9eb42e4e70981f6015ee8d00c81e50ce6460ab91396742619b8962c95cf664125f283ecc4e229
diff --git a/media-libs/grilo/grilo-0.3.3.ebuild b/media-libs/grilo/grilo-0.3.3.ebuild
deleted file mode 100644
index 8226d721b9b7..000000000000
--- a/media-libs/grilo/grilo-0.3.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_MIN_API_VERSION="0.28"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk examples +introspection +network playlist test vala"
-REQUIRED_USE="test? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/libxml2:2
-	net-libs/liboauth
-	gtk? ( >=x11-libs/gtk+-3:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9:= )
-	network? ( >=net-libs/libsoup-2.41.3:2.4 )
-	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		${PYTHON_DEPS}
-		media-plugins/grilo-plugins:${SLOT%/*} )
-"
-# eautoreconf requires gnome-common
-
-pkg_setup() {
-	# Python tests are currently commented out, but this is done via in exit(0) in testrunner.py
-	# thus it still needs $PYTHON set up, which python-any-r1_pkg_setup will do for us
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s:GETTEXT_PACKAGE=grilo$:GETTEXT_PACKAGE=grilo-${SLOT%/*}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# Don't build examples
-	sed -e '/SUBDIRS/s/examples//' \
-		-i Makefile.am -i Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		$(use_enable gtk test-ui) \
-		$(use_enable introspection) \
-		$(use_enable network grl-net) \
-		$(use_enable playlist grl-pls) \
-		$(use_enable test tests) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-	# Upstream made this conditional on gtk-doc build...
-	DOC_MODULE_VERSION=${SLOT%/*} \
-	emake -C doc install DESTDIR="${ED}"
-
-	if use examples; then
-		# Install example code
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.c
-	fi
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a4b56074d684..82abc0098b61 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
 DIST harfbuzz-1.4.5.tar.bz2 1474461 BLAKE2B 8f2fb5c20c92afe3fb344bf4d4024090d68ab60c6d899c9805eec0bc6d0a714a3d98bfb6718ea4225da68b19e95db357c744dcba310076f4c56ed590985c9d1d SHA512 dd505ef950ef1d702a820987d8e93097e4c4fd9f725d18e69dd756ea21d4d5624eb2edfc8563f89947e3913bf5efa1834092e06ea02821744b0b588ce2ceb00e
 DIST harfbuzz-1.4.6.tar.bz2 1475086 BLAKE2B 8fb082016bc50e8ae2ab9244ae2ac0b01dc5967ab14ec6aeba52a66b4926327f6c0cb7bce0020cd8183c07c57a41de1255a5782218fda87290cbad2c29d08860 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096
 DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
+DIST harfbuzz-1.7.4.tar.bz2 1718260 BLAKE2B 9a1ded92df7682b161a3db8ee9de80d0a2bc7d6b28f3318bad37c9efe45d7b13b8e268346dc814d7875e739d22eb264c0e7e75b24c931be416e8dca4b7f6e9d9 SHA512 d5343822f2e7ed33b34f0ecb470d219be161ebb4d2349833a8fcd909cec18a97aed6ca51a97fd73407d5d70ebfc61cafb71bd13ce96c9a278c720681a04f47df
 EBUILD harfbuzz-1.4.5.ebuild 3090 BLAKE2B e1a760f7ccd3b6fd7dd4de7e1aa2e6b37911171dcc1781dd6dbfa7780596c4e8e3e67ef6419439e65ca554d904071daf9105a60aea7a9e8de6dea63e819a6363 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24
 EBUILD harfbuzz-1.4.6-r2.ebuild 3167 BLAKE2B 7f7ed68df05d3d71c1977e253a8ba7da7ac28d65467b255e7076f39a47e46e91e558ecc5a30069c75f47d9933163ae2a661c3c11c9937dd768cc082136c14797 SHA512 e20d4f4d7573ddbf45eda1df6ac1302ef262e1023a02da03e9202c274681fe2fa7355afeec0edeee36898aa8e61195ecb2f3afbccea230b21d5c7c6bc1a38eeb
 EBUILD harfbuzz-1.7.2.ebuild 3155 BLAKE2B abc11b2c1318453d833d04a2c9c33c875b1eb7b0af4ac5d35bc9aa97961be8ef50b1f3d3e446440d2c7ac13a09baa1b472b66f8a14c150943982164712fce1cb SHA512 c148286f61e20af53d46097bb7198f4a41ffe2dac46a54fa676ea8bda0cc703cd18272e80aa54bc318d3350ca976193f0bb7389d8a10e75d254f80b384d646e7
+EBUILD harfbuzz-1.7.4.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
 EBUILD harfbuzz-9999.ebuild 3193 BLAKE2B 50345bc2c90c47ba8e51cc8ae0097b42c063ff890d5f830f8bc20bdab91cc90470973ded3f8f8d0716040bacb25dd0b38ff3c53ab483fff8614f93ee3d7c24da SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.4.ebuild
new file mode 100644
index 000000000000..da388e5fba70
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.7.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils 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"
+[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+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
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+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
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--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)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index cfd6299594bf..c8ce414bebbf 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,3 @@
-DIST libchamplain-0.12.15.tar.xz 616692 BLAKE2B 5b0f2697eac0bffb4f2d0702e54c58c5e129ec88d09fbe10035f7a1adae7ecc160023b20eb109ede0e9372ba8f23ffe5cbc9afc08828de8078109336bd8c4c94 SHA512 df921dc26e30bc32f6487c02fc3c3f2dc7c672f6f42bd79e05091f717e6545051ab4f0db0709152a5babd4bbd7eb122997682561d9d63bef19bc1b2923100437
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
-EBUILD libchamplain-0.12.15.ebuild 1609 BLAKE2B 15963cc53511fb190ea8f105afa56bbedc9c586f43d3c7e6db0e6034d5306d3a4c7852caf60615ae81bff18a4a6dad18e236b13783217a59e90356eb677cff18 SHA512 5d45092261e5c5917cc511e0edc563656f834bc7c8fcf431c8159b2813abbbccae450ee0c4449094887e7b15c56465bb1cb1139138f031ca0bf8de438155d5db
 EBUILD libchamplain-0.12.16.ebuild 1609 BLAKE2B 15963cc53511fb190ea8f105afa56bbedc9c586f43d3c7e6db0e6034d5306d3a4c7852caf60615ae81bff18a4a6dad18e236b13783217a59e90356eb677cff18 SHA512 5d45092261e5c5917cc511e0edc563656f834bc7c8fcf431c8159b2813abbbccae450ee0c4449094887e7b15c56465bb1cb1139138f031ca0bf8de438155d5db
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/media-libs/libchamplain/libchamplain-0.12.15.ebuild b/media-libs/libchamplain/libchamplain-0.12.15.ebuild
deleted file mode 100644
index 8f081e3d8b9c..000000000000
--- a/media-libs/libchamplain/libchamplain-0.12.15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clutter based world map renderer"
-HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
-
-SLOT="0.12"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="debug +gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.16:2
-	>=media-libs/clutter-1.12:1.0[introspection?]
-	media-libs/cogl:=
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/cairo-1.4
-	x11-libs/gtk+:3
-	gtk? (
-		x11-libs/gtk+:3[introspection?]
-		media-libs/clutter-gtk:1.0 )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Fix documentation slotability
-	sed \
-		-e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
-		-i docs/reference/Makefile.{am,in} || die "sed (1) failed"
-	sed \
-		-e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \
-		-i docs/reference-gtk/Makefile.{am,in} || die "sed (2) failed"
-	mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed"
-	mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Vala demos are only built, so just disable them
-	gnome2_src_configure \
-		--disable-memphis \
-		--disable-static \
-		--disable-vala-demos \
-		$(use_enable debug) \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index ae3906cb16ce..7b2a5ac45568 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,4 +1,4 @@
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1102 BLAKE2B 0f717fc9357f6ae49705637df43368c0e835e7fa778433c985b882d247cf14e1e575bb747ed79123374d8e957e56905248b704ebba54d087c5b88117e961b106 SHA512 404b63f3579f642619a1574cb71698355bfc2c01ebd6dc1252d8204f09c0a8e74e2c49e31a5806950774ee06e2b07798e35e0d47db7060fdac6b98c42d3c766e
+EBUILD libfreehand-0.1.2.ebuild 1108 BLAKE2B 4399cde62e293eaafd33252a94b7e360b8d5381c57e3570c82252879f1ac62dd464af4b1258f073ccce4ac2944679a774e3aec02a18b4764bba9329b26401407 SHA512 0eeb84eb319579ef7fca948311236ad4ac95fc19a2de17c7505084d50063ee13dede733ff0a1a9e58e7782424d5c12560c904b4787559d486ff8ec5f7bf4deb5
 EBUILD libfreehand-9999.ebuild 1092 BLAKE2B 78a78b69979a1b5eedf307918edd61dc9d7f2bfe347d8a638b40c7a0bfbbe70946e4faa7c646ffaa1d6681922e90e4c6ad53078bfecda74ce74e6f165b6de43f SHA512 d21d085e44c862de43052f1431bd8e730e9d1044f392bd3dec48b69b917867c74b80d681dc0e3d8a51c4d6c04bfa2be501e735de8b04993a3122f7e749e452d0
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
index 14e49ab8f824..2955a7e02a4d 100644
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 LICENSE="MPL-2.0"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index eb46159962d5..bdd61e593076 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -3,5 +3,5 @@ DIST libmatroska-1.4.7.tar.bz2 619463 BLAKE2B 5cd5adad33e327b07ded8ae042b8e2f898
 DIST libmatroska-1.4.8.tar.xz 286284 BLAKE2B 46bec9bbba97d89fe7db63715c2b3d9b648076814b206f6fe2423b09e0b9c6ab130c9cd338442eb810471773c24fe6e32dc6cc044d02bd622789e6e41f36dda1 SHA512 af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee
 EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
 EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
-EBUILD libmatroska-1.4.8.ebuild 707 BLAKE2B 949163c97643956e4743338ff34e3a149361f1607e24d053296b9f45b82eb7387ac60ab20dba9f9df85efda49a90dc33c0167f7463eec783203c96095ba56243 SHA512 8b7b412fb4d50ebd12f1be103f5d21cace556eaae49b07d71430bdab4cea58593dfce5afa42463441b18bf09b617280842373f19e6c761141bf1251f5f528861
+EBUILD libmatroska-1.4.8.ebuild 706 BLAKE2B c41938d8c25930a3fcc0edad58244a26d3c4f99b489fa6aa275b73b42e10d31d1a3663b9ea2623cbed650cb8de9ab4803bf8bb4927aeeaad394a2120a513e404 SHA512 ef89b2c9705b771dd8900d518256d786b8d965ddac4acce4eea44172cad535785948ed984ed2dcfb12be7b2a5d3829cb4954a9dedeb0ea58d9f66be42659e9d8
 MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.8.ebuild b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
index febe604b4f64..92565d47de0c 100644
--- a/media-libs/libmatroska/libmatroska-1.4.8.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libebml-1.3.4:="
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index e1fbaaae4dad..d417a6271310 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,5 +1,3 @@
-DIST libmediaart-1.9.1.tar.xz 5826128 BLAKE2B 65576c14fbf565d51332ae9cbd8e38ba5df7b1401f38f2fda45cf40885234646e4198fc6df8397a41b036fff106ec8faedd09385262a439ce7c39440f986639c SHA512 1ba43d3501d4775984967960c24bf217bcedd075e1716a2f54266817ae2a93eed119035f385025e34ba83b58ec10e544bbde9c2ad328a3de00c5c80b35524222
 DIST libmediaart-1.9.4.tar.xz 5827928 BLAKE2B defb53867341e3f0f794b3e167532f3ea232028b3ccc3968b13456eb74cacf8fab97e462914debaa0a7f08a2dcb98dcc0e77dec55319291388050a55b6a70a37 SHA512 e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
-EBUILD libmediaart-1.9.1.ebuild 1771 BLAKE2B 6f7d17ad8beb2ec15540651463e6fae22ba2596bb0c7a77bb03526ca70ed4d0b00a0bfcf36f840983ad3b08a483f674b90e6e8502212dfd3d115a8904deb30fb SHA512 7a14f1598189a12c180c432235e2a81265434902039048a567a24816aa2f888a9ca472757e939fc4ff56b63f92a2eae38753db4fe566766ceff1f2c41d8c2342
 EBUILD libmediaart-1.9.4.ebuild 1769 BLAKE2B 76921f46c72702c9b3a6eb1f8401259942378b4a6d2c6023fee3289a8a2a3e685131faac879aa174c2ae643b834bf315dcf59c9b83d881ce98caf250cbb79bbd SHA512 da96a731b80cacab48eb9f356b7bac5041894436c8e5f3a38e7bfdd4231da7bb02d42815871f0bd14f094660de1054cd9202366b5cff5c044f73db075b26e844
 MISC metadata.xml 335 BLAKE2B e8913835af52f0cffac2adfeb58abe2f2028fd27fb25a74cb70e03f14dfd69b3acd068d5b2c6fa68f51a73c304f9735e988c1497910dd627d7ef990fd95a412b SHA512 467d3cc035daf04fbf86044c676241a0c388f7f4ecdca1de15ac87772c8878052fe37f456c8627bd8fb385f520ec9a741b96a4abf2b43d5f981562805b22009d
diff --git a/media-libs/libmediaart/libmediaart-1.9.1.ebuild b/media-libs/libmediaart/libmediaart-1.9.1.ebuild
deleted file mode 100644
index 7edc7329decb..000000000000
--- a/media-libs/libmediaart/libmediaart-1.9.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.16"
-
-inherit autotools flag-o-matic gnome2 vala virtualx
-
-DESCRIPTION="Manages, extracts and handles media art caches"
-HOMEPAGE="https://github.com/GNOME/libmediaart"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="gtk +introspection qt5 vala"
-REQUIRED_USE="
-	?? ( gtk qt5 )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38.0:2
-	gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	qt5? ( dev-qt/qtgui:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Make doc parallel installable
-	cd "${S}"/docs/reference/${PN} || die
-	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
-		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
-		-i Makefile.am Makefile.in || die
-	sed -e "s/\(<book.*name=\"\)libmediaart/\1${PN}-${SLOT}/" \
-		-i html/libmediaart.devhelp2 || die
-	mv libmediaart-docs{,-${SLOT}}.sgml || die
-	mv libmediaart-overrides{,-${SLOT}}.txt || die
-	mv libmediaart-sections{,-${SLOT}}.txt || die
-	mv html/libmediaart{,-${SLOT}}.devhelp2 || die
-	cd "${S}" || die
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	if use qt5 ; then
-		local myconf="--with-qt-version=5"
-		append-cxxflags -std=c++11
-	fi
-
-	gnome2_src_configure \
-		--enable-unit-tests \
-		$(use_enable gtk gdkpixbuf) \
-		$(use_enable introspection) \
-		$(use_enable qt5 qt) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_test() {
-	dbus-launch virtx emake check #513502
-}
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index e51866694915..cac6153de903 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,6 +1,6 @@
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
-EBUILD libmypaint-1.3.0.ebuild 1288 BLAKE2B c050f4494c13229023ff0d8b22bec96ccbc0b2ccf5fec35009ca999e4c6445fb7f54fe924dd5ebad0a4d99df801d2fd64123252affd04006b4030623fe170a32 SHA512 a4db525903690220009592e24052b84026b3dfc644b864c5c850987f296470f91f1bc96b6ad98e469082b03e183b06c6c8f30c79aeef2ada9d65a901b6291c66
-EBUILD libmypaint-1.3.0_beta1.ebuild 1338 BLAKE2B 599d82ff4502132ecd6142cb8621fa6895bc093777623b19eb9b0de8a94575502452e03a3d85137832c6f5dc4efda6c95ecb1bc10bd1c889eee7dba5e1cfea6d SHA512 df3b6586e00ce5a843ebc6f5dfed83a27607149a4c1b38c7486a720cf9122e3311e4150ba76d04ec717350f23ef9b79693d8fd08a6d13c2fecb11e1c8b50cd14
+EBUILD libmypaint-1.3.0.ebuild 1289 BLAKE2B 7270a7c1386058ef4c91e023030d101ad9a2a122bcaa86d34f7c76334074fdb3d316fe078b1b41098ebc5d2ddce036eb0559fc79a3d339886268ab88fdf5dfa3 SHA512 3d8bdba9fd516d7d9daffa32aea108331766ab558f23ea8dd6c959c322100918763858e67e9a35f6fb2bd3c85083019773d44abd4b4587c41ae658ea47d5382a
+EBUILD libmypaint-1.3.0_beta1.ebuild 1339 BLAKE2B e7a63b289b9d4ef68d562f0e5f81d7a5a9318e08f560152c6ebbac1b0159285b537bb570456562b25537503eba26046451441e4c3cf0230531877bffa7c4d050 SHA512 caa081fdb5d793e14676e38816bc53ead5561035a3d8c0ef2af4315f59d5e500b4a2f6dd0ecf23f7c78bb22193017a80f213e47509b82873ae2f4540c2fbf3ab
 MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
diff --git a/media-libs/libmypaint/libmypaint-1.3.0.ebuild b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
index e9abaeef2330..a1c25ca7349c 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 LICENSE="ISC"
 SLOT="0/0"  # first soname component for subslot
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-IUSE="gegl introspection nls openmp"
+IUSE="+gegl introspection nls openmp"
 
 CDEPEND="
 	dev-libs/glib:2
diff --git a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
index bfd8ff226300..bb4fbd79d319 100644
--- a/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.3.0_beta1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_
 LICENSE="ISC"
 SLOT="0/0"  # first soname component for subslot
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
-IUSE="gegl introspection nls openmp"
+IUSE="+gegl introspection nls openmp"
 
 CDEPEND="
 	dev-libs/glib:2
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index a43037f0147f..f5fc0ef19de2 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,7 +1,9 @@
+AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.20.0.tar.bz2 207948 BLAKE2B 59de02ff82f6a9796fee4680b32acf00ee9eb20b8d2051c04a272fe7ad3d68bdb0de7626b9951217225e2a2c2cfeace7592ad75185c7b0a170fef21a3f4b7eef SHA512 bbc8b9154339cd145a61c5e4613fd31a2e457df8242c55371f3245564d3b23d028a0bc0ffafac393119bb47171b7c735f0c3a55cf5bffc6920ae89aa877240e5
 DIST lilv-0.24.0.tar.bz2 244079 BLAKE2B d94b830b7439d55c2a44d9c20b1ea7938f3fe75bf273adfd4c11a38f29cbb266d5ff5c35c656adb8d7d80f47e1e733650b37467437b487720742b27d93a2d69d SHA512 2a5523385e4cb3876abb49d8cd4eb7b8f95b886d8e9dd3155588a0bef7b5ffd7486501a70cb852d4965592ffe7ef8335d8e46666f519b5214753dd9ae96a1756
 DIST lilv-0.24.2.tar.bz2 244764 BLAKE2B e049354c2ec52116bbc0c588829c8e7d6c780a8325bb050d225e4893a4ca7b3c98b8bddd01dbfa0e67616bb6baadf2483087891d4242ccd4156aa8a8749484ef SHA512 b5d04b6bb1fb4d3a9a58d93b233db502dc2ded75672766a31d252abca657cbf2d170fa590c0c56159b2bac68c7af95d8787a512e318e3a0f30855504bb034659
 EBUILD lilv-0.20.0.ebuild 1202 BLAKE2B 73f7f0d02206706482f197c4ae9e55f0b6ad6019d5f9e6926c1f66b18d308cfa324d25683b7eea179a9ef8dc6da279884b817033d1574dbe3765442e51e5cb46 SHA512 b9c60ff6903eb6cbadb2eccff179790294102eb1744cc964c985c1dcd6edb5a9eb9b1015997052d114fc6f5a84324aa4bcf43d2fb8c5fd2aec104d70240b78ab
 EBUILD lilv-0.24.0.ebuild 1213 BLAKE2B 26052c38835583e6d91e25cc1a08d90ad579d6310fa31e63dd5feb870ec2e5f0a58db9a2c68536915ad639ac75106c019fc1de484745c2fc5eb6fcb9832db517 SHA512 38d0463ed4841f97a6ec291507a84b97e698c404d985c275ddbe5bd41446d5cb76f8821b753fdead34063121a945a452b705b86262e8501735b65f7b2bcf189b
+EBUILD lilv-0.24.2-r2.ebuild 1482 BLAKE2B 50e67d1025d19b88cf767549d4dd2e792d01f7964ab6c86bdbb7d674fe6ae429521249ce2d4ae1fffeb354d7ef3808ea617781f7148c1ad61805ac294db6959a SHA512 3f90ec0cdcb34dc55e267307ba6bd080093f7e0a87a7963eb372d7ca988f866ad4e8401561405344e1544bf066b302e9d8ce4c0f0a2fea857b4f1f5aac106259
 EBUILD lilv-0.24.2.ebuild 1219 BLAKE2B fc2801c4b2a283c016db5f2f9fe1e3174b7fac13f8fe7a109db2fef5a5c40a4e5bf18a9476ddd6bbac4e36a291bf49ec75ecefd1d08a2d2b4d84e33a297c8909 SHA512 fcdd8470935eccdb8c09025f33ddc94b7c16ec3369debeef51a78b654f82264fc73259aafda25f74ccebcda1b36a0d19ec65d700e83628396c658545e3eda36a
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/files/includedir.patch b/media-libs/lilv/files/includedir.patch
new file mode 100644
index 000000000000..f20357302b23
--- /dev/null
+++ b/media-libs/lilv/files/includedir.patch
@@ -0,0 +1,11 @@
+--- a/wscript	2017-12-19 20:47:08.288722501 -0600
++++ b/wscript	2017-12-19 20:46:46.932616417 -0600
+@@ -196,7 +196,7 @@
+ 
+ def build(bld):
+     # C/C++ Headers
++    includedir = '${INCLUDEDIR}/lilv'
+-    includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION
+     bld.install_files(includedir, bld.path.ant_glob('lilv/*.h'))
+     bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp'))
+ 
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
new file mode 100644
index 000000000000..5a595038dcf0
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.2-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	epatch "${FILESDIR}/includedir.patch"
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	newbashcomp utils/lilv.bash_completion ${PN}
+}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 6fa7f1ab22fe..10e6895f4861 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -3,5 +3,6 @@ DIST lv2-1.12.0.tar.bz2 399666 BLAKE2B 6a28f9b2971c6f3077859fdcd097ebada445a607b
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
 EBUILD lv2-1.10.0-r1.ebuild 1120 BLAKE2B 4c9532968beee4c3270d19f24db3f100c802cbe261eaf14f05993bf49938f77117ef17c3dce0b67d1db14181065d01365e7d98bb784a5b51533f5c5e211976ab SHA512 4d04d9df9efcb29f34e8520c1a867b4fa06bc9c6267d4a7cc28992715ace8479a7286d73094bd90f7a1c9935eddcfa0cbaef579366545c3927af3f56712daf3d
 EBUILD lv2-1.12.0.ebuild 1175 BLAKE2B da6c306225a16b2af78d48f573d8c171461319932e4f1c5be25eee8b0728ceaa77d728296d333c6f0e1c7394c8fce42aedf0b1e597235edb9e59bbbbb8bbc784 SHA512 cd2cb389d835e1d39aab47dcdc59aad96c4d2b8b2bc2a4bcf3c5da4c576491916297da469bac9eb6bfe09b7badb90b06be1cae5e2566d037386a9243a3da96b9
+EBUILD lv2-1.14.0-r1.ebuild 1305 BLAKE2B daea6f32cf61af94e3ea33dab0291d6814e4008560208e4b8f833f2ab6767515b89facd986098c39505c63183611af5fe6111d66c8c8df2e9be27bb18e7a1756 SHA512 b6fd86d8e85fa1be1b23d68aa55fa52b67f6c44ff1dccf1c95be58f1669001cfc17c805180f6a4c1036e5e742aed666755f1c8fd3793f92a06edbed897f0d945
 EBUILD lv2-1.14.0.ebuild 1179 BLAKE2B d4a01a7b3aad05b401b547096298085c0831ead8f96a60aabcf92d9b7e2493fed0cb9e5ff53a8e01ad86e4fbdbbeaf170d2a836983543c663ca706193c04f4fb SHA512 608021ed6ed19750b78b5a4c2fc5727c280dc6918254411dd6aff165c346ad11c7527c85cc2a85f4220b46457a390e59fa7d2d39a642b5dc167a8f950ac73664
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..ef7903ae2878
--- /dev/null
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="A simple but extensible successor of LADSPA"
+HOMEPAGE="http://lv2plug.in/"
+SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="doc plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
+RDEPEND="${DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	!<media-libs/slv2-0.4.2
+	!media-libs/lv2core
+	!media-libs/lv2-ui"
+DEPEND="${DEPEND}
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )"
+DOCS=( "README.md" "NEWS" )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
+		$(use plugins || echo " --no-plugins") \
+		$(multilib_native_usex doc --docs "")
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${D}"
+}
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 80c969bcbb83..d25e60f6fbb0 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,6 +2,6 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d
 AUX speex-1.2_rc1-r1-configure.patch 1153 BLAKE2B ef6e7e227b19b532a89c819481050aa9aab5c805934ae12f6ab2f666f6e7d056f4375cb0cce31a688c4b725fda057ad01e5b400b5024313c788f02af5880ebd6 SHA512 4cc6ca75ca85861e37fa4084d5614c941ec31459d2c2770264f024c2143cb305a6c63df1b9fd62a14c9f68e45254cd880cc5dd7094fc593f34378a23d2318f84
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
 DIST speex-1.2rc1.tar.gz 1061882 BLAKE2B 1ce4a2c6682c7142cec64dab7075525ffb485d43f61aabab82e01333df2e59c04dba56bf8982a28dd544011dab45db03b4830430303e9610846ed79d77d69d0f SHA512 bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813
-EBUILD speex-1.2.0-r1.ebuild 1665 BLAKE2B 8ec1579cfbdf8c35b94585ebe37bcf0cf35e495aeeaeaec10a4115562392f97df980a46829ad988f263cfbea3c577e033cbeec1d3b1eca88649ffb432792d0f5 SHA512 56f55d48b65b4987359d4ad5cec81652f435a03a890ecabea6f87514258412ec5f5776b3bb61b146b2e867d9366eb8d149d1145eb0dc9aa1e7564c0ae35a7c9e
+EBUILD speex-1.2.0-r1.ebuild 1664 BLAKE2B a4a0de680430b500926ed7d17e053451c6a49b23a978e82f9dcf91f3e0300a652815d443985c8685246c2de75e45a17bfcdfe4501d1e71096dfc398ced140481 SHA512 0e8a7ae967363881c2bf9f139d0285e49465c2db0209586d2e52488a7ecb7e67acfa20c77ad8227c619fe690bbf0f1aef7fa975045458c3c47bb88f215a08f94
 EBUILD speex-1.2_rc1-r2.ebuild 1585 BLAKE2B a0f2e029fac58e02469d8fc71c201052311e6a6de7a3b500ba832491f3c3fd389a7459a592e837e971f16c64240255e839ad06bae5ac062ad8d190a1f71d2d5e SHA512 16920e4bd2a50e933b9a288e0f4a91fee1e2bcfd62adac3f2a438e8f0896a72eef7e35e644c795605caaacb92d3bd880eed8618014d1df53136400818038b1ab
 MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index 067a6748ea64..e9094c737626 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
 
 RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 617eb65f0553..67a8dc49e620 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -3,6 +3,6 @@ AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60e
 AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
 EBUILD speexdsp-1.2_rc3-r1.ebuild 1466 BLAKE2B 3778e15394c69370bd493a1130f716954861fd9bab81244da11bee3f5a5ad3fad42e368b7b6219999fdc125b70b2257518c3a7ce657654239d777782b1cd59f1 SHA512 148ab93d88edea7e6fd50ea7fa8a5011d13b4609778f03b61d63ef5457074a7f8a6daf0ab1cc6de402ce6fe0bf4391345b15466d9fa8c466c86ec0a7a70d7b76
-EBUILD speexdsp-1.2_rc3-r2.ebuild 1498 BLAKE2B 53d188d016786ac4006f18cb59805cdf73ed5c3466364cfb7194be861d8342279d608836294ee3e7b3925ff786b7fc4fb5a65d0816142a4187a795b18f921056 SHA512 5c981d14f31e16d6563bff0131542f1f3a3d7f2af7cf124836a6d02118a85a6548fc289dc527044304e830245d97301a5df2010c7ad2c7bb889c206a001469f0
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1497 BLAKE2B 4da27d9626851c8fa3beab26c92b7976be0e85331ca484829a7453d5c60c6705bcbe89a78a83f941767ce25161dad0e377d44a478ad11393b9a5d2f5ea611333 SHA512 e71eb48457103800abbc2f768544a410c5eeae9cf301eb504e149682b3134b7f859cd5bb2c260c40dbee852696f1c517de121ae44a6d692e8791cc8499371ff4
 EBUILD speexdsp-1.2_rc3.ebuild 1422 BLAKE2B 3e2720efc4fa740ba5ba18c0dcbcff580f4b572baf2c5840aece7cad18464862394c25db7a0fff2f9be996cf3d18f85feb6d393d31be6975b35fc9712e78d129 SHA512 16cb6141e84d413af8be8652c60398612bead1a95f9bfb6e26c2ec9260885a2bd9db910a35ff34123f6095c6502946859623169e364daf86935530b972e98f53
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index 69f5da68e348..a4e5e97a8add 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index e5a117dbe4fc..09156d01da84 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -3,5 +3,6 @@ DIST sratom-0.4.6.tar.bz2 138165 BLAKE2B 2745b36055acbe601ef2ca4720749d84c3a72dc
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
 EBUILD sratom-0.4.4.ebuild 864 BLAKE2B 6527a78c86313675815593cb09ede0deb282ebe08e21f8202d3251bc33ad1581f7639c3eb81498e0eea4e89d71687c51f6630f0df1a08d7953c270a492b95107 SHA512 fa894633fee36d536f431b0ed51464359834e5856cdfe643cdb95bcba450ed981b58938d97194578310f8b0f0161937d33e2cdfc6c0b6f77ea34d6405b308733
 EBUILD sratom-0.4.6.ebuild 962 BLAKE2B 694f3a86c1d400aeb9bd90cb35dc98a61daf9cae6357850e381599dfcbd3967c2ad3cbfe743726d18c8922d11f51fd39ac0b220a2a703946ff0944bb2d605dda SHA512 dbfcf918113e45edc9b6a70bb7eb7b14ec0750f5923f77b98c570de908b435b70dbb871d9247b243d4aa5d0137212698fdfad8b07fd2248583c503728bfee68e
+EBUILD sratom-0.6.0-r1.ebuild 1182 BLAKE2B b6aef204e84266546424201a12c69c8d72b57719930a572f84288140b33104ff5ef785d683a57a5accd08fd14ec82d5b29f9995f52933ce680c36915efa9907d SHA512 4d6771853782379164768ee4270e945e32033ac5ced8627875d2b2470adb2d245d925dcb4c585fd59b437d5f2b19a21cce671edd3778c1f7fa3935f9a3c45a76
 EBUILD sratom-0.6.0.ebuild 970 BLAKE2B dba12d32ada45ae37f80595b988185a2d929f0d471953751cf0e93916b53cafd450298b650a2385baaa7934aee3119bfef89bef78504b3383808a44a7d61f2d2 SHA512 ec297eaa7c64c35a4b4051193cfe96fc68121d025afcf850ad28d1c4f5abb37e14079b3602118acaf18e48152caca197dc3dedccda3a0a0989ce8c271ac296cc
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..b5aac5e4d258
--- /dev/null
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
+HOMEPAGE="http://drobilla.net/software/sratom/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND=">=media-libs/lv2-1.14.0-r1
+	>=dev-libs/serd-0.28.0-r1
+	>=dev-libs/sord-0.16.0-r1"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "NEWS" "README" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/media-libs/zita-alsa-pcmi/Manifest b/media-libs/zita-alsa-pcmi/Manifest
index e5f12bc81fe0..28f1d7ed48c9 100644
--- a/media-libs/zita-alsa-pcmi/Manifest
+++ b/media-libs/zita-alsa-pcmi/Manifest
@@ -1,4 +1,4 @@
 AUX makefile.patch 2530 BLAKE2B 8c8821fd585e856e4264a77dda509c3fd608d69fe7ac92d1cbd6816341f34c3fcafc38e54d11d31328205aedf9d67b3b87e045378c7d12b1fc4ee9b81a422b92 SHA512 b17ef2a498889ebbc3c26c2e515f9cb596d35445e5499ec0f8fa2cb3ecf437a991cc9e29379a47d1de66584ba311f34d862d79a5455a5160765ce47264a6fa39
 DIST zita-alsa-pcmi-0.2.0.tar.bz2 21278 BLAKE2B 60fb731ec37a13472c79a21bbe56ddf83bed9067f7a0665c56f4a8accbe3dc41070b0a0111a2717837904bb30b40865f70bfddb9c5018848059eeb375e11d2ff SHA512 6b521dc8bef96a6ee73bc2accd3c7d0641e9a4f3d955868cd3fe04ae46f15a1b1ffaa45d56518f54f4fdf9f68f629e3036dca294936015205c20f01d55338e96
-EBUILD zita-alsa-pcmi-0.2.0.ebuild 983 BLAKE2B 1f6eb5d9671c2ff47ec6108a2be88d044172b7d8a7630fbfd9033c5f050039c635fea5cfc8fa92825db6f3e45fa0bb06597b77ec15983dda05e06a6905521450 SHA512 6fa3d82b4a8c963e2efa5cd109bfcfeb9d6edeedc125b5f630ac36d9a6c66e483be4214ed59378e29a5c22dd3a0d2822b70dbe8fd51899342c234c4929cd6e72
+EBUILD zita-alsa-pcmi-0.2.0.ebuild 990 BLAKE2B 228fec4deef42701c346fd4b0cad5fccb5fb0e6c2ee11ab8d90654dc26a49424135ac57f334766a397bbbe805158c3c73062db6a28f9419ebaba92c1f2386532 SHA512 adff03ab865cbcf696e0f0d2cc545ede173b2aaa146aebc7a79eeacdb234a5ddaf4aabbda28dc73db1323ab8aeff05d2361aa34fbb3f80df88faae4bf50218de
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
index ca1bb938c8ee..bc254d1853fb 100644
--- a/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
+++ b/media-libs/zita-alsa-pcmi/zita-alsa-pcmi-0.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="media-libs/alsa-lib"