gentoo resync : 15.05.2018

40 files changed, 334 insertions, 151 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4a2abde9c3ac..403299d20905 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index 9efd0e178a8f..7b73d9f7d249 100644
--- a/media-libs/bio2jack/Manifest
+++ b/media-libs/bio2jack/Manifest
@@ -1,4 +1,4 @@
 DIST bio2jack-0.9.tar.gz 527385 BLAKE2B 9f977e8f03a9de272c0b440c256569382876a62875dfc3d1f896c80388bd219d195d5544ba1dd5fb6b2141e63368f4293c3cb5081e1d2d8d3cdceef29a54285d SHA512 8faf73b9aa81d48eddb624146c0144094e466f16cad89fad3670f927963a5944d78f0342aba0f29cece422e3f012faf3e1a0c459fd5cef279406f5bebe66e66a
 EBUILD bio2jack-0.9-r1.ebuild 1124 BLAKE2B 629a4baf8176e3c724e507442eb39836e4fdcf28e2c0d734615e1d66bd9973b9336499355f716f6a1d5f2595a5cd9365342db913d8476c4d8af0f3a0d4c4760a SHA512 247054c9c07e628a71396f69286d240a6d468d566ccc223c2156d8c61658578ba1ae1660ca06b736147c2001cbd563e142794ad19617357ec0da48087b707038
-EBUILD bio2jack-0.9-r2.ebuild 1117 BLAKE2B 24b211250ad3147fcf4fa42566fe0488a2542b6082f2da8935ef182e96e8efb7ff09b678106ae5ae8eafb6a73d6643a1b39f490f31881bda8203d73bd6847ec8 SHA512 2ce2cd2bac46895ef77c40b35b790e0c9eb5f95ce8631e9a908101cd7d25c7aee88c26b049fb0ca16bbd40691032020d34e2fe163a03c3a3ece8a3ddaf90c0f8
+EBUILD bio2jack-0.9-r2.ebuild 1116 BLAKE2B 3feea86074a3cc1dead7f62cf148994f7a15d9c740de0559f6c4f317c62c43777b45134a564d55b19a94c3221669b0ab512f739783ec40f4ce71ca08a1073fe7 SHA512 db2b2a538c241ddb6975877067c264a64c75a3932d58691576601d928a4c65915c442b0b9f59ca9ddc72545edf696961bf9d9bcadaaab21d1fb9d89341963c75
 MISC metadata.xml 331 BLAKE2B 10b8c96e08bc97853a40647f2875aafc8c7de9994ba5af8cf5e2ed429efc2cd494b65d1d6dd424da234785568ebaeec822f15c0b088a0bc8df1a12322f2472bf SHA512 57c44fcd806d4de0339c0a6041635dac52545c8aa71516aefcde41613a8ec92f293c5e28f7b04ed3ab746fdccee306b80a44ef4faef24b2ade1abd2be831ca27
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 10a0f53f039c..508dfec6b962 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libsamplerate
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index e25fae738e22..83cda46b4329 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -7,10 +7,10 @@ DIST chromaprint-1.4.1.tar.gz 611014 BLAKE2B 139a3d58392f442feab1d955b03accb5ec8
 DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3f0ffc0a0c0e88ee5e864e9112ad96cced629dcb8422f5e74aca3c48f93f7fa153cc6aabf0659a4e90416c34f34e43 SHA512 69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2
 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.2-r1.ebuild 1130 BLAKE2B 035bee5657f5c579a0243716a1b3f29ad0b96f3ca012e4e6668b3461b8857df60d23dcdbca70d389e07e49e39497cd5b4af79235e8ee79c11a9cf37d96b0853f SHA512 f9672834feac2dd1d6ec0d11d123b22cf50d0f5550ae702eeb641d3296190f90baa8a3805e1ec98ba8d060a93e8d6270f8c0d8799ab0aecc6e2c0bcbe3e545d4
-EBUILD chromaprint-1.2.ebuild 1076 BLAKE2B 4042edcc33926c157cd7fda5ae9749c07b99a662bd12856b12973ff05044de6f32b79622d85cdc983d80dd070ae5b10abfb6042ed63905bc1e1288578c1c97bb SHA512 163e6bc812268032500c0ed1b97c277f97dc379bbaa6221dd8953b5797849a8f2af98c2eea52b518644ce6a99d5edae1462bb699fcb05a7116a3c0c492ccafcd
-EBUILD chromaprint-1.3.2.ebuild 1098 BLAKE2B 69614a6f80d2dd553f2eb61b5ca38ce69fa0cf69e812ead17a5ae15e23d55788996602a39ca795e19938a45f004d05a66444fb0a23e375f25d1d6ec1850efb92 SHA512 c15f598ff012bd91c312d26e25bd27c1981abf050fb76770a98cfe2f23d96faf50fa6a4e05dc4584d6fca5803a702c7f33bba328b5bcaf09c257509fceaa8da7
-EBUILD chromaprint-1.4.1.ebuild 1331 BLAKE2B 1fc4cb113fb92d29a5613687fc41a029df40e9cf9851171e3dc3ca417c14205128d2733d7aba59972add6b716364d32d362bf5d956723bec22dd708c309556d4 SHA512 9ed09f55707ddedfdb536f8b2613a5118d96e05878d9c37eda15c1a25dfacb07e6add91ffcef71a98a0a4b5b6caa9925074af449ec0e1edc7c333ceea986a256
-EBUILD chromaprint-1.4.2.ebuild 1354 BLAKE2B 15029b3527b9534047b54150899f4f7f2d2f2bbd6f4598eb6eb216150f44adca2a4a84a77e4b9fa545418212a0c86ec7044937eed41962d81f85c7ff92443ed3 SHA512 1589c4c72d09d8c89266f1cdf4e36153f88c42604c5596cf12fadfba594789257bdd7ca2b2886c66a03d2eeebc1bc2f6b74c631866eaa5dc38e4bdf8925a77be
+EBUILD chromaprint-1.2-r1.ebuild 1131 BLAKE2B 4ef0cdb9dc37d917a1dab48f9d911b965e372fd7c75b8d56b1d70515df321892df4149b651aa5de80c2eee13306c58bbadfe60c92f4fa009b710366262866ddd SHA512 7aa5ffe126beb93e43af83fe34d853e86949a7fee2cdf95329b3c33ee4399db6fec4505604a1f6c8adf7cabfae5edd2b70b72c0b2dd153518f394e2d6596cca5
+EBUILD chromaprint-1.2.ebuild 1077 BLAKE2B 7c9097b038c87c0742331d664d885d57fedb544f41a9a9f2239057c3c3f35f06a7375a33508d7e87119011205ef2f5c90282dc8a3ac0b20d4f92e4771e8f98a3 SHA512 c11f6ccbf8b7c0186caf07455c97428a8793389757c44674f588e61171beeb489351daf2a4e01360f621371e3fdd19398a9444928395e36b5d1a508951723afd
+EBUILD chromaprint-1.3.2.ebuild 1099 BLAKE2B eae31032f7ff4149b15053850fe6ae3bf38f391a05a9df4a0f40da6a7f295aad1ef534b2d9942f74e4918d499911346c6d5e24356b206a56050e790ffe4fe4c9 SHA512 70de616dda26df13fe39cf64ec6686e73391774ac3439ed1fd9b9456f7551e909ba74e6aed81f12fd1d2abf8c18b86eb78e5413aac77730f81f3294efb456496
+EBUILD chromaprint-1.4.1.ebuild 1332 BLAKE2B 38f0c3f4fa222d6b9263e103a96b75cb1d86635e22da11cfed090864a02053a0649258d58d1e2866c2f7c4525f1356091a5e590870c69b80ae076fca5af71d2f SHA512 5b488ad56ab7de56531a7e9fce045463e91bc2c37202e1115836247b964ac04385376a2a067b3a6178148543d09c3d2c944981efa25d5cb814d0ef18a8c602d1
+EBUILD chromaprint-1.4.2.ebuild 1355 BLAKE2B 266f15e363ba036a702044d0e067e779e9db15cf6874cc1fc8f543f48ed877f56a430f66bd3f04a7898f9f73e6cdae54e3a6a0a6cc2ef24a0ee53c71f35d9f29 SHA512 9619edbec8b7c40e60985a65c7f146f56f2d3c380512b467ef37a0f02fce4c0ef921ea3ded9fc6c730dd9d7350829476ec7964c73cb4f3c0159e661eef9a1036
 EBUILD chromaprint-1.4.3.ebuild 1467 BLAKE2B a3eabebfbec5ad69d188108fcbc3ac7225ec8905a9e061e4c11075ba3c94fe7463ff19dc315e88cefe6dbe517c5a87e925f1f2bdae2d46ee86c543c8c5a404ef SHA512 277fa46adbeac1bf4bf53a8eb276a406ea0ed9241c3581bd47a7dcd185c014caa6fb59775b901700a6df866e0cd78c8f1e04193f9cbcea71412fe4c744dde441
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
index e80da9186ad1..81b0bbafac94 100644
--- a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit cmake-multilib
 
 DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
+HOMEPAGE="https://acoustid.org/chromaprint"
 SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/chromaprint/chromaprint-1.2.ebuild b/media-libs/chromaprint/chromaprint-1.2.ebuild
index 36e8d79c1ba2..e6bff8e54792 100644
--- a/media-libs/chromaprint/chromaprint-1.2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
+HOMEPAGE="https://acoustid.org/chromaprint"
 SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/chromaprint/chromaprint-1.3.2.ebuild b/media-libs/chromaprint/chromaprint-1.3.2.ebuild
index 5c20be212e86..dcff5eb696a9 100644
--- a/media-libs/chromaprint/chromaprint-1.3.2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.3.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit cmake-multilib
 
 DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
+HOMEPAGE="https://acoustid.org/chromaprint"
 SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/chromaprint/chromaprint-1.4.1.ebuild b/media-libs/chromaprint/chromaprint-1.4.1.ebuild
index ebf87b1edc8f..102d01c254b0 100644
--- a/media-libs/chromaprint/chromaprint-1.4.1.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit cmake-multilib
 GTEST_VERSION="1.8.0"
 
 DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
+HOMEPAGE="https://acoustid.org/chromaprint"
 SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
 	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
 "
diff --git a/media-libs/chromaprint/chromaprint-1.4.2.ebuild b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
index 5b3796717902..d24d84f8a801 100644
--- a/media-libs/chromaprint/chromaprint-1.4.2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-multilib
 GTEST_VERSION="1.8.0"
 
 DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
+HOMEPAGE="https://acoustid.org/chromaprint"
 SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
 	test? (	https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
 "
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 16895e87a458..4de755413086 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,9 +1,5 @@
 AUX exempi-2.1.1-iconv.patch 660 BLAKE2B c0eb393c242b3aea2c184efe2e2da325003ec69e539776e780e1f2ba6536bb1011d90bb3af30e870a9eb6ec70b21e72cf82dd3087d3b51f470ba1144fb88c484 SHA512 805de3806d20a5e4ca31d0223e79e9da2519d9ddb617af7aaf54f0111850b57fb4e4af330297ec21787a32935063c133ca0f74fb59d58e2fe9f64f0b0ba534d3
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
-DIST exempi-2.2.1.tar.gz 3566843 BLAKE2B f174bdf7fe88491694adef8dfa7f25184882deae967bb955972bcef71cff1cc42b0ddee38a356833bd35579f2b9f3e3310dbdcc8312fd4c60737323de5611a3e SHA512 f4b97ec7af89924755a0695464bad5081de6a5d6a6f28c06984c051d677f8771c39df12951761ecd28d6ff520ddec4e21179dcba8b58f0ef649bbdad1a53aa9c
-DIST exempi-2.4.2.tar.gz 3911796 BLAKE2B 73fc84dfff84b608e1408678af06b017617c3be62d0b3ae1606676b5c47d68683f3f94cb9b9a4afcfa76beabbac01997eb421491b51a8cc44912990af4ad0dc5 SHA512 47d0737a95dbd31c3c39ef9a9a8c00e87135c2eb909bea1d89fa8df31c0e73dadd7e9f9f0e6445d3b17457396e0c1381b93f5751494e1061822df47f7099b568
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
-EBUILD exempi-2.2.1.ebuild 1067 BLAKE2B 0c3a3a919e27ed78ef0cd4c9912dd48aff0ed0b378214fe11b6abd25a67ec4ced85b0fc8191c2df91981535199ae7ac65e1a823b9b1a3aac0dbd6588dc758e6f SHA512 4671cc734e821f6fddea6a84c7b67f3dd58549be5d76acf8f99c44aaafda9cfcdf1ffca73262c8b67f355431f58a5fe3ebe37566c64ac58d154442305c35c8fa
-EBUILD exempi-2.4.2.ebuild 1168 BLAKE2B 20951be88c2e85f5ffc13bf7b36ab63d7130d84e8213c93c413f83e415f194c2c4477ccd8e228a706461499f549a0e00bf77f1b69a4bbbc645dbb441b8dacc66 SHA512 45e1f895a0cb7054f08f4d426d47c1be81e8d2367f3aceb2c2ca9cb3becc52742c314ded6e1da97fdc0af69b5e49404285b236235de340bafbfde0f8c0b26072
 EBUILD exempi-2.4.5.ebuild 1172 BLAKE2B e0ae5fd94d47b0b71dc668183c39b57218a2de780132e813824e673c8e03f8db85f43b80f655a86fb7558023d78f6c98591a7616ac62686275b7b46443130a15 SHA512 66488219608bd2c493e3f8c254ad9aee87be62c9a92e59fc0fffba930f8e41ca5026b8dd19ecad20c0fd5f88759195cb50948e7bc39342dd4a4de5340838a40f
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.2.1.ebuild b/media-libs/exempi/exempi-2.2.1.ebuild
deleted file mode 100644
index d59b3f5909c2..000000000000
--- a/media-libs/exempi/exempi-2.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Exempi is a port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="examples static-libs"
-
-RDEPEND=">=dev-libs/expat-2:=
-	virtual/libiconv
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-RESTRICT="test" #295875
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.1-iconv.patch
-	cp /usr/share/gettext/config.rpath . || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-unittest
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm -f samples/{,source,testfiles}/Makefile*
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
-	fi
-}
diff --git a/media-libs/exempi/exempi-2.4.2.ebuild b/media-libs/exempi/exempi-2.4.2.ebuild
deleted file mode 100644
index 083c3142b3f4..000000000000
--- a/media-libs/exempi/exempi-2.4.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune
-
-DESCRIPTION="Exempi is a port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="examples static-libs test"
-
-RDEPEND="
-	>=dev-libs/expat-2:=
-	virtual/libiconv
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	test? ( >=dev-libs/boost-1.48 )
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-2.4.2-iconv.patch
-	cp /usr/share/gettext/config.rpath . || die
-	eautoreconf
-}
-
-src_configure() {
-	# Valgrind detection is "disabled" due to bug #295875
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unittest) \
-		VALGRIND=""
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm -f samples/{,source,testfiles}/Makefile*
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
-	fi
-}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index a5ca90000147..014ab7b8679c 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -10,7 +10,7 @@ DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051c
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
-EBUILD freetype-2.9.1-r1.ebuild 6654 BLAKE2B b10d25f061bf05646c34142afd81322eaf670627e45207aca2b201caf73e03b510b5ab9469dc51adf167b9b279232f4d9311468fef3994b356e00f41aab26e2f SHA512 34425c7695e6f67d24c22c601fa15bef3cfe641fc201447ec9e61387f7c2cb6f3e937d853a8797d782f6dc7ab85ec0192960a16f6b9ccede0e2a3bb74576f4be
+EBUILD freetype-2.9.1-r1.ebuild 6652 BLAKE2B e27d920c843b6f5526be4733670350b07c1ecfb8b7ef04bab8bf32c834d8469ab7814cd2b8777d7b35f50478114fd3df2aa67353a77a987eeec9e4a7b0b7d41e SHA512 32a26c4807cf2e10f234e443ff403a7596c75f64651b32e4bc632997961468e11d32040cb560ec51bfdade71054f477ed49c3d916ba2aff3c4871f9b81c5bb53
 EBUILD freetype-2.9.1-r2.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
 EBUILD freetype-9999.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
diff --git a/media-libs/freetype/freetype-2.9.1-r1.ebuild b/media-libs/freetype/freetype-2.9.1-r1.ebuild
index 25a9abd9df0c..c4a012f69345 100644
--- a/media-libs/freetype/freetype-2.9.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 675804b4280b..487f9db3a214 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -8,6 +8,8 @@ AUX gegl-0.2.0-introspection-version.patch 1233 BLAKE2B 1565b0600b5d5c55e0e39096
 AUX gegl-0.2.0-libopenraw-0.1.patch 1733 BLAKE2B 16aacee7c0a702b0965c0f342822710b8b791fc950e10040de92a4eef06b4d5010b1f8fb8c0d1b23d5bc43e92487e37d278dd750baf06a641d91bbd5205b676f SHA512 8eaa767c7d30e77ebffacb9ebb01789f05c82385ed7671767f0e04dba98a95ee22a4a8f0ca8f19365e0b26e74641dbe00939ff8baa40e84a8a26770c325ad980
 AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b99219a8ca018f74a330050e15f6a62f73fd534327bdbd75831121931c54f69c067dfba125ce18b84fc6a7355d27abb22 SHA512 cec86ffddbe6ce1fd4b6bcf5b7550b538b4967ce409034153ea8712ae59f52471c653ed9b28b4821cc8ddc8b6bfd54775ca17db8c65718712ee6205803050bfd
 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84
+AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f
+AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a
 DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
 DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6
 DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
@@ -19,9 +21,10 @@ EBUILD gegl-0.2.0-r5.ebuild 4995 BLAKE2B 20da1cb203ef3ede096fb3a945bf563278dceb0
 EBUILD gegl-0.3.0-r1.ebuild 5379 BLAKE2B 5bf00dfd8c77e110bd708267604b187d1997046fe9f70a1590caaee8e98e09086480136ebb3ab1bd901489585ade5222e661acbca12139d86a3355529bc73cc2 SHA512 c0dc2b5848b79c1eebcf067f37baddc0f4f7bdbe3b10ec4a97981e5392b4200fb2d5f4a3cb6b347fe881113f3e6ce3b0cd7198b61bc3c5a5ff1789d43d064efb
 EBUILD gegl-0.3.0.ebuild 5297 BLAKE2B 6f6ebfcee8dc76a7d9b5b9e7cf22b4f3e8ebee1cf2f2683d6960d6632ff7ed21b60dc9a92b6052c2cd89f2ebfa0d979aeee9d432c35ba532afa6825694d2b571 SHA512 17b071d9f98be37c8bb33cf5de11a64dd0d6a13bcf067172c6517b25b8ae633f94c3d5f116c68dec36c6e1340ad5a777cb3da21243b5eb59a2c9ed70b5a88c06
 EBUILD gegl-0.3.26.ebuild 5232 BLAKE2B 30dc1d3e133522622ef297b6dab50fcb158c36539facf8d5c08f700d3b7347ad81725d732cdbe01752fd5262cd48371840edbae4e4edb1dd480fcb714ffad4c8 SHA512 e3199c48f170255f7794752e937b4fe80bc35d099c6d338f2540a65f99aa5cfc5326f0ef22a17ca71e5d1d528ec60c87430c12bda9dd851d600c4ff2146bb647
-EBUILD gegl-0.3.34.ebuild 5239 BLAKE2B 5ac20b0e841256591bb38f6b4a2e03f3f37525b4c716e5a14f1315d03a66484732c13bac74f1731f4c2d46bdd99536c4b55d779e1535de18303c14ac4eaaf6c6 SHA512 5422d262f5da7f66b5bea47cd3f32a7bcee63c89cf67a5cbc05da070f03648564e542a4352fd8f30a2fdda95c29353ea1bd322a15542679aa795b7de0959983c
+EBUILD gegl-0.3.34.ebuild 5373 BLAKE2B d04cbe6d8adcf849ff3e93f58037cfbdc7bc417dcc7c4c8ced5c5ab6d2a6dd74213b6564765fb381aa17d6c2c7f3bae5ecf8afa491710d5b1bd2b9cde12a2e95 SHA512 c6420fa6883a2c8ae6c4f5b0ae7782c9fa32fbd5e9727d9dd97c25decbc3700f0596751da8e7433ef04a232c2f6c33b98d2e75502523c3f7f5d5dfdd2884f3c8
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
 EBUILD gegl-0.3.8.ebuild 5216 BLAKE2B eb91252d7d87e0102817b756d8b16c7839ba68ac9b104d2d683e1a59c24d1a183520f0d40ee62767aa0601dc2d636eae37a20a0075ffcc809ea9e2732d96be12 SHA512 a6407382b1cfe1b27922f0b77887353e5649d3203caea9a04bf685b0be66d5a4cba8fb582fc8d62555bec9ff583f6d4067983ff6ead816d27105370382094f30
+EBUILD gegl-0.4.0-r1.ebuild 5535 BLAKE2B 33a1e64317e6ae916e7e7d3a9e4e19120687e7937d6bf6285214925ebb2b293806342a6e0bab0f5c90245da8af9fdbb837cf63338acdc327aefad9353ad6cf80 SHA512 080e0c73d960e5b29e51547c0efd1d42dd08f57cf5d3c6af2344868c6da2084c19bdebbe7512e075f51086092a148b932133c5c586ff5d25324ab8f57f4e28df
 EBUILD gegl-0.4.0.ebuild 5239 BLAKE2B 56fd645cd66deff5f3f391d403b0bea597f5ccd13ec9f5e055c5e5305b5dfd07cc05fced5b3bd8ec4e06441ee9d9c21a47723283b8f81094ba2b5a259e763d92 SHA512 de1a8ef63af7352bc3d4a3f84024dccc47877b9609fa835f6d6313bc7858f4c4f241f9028141ea72bd805af95a47a5491911a2bfbbde5e15c4f276d0c01dc191
 EBUILD gegl-9999.ebuild 4921 BLAKE2B ae0b77a07f047281531c0698f3c830a0906f7938025733daa73f54fd4dcedecfb357c05d7a660991423d685d555e34eddb80c67573cfb60c9744417473b14a1c SHA512 bc4243e9921eefdb4211d44e962a571ca55897dac69fb22460a045eed3cef5089c9d3f2e01a23e1d824837e4ac850adee6b53c1382da444c55082163857de2c0
 MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
new file mode 100644
index 000000000000..fc8027f08ae4
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
@@ -0,0 +1,63 @@
+From 8f2545886ce3be8f1b1229bddcfa5af3216110d3 Mon Sep 17 00:00:00 2001
+From: Franz Brausse <brausse@informatik.uni-trier.de>
+Date: Sun, 6 May 2018 13:38:09 +0200
+Subject: operations/external/ff-save: ffmpeg-4.0 compat; fixes #795625
+
+---
+ operations/external/ff-save.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 90b6162..e7edd3e 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -88,6 +88,11 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0)
+ #include <libavutil/opt.h>
+ #include <libswscale/swscale.h>
+ 
++/* remove if libavcodec_required_version is changed to > 56.41.100 */
++#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(56,41,100)
++# define AV_CODEC_FLAG_GLOBAL_HEADER	CODEC_FLAG_GLOBAL_HEADER
++#endif
++
+ typedef struct
+ {
+   gdouble    frame;
+@@ -290,7 +295,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+   c->codec_type = AVMEDIA_TYPE_AUDIO;
+ 
+   if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+-    c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++    c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   return st;
+ }
+@@ -699,7 +704,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+     }
+ 
+   p->video_outbuf = NULL;
++#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
+   if (!(oc->oformat->flags & AVFMT_RAWPICTURE))
++#endif
+     {
+       /* allocate output buffer, 1 mb / frame, might fail for some codecs on UHD - but works for now */
+       p->video_outbuf_size = 1024 * 1024;
+@@ -803,6 +810,7 @@ write_video_frame (GeglProperties *o,
+   picture_ptr      = p->picture;
+   picture_ptr->pts = p->frame_count;
+ 
++	#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
+   if (oc->oformat->flags & AVFMT_RAWPICTURE)
+     {
+       /* raw video case. The API will change slightly in the near
+@@ -821,6 +829,7 @@ write_video_frame (GeglProperties *o,
+       ret = av_write_frame (oc, &pkt);
+     }
+   else
++#endif
+     {
+       /* encode the image */
+       AVPacket pkt2;
+-- 
+cgit v0.12
+
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
new file mode 100644
index 000000000000..260ff3b2c1a4
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
@@ -0,0 +1,25 @@
+From 2896800b5e7d0c656710c70fdea57098032f3ccc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
+Date: Sun, 6 May 2018 15:09:03 +0200
+Subject: ff-save: update another occurance of CODEC_FLAG_GLOBAL_HEADER
+
+---
+ operations/external/ff-save.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 1edac31..f30bf10 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -638,7 +638,7 @@ add_video_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ #endif
+ 
+    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+-     c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++     c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+   return st;
+ }
+-- 
+cgit v0.12
+
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index 075874901a6d..90e2075cd1cd 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -77,6 +77,8 @@ pkg_setup() {
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch  # bug 654172
+	"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch  # bug 654172
 )
 
 src_prepare() {
diff --git a/media-libs/gegl/gegl-0.4.0-r1.ebuild b/media-libs/gegl/gegl-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..36f2afb95aaa
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.0-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/gegl"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	vala? ( introspection )
+"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=media-libs/babl-0.1.46
+	sys-libs/zlib
+	>=x11-libs/gdk-pixbuf-2.32:2
+	x11-libs/pango
+
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? (
+		>=media-video/ffmpeg-2.8:0=
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	virtual/jpeg:0=
+	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	>=media-libs/libpng-1.6.0:0=
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2
+	test? ( ffmpeg? ( media-libs/gexiv2 )
+		introspection? (
+		$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use test && use introspection && python-any-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+	"${FILESDIR}"/${P}-ffmpeg-4-0-compat-1.patch  # bug 654172
+	"${FILESDIR}"/${P}-ffmpeg-4-0-compat-2.patch  # bug 654172
+)
+
+src_prepare() {
+	default
+
+	# FIXME: the following should be proper patch sent to upstream
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/Makefile.am || die
+
+	eautoreconf
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+_use_with_both() {
+	if use "$1" && use "$2"; then
+		echo "--with-$3"
+	else
+		echo "--without-$3"
+	fi
+}
+
+src_configure() {
+	# never enable altering of CFLAGS via profile option
+	# libspiro: not in portage main tree
+	# disable documentation as the generating is bit automagic
+	#    if anyone wants to work on it just create bug with patch
+
+	# Also please note that:
+	#
+	#  - Some auto-detections are not patched away since the docs are
+	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
+	#    tools affect re-generation of docs, only
+	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+	#
+	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
+	#    but needed during testing
+	#
+	#  - Parameter --disable-workshop disables any use of Lua, effectivly
+	#
+	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+	#
+	#  - There are two checks for dot, one controllable by --with(out)-graphviz
+	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+	#
+	#  - mrg is not in tree and gexiv2 support only has effect when mrg support
+	#    is enabled
+	#
+	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+	# https://bugs.gentoo.org/show_bug.cgi?id=451136
+	#
+	econf \
+		--disable-docs \
+		--disable-profile \
+		--disable-silent-rules \
+		--disable-workshop \
+		--program-suffix=-${SLOT} \
+		--with-gdk-pixbuf \
+		--with-pango \
+		--without-libspiro \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with cairo pangocairo) \
+		--without-exiv2 \
+		$(use_with ffmpeg libavformat) \
+		$(_use_with_both ffmpeg test gexiv2) \
+		--without-graphviz \
+		$(use_with jpeg2k jasper) \
+		$(use_with lcms) \
+		$(use_with lensfun) \
+		--without-lua \
+		--without-mrg \
+		$(use_with openexr) \
+		$(use_with raw libraw) \
+		$(use_with sdl) \
+		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
+		$(use_with umfpack) \
+		$(use_with v4l libv4l) \
+		$(use_with v4l libv4l2) \
+		$(use_enable introspection) \
+		$(use_with vala) \
+		$(use_with webp)
+}
+
+src_compile() {
+	default
+
+	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 4187dfe6c99b..25f27f3dec00 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -4,6 +4,6 @@ DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
 EBUILD harfbuzz-1.7.5.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
-EBUILD harfbuzz-1.7.6.ebuild 3256 BLAKE2B 5d6f02d2a1f71afb3c11f3f960ff3eca47612acce6d14aa1b5fd186aa214189b1a3dfe141c0c57b417c8e94e3444e3b5c435135468a9039b0fa391a1fd2db9c9 SHA512 d15c6ee3830c7af8089ca60d406e654e6093d1ef4685ccac2f09ece2057c4d6e2ae52c2c399074882807e136a98a320a95ff7ecb8dabc37b1158d8aeea697dc1
+EBUILD harfbuzz-1.7.6.ebuild 3255 BLAKE2B 5ed71758597b9e6fcf7047c2976c9f8770dd17843eba4009e5deab472e888f9a3bced0ef40c72ef0c6c3a91685ee8f17ccc0a9588252ca6bed529da3d9604d1b SHA512 ef51ef45af19c56068adc21e7e964cb2de2dce82e4fcb0bd7c8c5150439cdd5515644857f49ecdd4bf2cd104b8349bd6f31e3341a68bc407f9a03119b817de48
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index f1ea60374084..190e46d04b77 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index e01f9f0f58d4..7275dc9529ee 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,5 +1,5 @@
 DIST libao-1.2.0.tar.gz 464596 BLAKE2B 6f6c09b5236711fccc1000292338fdebf24262b12f8d97394cdc4b66ba4a56ad4e794c107137e79ed2ec603fed506896f1ba1c4444923e566fdeed311bb5b75a SHA512 9456953826c188d67129ad78366bb86d6243499f2cd340d20d61366f7e40a33f3f8ab601c7f18ce9e24aa22f898093b482b2415b7e428c1486ef7e5ac27b3ee4
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.0.ebuild 1301 BLAKE2B bea3a085840c6b3f69dd2c7a601bd2d28f85a8a1534ac390771c6bce104a5f279733e7a71122808b72c702dc969a8c28e5e03e7addec87b28f00168010990cf0 SHA512 ebe5b0b6e3be5e6e1269ceef27f07da47bcb557bf157a5dbab903b766228c6fbd48392ef09924aed332862d1298bc2ba601f27fc823100302d9f3cd8121e1e84
-EBUILD libao-1.2.2.ebuild 1525 BLAKE2B f7dcee1beda528e767eebee017e59b204aed95d35aa5b2cd99a187cf84afdea1cfa798f78b10efb2a524c02ebede530f49582c709a522aa32b3fc520fad29ae8 SHA512 f673ee3b094929765e7f53891e2757de8a0dc4825f0b3ae3873d7c7f767b4bcf11995427614bb63dbb421c3cc7cf0e951d9e05bd3451586cc5efb4a78ecfdc5d
+EBUILD libao-1.2.0.ebuild 1303 BLAKE2B 159d4e2b9a98d0dd84714db100c6cdfb452c5e33c21aafa74bc75196c10ea49cfa21ecab8637edaa0a83baddddbb2c9bbd17e303931aeb2e069c208ddfcf23b5 SHA512 bd54b3c22995993c3b557562377098dd7306e111eb1fac1a745983a0198e522df268bbfd7ac351fa795f23993f81b36e16fd56e1f139a285e1cc1041e5f72950
+EBUILD libao-1.2.2.ebuild 1527 BLAKE2B f7c7e2c881ac60caae5d52e7b3339b98df4d7749167c1689efe135d3bc0e8bbfcf9f1fb414f5d6730b63cd05f1594f06b11aabc057bf1133e57c3fcc6953df06 SHA512 61524ea29e278104674d42f3891e9886fe0e368ff3f04b8270b92f407f2eb54250ed315497efa23d78c50a9ff0103ec266e37fba2322775d576a2ce3af0f2992
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.0.ebuild b/media-libs/libao/libao-1.2.0.ebuild
index 8997776bba3e..7c008568f790 100644
--- a/media-libs/libao/libao-1.2.0.ebuild
+++ b/media-libs/libao/libao-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit libtool multilib multilib-minimal eutils
 
 DESCRIPTION="The Audio Output library"
-HOMEPAGE="http://www.xiph.org/ao/"
-SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
+HOMEPAGE="https://www.xiph.org/ao/"
+SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
index edfef6719d97..e6d756ab0e1d 100644
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ b/media-libs/libao/libao-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools libtool multilib multilib-minimal
 
 DESCRIPTION="The Audio Output library"
-HOMEPAGE="http://www.xiph.org/ao/"
-#SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
+HOMEPAGE="https://www.xiph.org/ao/"
+#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
 #SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
 SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 5efa5e7c3f2e..c62a301c51c2 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1,6 @@
 AUX libdirpc.patch 1877 BLAKE2B e8df5b7b5a662d68d3386e348964b17b15bfed49b8cafed55b9893878ead75e00a1ceac92e63f5dc446b03faf09af26e732c508c83e851a7e3664471c8dd8521 SHA512 ead273addda6b39b6f10b7636465cf313b1dfeb344457227acb1d8c03bdab8f78ba0e44ec90b1044359ae445e1e1ce1a87a06df91c86a406b6fd4ce41713df0a
 AUX pthread_lib.patch 561 BLAKE2B 7d1a68f9c8a9f250aee9ca44a2cb787a802195708f0dc156d22073f21f83772167c5c57d953551a55385edb13ea8c5e8c28cd1379814175ff915d03ad8bf2860 SHA512 7a7060aa7a7062d85ba9ec3e0bdacdd552c5f2b7ee5c326da1d0d4a48b28693651703deccddcbc31b6e3190fcc6ac6e665bf09621b0ad278638d0812f557be85
 DIST libaom-0_pre20180421.tar.xz 1927112 BLAKE2B 3e70917e58ea4871c640f9df1da17f50dd7b1b1c41b99a2411bc68f11ae4acd76f358d1aaab17ba240dfa104fca1d5ebea057a0ba5666741658943dad10601ef SHA512 169872495a210192ae4f97d4d630b00d2219aa085999d9d90136274ec2dcf60d5001c91b5d920ee5b14b76cf02a9a067a3bf57a152bee9e9bc5a524c9205642b
-EBUILD libaom-0_pre20180421.ebuild 2199 BLAKE2B 6f9c11e3d8813ab102d7011e94feab72be3551df71082f663be1ba56f08650c125506ba2bbe5d90f393c9e9a8c09ccf9764b8f5baf70cb9a339cc31f7c834501 SHA512 1b5f4ecad8148556accf082b6f5ab378e2af52f752fea049ac690fe7be3a09a6bece8dac7a13b0f4d4e14abc267fcdd8dd5bf9365ce52c9f623c3d544aa37739
-EBUILD libaom-9999.ebuild 2187 BLAKE2B 3583402ac68a21e83ab2f6c6ee8682fc72b481774c6bd55913830690c1c1c0bb261d4d12ac0a2dd07dbac6702d2fc3a5ed5b78d847933bab2441a3bc8d4d3672 SHA512 b2daceaaa5bf2d9189ffbd8b76d2cae8bb145ad5698b020f487fd3a64cffe99b7d394ebaebee2a875728725d44e30133206b9ccd011fd16deb28c2ca8863b812
+EBUILD libaom-0_pre20180421.ebuild 2200 BLAKE2B f75a275b7b782dd81b3a70af228c7ebcd8e50ca3ce5c3d54d20abb22067a739a82ed06fa7a6aca5ee74638b29dc89fdbcdbd6bd89862c8e8bd47c1ed1ea8371e SHA512 69786d050d4bc3d20fec27847aab971e4f96998ec7e61f66e6e86ec5ee77e94c24d5d9825875b0c94a88283c91d0976944a4d4c7913d54a5a04a742adc4b41a3
+EBUILD libaom-9999.ebuild 2188 BLAKE2B b399fbf9b68eb2bdb8dc9b5b2327dd842a1c628e4b7b1746a57387e2b5c135cfa24b2ad18a5ed2075038a47a7448639261f78caa401f1438f67cfd8e5973b929 SHA512 6c356b937b184eaeb558475961c7d9dd0e0e37f78a28ef18b2658bed4a084b7e354f3ec5a164c432a54ceca6d0e997b9667a5c90820d55eb6ab69d94423f152a
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-0_pre20180421.ebuild b/media-libs/libaom/libaom-0_pre20180421.ebuild
index 3a22aecb23ea..93a69a352861 100644
--- a/media-libs/libaom/libaom-0_pre20180421.ebuild
+++ b/media-libs/libaom/libaom-0_pre20180421.ebuild
@@ -14,7 +14,7 @@ elif [[ ${PV} == *pre* ]]; then
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="http://aomedia.org"
+HOMEPAGE="https://aomedia.org"
 
 LICENSE="BSD-2"
 SLOT="0/0"
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 6261a1ce7e7f..68a8ddfdb1a0 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -14,7 +14,7 @@ elif [[ ${PV} == *pre* ]]; then
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="http://aomedia.org"
+HOMEPAGE="https://aomedia.org"
 
 LICENSE="BSD-2"
 SLOT="0/0"
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 114d5553e48e..d4d1be049e31 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688
 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 EBUILD libgphoto2-2.5.14.ebuild 6273 BLAKE2B 50694401872006701c09767b28b49e8b8aec364ee4a7256e689fc8fbd48fa7190a5a142cddcc1ea602db407a0bf9ee3b4bf098420aeb5bddd410f8bf73d7b16a SHA512 d198382821c1c7e8a59f27de930a901991a645837d038e57d47c9037a2bede022cde0123ae3a18362a0f0c69dcd52fc0098bf0fc8025165f64bf1ba58372086e
-EBUILD libgphoto2-2.5.16.ebuild 6277 BLAKE2B 7e07889ce011521a67f9b4f471f332bbae977730d2031baed755451069c696bd330129e656db9e833aa4e2fa3045252bf90d3479cd0018256956de0e16d5ca36 SHA512 ca6080a550faf2c242dc2b2704600ebd71a10fc7e0c2d0f2659c5f96f196cccd503ea012bd696e01dae6cceb77dcd74fbc65a4385457e74f7d93256d34f4c2ce
+EBUILD libgphoto2-2.5.16.ebuild 6276 BLAKE2B 7a28d3080efd0fb6acd623fccbc1221c8d442b27a80315f358fc4544a51ea12069c65b2dc0a09a4b0f3b8d518c53ef620801c465be1a94dbd2e9e2a9a2b70973 SHA512 0e4c07ae27ddc62c9db5f9a5af5c0f2f6509c65d7fa8a2e689d1269f6d51807dbf1afa9ea67720340a18007ac8c4bab7e48ecdae5ef7d801df1fa5402b76f673
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index a7933e4c4b60..d55089897700 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index fef130cda5dc..96ead25d5e2f 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -3,6 +3,6 @@ AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0
 DIST libmp3splt-0.9.1a.tar.gz 702948 BLAKE2B 96661e2fdc96d1ce4555bfc9b84f44bb1ecf9bd05f6b6038274a3097a657707bb6c6ef8b2b6ecf673c390f52a1885a6c91b555c1971d490df7089523d0739329 SHA512 07229c048c4f999c7c723ab2f7bb06807d264609c8c1e38f8ff40f11e54285212de71548bbd66ba3100287d563673d80a8704bd384d7ffcd2145a098faabd389
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
 EBUILD libmp3splt-0.9.1a.ebuild 1244 BLAKE2B 1809d4d5b3da03405fa6080259ddd79967f51ec40c9975f0a22a785f26aec47eeebd34005a592164c43f9d1798320af7813828e6a2fdd76ba02ae606abf0dfd9 SHA512 39cd447f9f20810b14b4864df837d58952ffc52d6947cb0ba672e1b4bed87da12eba7391a19cab3fcda5336b9de36d565da917a1f99f140d455a72eb3a96e285
-EBUILD libmp3splt-0.9.2-r1.ebuild 1289 BLAKE2B 514a8c4c8d479a48f013ab5e1263207d5c971be53d0bba4c7beabc0f67922904c5d137758fbc96b33e046e81cebf65f83ef133ff27eb73ee9f3a0cfd3dc6c495 SHA512 dc2618e6a91b711e889e745f2f7d642e0a4a2eb58feef4660f0f7d5f76a72c5df1e685fec8bc807255ab27d0068f80d72693bcafcd58572402f39b67f468b1f6
+EBUILD libmp3splt-0.9.2-r1.ebuild 1288 BLAKE2B bc0b8c40c8ebb4071f1a5c83fbb935f8ae7b12ed58cbe2c793aa322af1df66a198f514d753c6167d1ca097fbffb04fa25f5c061adb3710f8aaea8324e5b007b4 SHA512 da69ea6d241db86f016bbb417dbeb358cd4c3dd4cf3aa8428d2e355dc3ae6f0df163982283c7d9c26decc3f1ff43c61f196dc1599ae954094a2cb024dde5c42f
 EBUILD libmp3splt-0.9.2.ebuild 1245 BLAKE2B 23dda3aa0055c03908bc81994f2e7e819be9e79066b939d4fc23bf3f0cc55ce66b85d7bd3194a9405ea3e43c8829285f94319c149568aba6febbb6f8afe9980a SHA512 899074eb64a40a328a0ec8afa7784ae362cf13d76167d6427417f0c99a4aad3068134ce7ae866c55e6a855c83bb0507f8afd0b407b9479197f16dc47dcfe9005
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
index 29e8e0e2e9e6..b0266f6b27af 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="media-libs/libmad
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 0f1730ff5138..959839425683 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,5 +8,5 @@ DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
 EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
-EBUILD libpng-1.6.34.ebuild 1375 BLAKE2B 2e28d00203b0cbbbd88512107791a9a275cbfe8cdbe187a4500be290c81d3e4b006eb9f13065b6f08413691aedfcacb2557471ae9bdc880c9dbcadfe19abebf1 SHA512 e22e6928bfa12bf2fca79975fc5061752f5478796c4635dc87527dcd3ca10e934b4676d0871eb1b635f1c33c0b404955886037dc619148cea247942ed8aa1e20
+EBUILD libpng-1.6.34.ebuild 1373 BLAKE2B 1f52726989eb4b211fbdefb8adbf76d67cebeffdbec1061ae160bd0586ebe76d17ac50fe969f63f5ec06622cb78e8cb7ff0f22544fd1db8bc5faca3947d477f1 SHA512 f4a340f6b8fc256ebeb70db6101c4073a14a23b2efc17de5391d8f32b3f09d8102b2c985b47192c0e2598b20766cdd3c1ff03144dfec4cf8d280aa4a6dbe58fb
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index f88b0b274431..24ae7d056d11 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 84dba5d30d38..33769eb8ef79 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,6 +4,6 @@ AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab
 DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.4.ebuild 4642 BLAKE2B 4076b8040962f3640151a53798ed20baba3bb07e8a607191f76a0cc7fc1015fb8fca6b11184403d798819dae2b3b963d5aef21732b5092c8e4497bc2fa4d1f50 SHA512 a83ffe2f864f559c359b9315f50b82735ccbf246719b5598482a85afd3000ee52a261c17076dbde86078f31a8f7f46a22ac8d2891635d287f71e83715c8a4452
-EBUILD libsdl2-2.0.8-r1.ebuild 4746 BLAKE2B 549664df04ed88438d9a819e04a2ecfc04a4f31bf7bb0cdb74057420dc86e85fcb1a239b6d417503b1f769c03c5a5cb9c19fc3a6861437b83c55ddf44f82e153 SHA512 7094310edb9f19b367f8a449fe45895b5be91c8425f2bdf481bb985e4502847c32b62b67b76a7f78920b95b837a4a3a0be3a7aa1ca26f510f3c84ba1ce5c2b81
-EBUILD libsdl2-2.0.8-r2.ebuild 4845 BLAKE2B 887338bceb766becec09ac65ea1accf67dac9eaf32abcb57e9f22b5c7736c317685513728a4bdc5b0b5691a3853a65d83ed959fefca615fc59fd0366c06dfc75 SHA512 493524f7b36713426fe1d1543a2fdb3080e052266f074d8034b3bd3c28a6bba3cba52191c11dba93da8a50fa2483ad6ddc34fac73ce6f1a331b3d0e8689c74ed
+EBUILD libsdl2-2.0.8-r1.ebuild 4745 BLAKE2B d9225e03e3099971db730d3b03554ab6be323cd5db8b73e5eed0b9eb476b9e6f355122c0eed8b7a5f1ecc48ece714f9d71f6baf2b22c476456e6beabe71b75a6 SHA512 fe18bb622ff74b93637010304dce886cba44ca43985c505de6c02f443fe6dd7d09c1c2db1a4ee266f9f8a64ed89827ffb25040d408534bf1feebdb330997c4a7
+EBUILD libsdl2-2.0.8-r2.ebuild 4931 BLAKE2B 88acf8c5dabfd46b7bfb3d822abf7ab42f2445835b9a02e8124e4f6a208583844442f70852b6bcf63a3103d7cd2c116c003050573314c7b1b27ecabf4f4620c1 SHA512 74f26ad0628adfc61399f6ba892f2c890c23f5d2319dcaa81af763ffd0b577df12568997677486a6241212678abbb4f744dbe651d070469bf7b04a8a040a9150
 MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index dc0b149e259b..b263c1db9c1d 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index e94f3842e77f..146a715fd970 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -74,6 +74,9 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
+	sed -i \
+		-e 's:SDL_platform:SDL2/SDL_platform:' \
+		include/SDL_config.h.in || die
 	mv configure.{in,ac} || die
 	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
 }
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index e7e3b650284c..db8aaa7d0794 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -5,5 +5,5 @@ DIST mutagen-1.40.0.tar.gz 917874 BLAKE2B 69405942af849a8c82d14424a242e77cd9d554
 EBUILD mutagen-1.35.1.ebuild 1166 BLAKE2B 1761c7c348571b4719c5c8e6c2b79ea266b0e8a81d501152097139eaf5127852815b4104923bf6aede0a65b2bdf27c12a49aacaa9f4fee494eaa85ca63b5c746 SHA512 6ccf8d04d02dd849a0dc8a40e47e2c67c94db362a4211a88aa0b321319f5c93716859a57aff862028d82bc841be3051b70487e31456c1c1d355f9fec4a035c95
 EBUILD mutagen-1.38.ebuild 1038 BLAKE2B ac815c6a5cdbb250a1faf16c060c2e5baa12d9e3ca2ceccd653c4e9c7aa04b35eb55d242c5e6f2be7c599ed7658b721aef5d4f96f6b88a1932b31dd5c639e17a SHA512 c579883b1ec90b1c94b85e897cf744ac26ade4975ba0dc76aac0d10ea0659740eddd891c7d7c05e24356d019c1bfbec18070e35b1843e5d393e3a182e435e9cc
 EBUILD mutagen-1.39.ebuild 1083 BLAKE2B 079e0e7111f495b6b45409a28b3101663dbe1e52154860a30c16dc8e2fca5a9dae53b20ebc90271c68e7ac550f4f76c4e3a26b0fcebe769b64be17603a1e1914 SHA512 d8890394aa2f7ff82e11b3076a6909609ef0876d9572e52b889fe01677571de2cbf8859ed257c54f93262a6f3364948c94a6b11934122279a08785b0d98156e4
-EBUILD mutagen-1.40.0.ebuild 1096 BLAKE2B fbb87f99424705f4c9534d56afb1751a701b4cb1f2e8d16d0a8960f2cb3e2127c60c2932406f65cc81f2b45b5c8a1f884803a0bb9f43e65a874ad00e6e2c8a8e SHA512 9fe54ac39230796d1ff28e3505c3c9a45197b59555b72587e9781077d9ab5dec4caa27ca7734cae231d4315ed7953a60972374ea3e1852a1c78931fcfc353d75
+EBUILD mutagen-1.40.0.ebuild 1094 BLAKE2B d6ac575f10e54882617b4e850a1b0df02a223cdda5e62dacf0d643431ddec9ce8d95f64b6a0a9f7c2355f5dfe0bae0b4f045df6b848e842d7f426af9423e29c3 SHA512 b9050bd5c8689b4f35f4df91e8b782b2020b3904148265ce61ce85308fe86c310b5cc2da96b4ff8985fa7c528f2503645101a4fa408c661e144a29c05cea06e2
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
index 26f9b74d4c3f..430d2738e533 100644
--- a/media-libs/mutagen/mutagen-1.40.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.40.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 4ffa02c9c984..0b6ae31d3e97 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,3 +1,3 @@
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r1.ebuild 1007 BLAKE2B 36d4941c698e6aeb79f9290cd6f2db3dad2c2be6a380c4aef45052f3f269dce5cd8c4fc163d2f29a29509e1824b6125fba19e25e8dc90d964cbbeadd7e3a6e62 SHA512 357659c864af122b439fcf26c575b977766eb4fd3d5a64ab4bf71867e6551101f9bdb69961109da07a5c95c13ce5d0d949e2fb44d64b35447698b5016a5836c8
+EBUILD tremor-0_pre20130223-r1.ebuild 1008 BLAKE2B 5372a05fef45cb628f8bcf3e3b9e982c55d05e0908577762e34f7eabcb36543cdc4ee603f53dfb9515b247a3019e1a892648422bb86ffcee141dba1fbec1bf7d SHA512 5de39eeb34cfc6251547422b70c8612d87b1ffe3e5f344bcfff64d92df13fda90f40060bd4a88e284c0a29923901364e9ae2e050e847afb8d93329372f4e27fd
 MISC metadata.xml 341 BLAKE2B f36ce19410676996a1ea63ed668fc17bb9d6bd795f4cc83d3fe4a01c4fc71bb43ec4982474f549a87b7d38ddd08a8d24c049a9243c1adeee5da8dc59f1fb265b SHA512 d386b0e5f226a6459d41ef8ac18fb129ecff461db36e5b26faeabc52b8814535d669ba1cf816e921eabc8786c6d073ed1ce8c9dde57c91bc186f282706b0c7c0
diff --git a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
index e327ade5d5fc..6bd0fe6d3058 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ EAPI=5
 inherit autotools eutils multilib-minimal
 
 DESCRIPTION="A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)"
-HOMEPAGE="http://wiki.xiph.org/Tremor"
+HOMEPAGE="https://wiki.xiph.org/Tremor"
 SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"