gentoo resync : 21.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 19:06:58 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 19:06:58 +0100
commit: f3b17e517082e3c6581428440a122f1a2679e278 (patch)
tree: 874b962f0cd31907c24532d3159a5622db355700 /media-libs
parent: 511de054920d6e2f43eb973d13aee9b4e3e9a926 (diff)
78 files changed, 608 insertions, 805 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 973924c3fdb6..23c9abb22f1d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/adplug/Manifest b/media-libs/adplug/Manifest
index 588be6ffac6f..c717e529e08d 100644
--- a/media-libs/adplug/Manifest
+++ b/media-libs/adplug/Manifest
@@ -1,6 +1,6 @@
 DIST adplug-2.2.1.tar.bz2 810257 BLAKE2B a51c85a10af6a1cc308a7ccfa657daab1e627800a0617f6cf8b874726a115bdef188dc3d82fb6af9fd2aadc2b28b12f0707ea12cb52f6656d2b8654849bad806 SHA512 e9b434ad58114a6677907e8f7007a325fa908f9228fbe283d72d1e2394fa27850b929309e038c84ae94f64f8db003b871775502ee8b231219caa51f6ba5d787f
 DIST adplug-2.3.1.tar.bz2 1478424 BLAKE2B 8c2b65d11d3b12b4a3337bc9c6ada2920b07279ac0199d4bdf1fa2ceec2f51748a1bb9357456b3e7aba7c906253691066b274e7a7c7578c777d1e2e77f5131f0 SHA512 324ce084ecf5b0d180b335ebcacd5ab80806a5c9fbdeed6ef7cbd6c2f2cb476d9d9f38f596b7d6100e3d6cab42294300559200297b4b3f34190c1f516454c8c3
 EBUILD adplug-2.2.1.ebuild 624 BLAKE2B e762d87d6b15d6dc6e6c2367db8e8b1af9c504755e2be3a547129b3a21dc64b672a16ad1b5e7d5726a87a389e831a732f331279b1141c8f195311347b55fc5a6 SHA512 eaba3f130aa0a6174d2aadbbb65228beafd1ab86d6c7b08a275c33635bb86437ca3e8002e2ab26e82f06683a137a7c57d2e9ac6b7c8b80b6249776d3c4b9a090
-EBUILD adplug-2.3.1.ebuild 887 BLAKE2B a42f5a3b4a2bc21ac2dbcd1284b3059a3955fa8dd88a488d4395b895a6caaed1fe9a1f40c4f4b73c02d4eb706312f77c9e00cb17813a8269b578924a8de40a45 SHA512 6bdb7e93d0a5c35630fece9b0f891633dd5647dc61316ea34db3f631d9e68e15c2572c6fd6759bd9c58fb4e71079a4b31dca6f2354205ddf28e13ebfd70c0b88
+EBUILD adplug-2.3.1.ebuild 886 BLAKE2B 06f4e9e367fd4e51315640ecb0d337497d8494a41363251402fc9bd538c61e0a07397c1959c21c7c8e225a21970ae7ddc09cd17e10b0b291c9a4193faf55216f SHA512 4e778d118728f0584b430217c3f2377d4d989a7b7ea105c5e24bffa2ab9d844f857c5ca5d7fbe0db3ba4e07623ba7e60518d4636e3a93856727a2a8b19de87b0
 EBUILD adplug-9999.ebuild 883 BLAKE2B 3bccf749902021fb68b2654130fbe07f3c1854c7c1a319188224b711d1f84379e12c986adb22e772bed116f7fdf6b0a1065e4f1345c8e01d74ca29949bd2d842 SHA512 86f74c66bf96edd1667f6ffcbcb30e831fede37df986fe6b0a8ba5f760f65fbd1952255b1853383d4f3a1bdd4173897617af5862792464880dc7a9186ca9f358
 MISC metadata.xml 329 BLAKE2B 27c4b8b5676c1d5f9b3c2d38b397d2edf65dd28fbdca6ea12feb61870a6758f1cd27ab50670674bcb5561f6a70515596b170600dcdf592897edb35153a12142a SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073
diff --git a/media-libs/adplug/adplug-2.3.1.ebuild b/media-libs/adplug/adplug-2.3.1.ebuild
index b1a8021b9528..6cd391f3d98c 100644
--- a/media-libs/adplug/adplug-2.3.1.ebuild
+++ b/media-libs/adplug/adplug-2.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/adplug/adplug.git"
 else
 	SRC_URI="https://github.com/adplug/${PN}/releases/download/${P}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+	KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/aldumb/Manifest b/media-libs/aldumb/Manifest
index e155c485453f..a125b999d073 100644
--- a/media-libs/aldumb/Manifest
+++ b/media-libs/aldumb/Manifest
@@ -1,5 +1,5 @@
 AUX aldumb-0.9.3-PIC-as-needed.patch 2730 BLAKE2B c5d26002613ef712952c0aa3eeb376e9eb96c2943e7a5c09f9afeade7f65390a737faf4f3af49e11080a4bf64ecd643f0084e86b8ac9233f16796a408a448efd SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962
 AUX aldumb-0.9.3_CVE-2006-3668.patch 637 BLAKE2B 876d7cf59b78c5f94320b08395ab64eaf71d5a97edc082f1ea73afec25e9a9bd8fba20b87df44ff936ea0ee31387dc818ab8e5ae040ff1517ed86cc6da8346e4 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
-EBUILD aldumb-0.9.3.ebuild 1030 BLAKE2B d661b75d5aeb19a268e8bf234a9981b527f6a294c39e3d4c6cea0956198d2699df8f747b892015abadc2fbe25d726d1e25a5e31ee5b19289df7ffac206aa9abf SHA512 e5afa5a8c2a3d33918b3717ac757ceb32f4bf7c0617dbd8a1a2f4bb1dc077887b784a12f0a93d9f8bf8ef78f4ad65d1c5d95be084ddc57998d0284649a1ea6b6
+EBUILD aldumb-0.9.3.ebuild 1010 BLAKE2B 5c2892f92aba567dc5e2639057becdf85d83e63cd5ca29b7453ee7130440799e7d0e9b5bc29ff0ebeab745d04c4c97b38d0049e165266b367cc1e7dd8d436c40 SHA512 8de4573d5172345316e41c460320bb1a34ed2611293122c8f6d847bfe81e4d7dcff968c58bab14e2951239796b90b04ca0d6001335b15e16f1e3ef346ccc6cf9
 MISC metadata.xml 327 BLAKE2B fcd9433fc71614181970b679dfd2a3bb386b0d89199a2528c48d8c73d84490be56a5ec05a71eb629c82acd216361e0813b90f311ad1d311ab991355851dfff5c SHA512 e82c8c18d0744758b19a533b606aee382cdf2cbc36f431c3ed286704d75b759e663f2c3aaa2259c7a62352f4d73587ad34aff26a47ae06e20ab7372aa5a8c82c
diff --git a/media-libs/aldumb/aldumb-0.9.3.ebuild b/media-libs/aldumb/aldumb-0.9.3.ebuild
index b6fd72d59ff7..38c75c096e86 100644
--- a/media-libs/aldumb/aldumb-0.9.3.ebuild
+++ b/media-libs/aldumb/aldumb-0.9.3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Allegro support for DUMB (an IT, XM, S3M, and MOD player library)"
 HOMEPAGE="http://dumb.sourceforge.net/"
@@ -13,27 +12,33 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=media-libs/dumb-0.9.3
-	<media-libs/allegro-5"
-
+DEPEND="
+	>=media-libs/dumb-0.9.3
+	media-libs/allegro:0
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P/aldumb/dumb}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-PIC-as-needed.patch
+	"${FILESDIR}"/${P}_CVE-2006-3668.patch
+)
+
 src_prepare() {
+	default
+
 	cat << EOF > make/config.txt
 include make/unix.inc
 ALL_TARGETS := allegro allegro-examples allegro-headers
 PREFIX := /usr
 EOF
-	epatch "${FILESDIR}"/${P}-PIC-as-needed.patch
-	epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch
 	sed -i '/= -s/d' Makefile || die "sed failed"
-	cp -f Makefile Makefile.rdy
+	cp -f Makefile Makefile.rdy || die
 }
 
 src_compile() {
-	emake OFLAGS="${CFLAGS}" all || die "emake failed"
+	emake OFLAGS="${CFLAGS}" all
 }
 
 src_install() {
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 43569f05db70..c95867e9decb 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,11 +1,11 @@
-AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B e3369068751956e58966bb440038c9251859ee439558d0e7204099f1e3a8bb607d0bc5079f3b5258ccc09d43b42bec73944421e9cad7399cad87f4216e10bce0 SHA512 72a445f989b208fde469a10d87af76d48abe4a48fb388e383802a39bbb46555ed1831b3d974fb6861f6a5c0ce03826a738dd84e94e4d801175146e3d3b9840df
-AUX allegro-4.4.2-rpath.patch 178 BLAKE2B f8eff5699694626d5e401467f811b71e0fd7760c435e2de25b47066d2e69bfaabf6f1e47e392a6a69914f6b1f0e7b4a28a0cf949faf080d72a4a16da0ee062f5 SHA512 b50d829f3301551e3c6e9b2efdc40363b63f8981471e4b275fdbafc5e6a0f4f7f94e1d983234a6862ad3e5cb6eff54ee17ed647348aa45cb3ffa657c534f295b
-AUX allegro-4.4.2-shared.patch 243 BLAKE2B b2418a7421b4b3ecae6d5be73866039adb768ee3274976a8140e6e93451002839d94c58cb66f65c29e254be01b278907b94b88eadfec69aa0044939bd6cfccb1 SHA512 87de70b7f9b658cc3efef18423bf8e8aba901b6006bb7253bcd003ed4508caa0175429176c92ea2ead6d13e5f32ee50a6dd0efb13c30b61abdf3639a03b589ea
-AUX allegro-4.4.2-underlink.patch 456 BLAKE2B 880aa79f2466a040fd7670183cbae60e6620bf664664503c76f34c17bda7c06547ac22009da9214bf5bd91ce857c17046986e2c6ee7fc900e1fe988beb054182 SHA512 8f4882a6fcff986aa0aeefb05e92d76345c5218d67b5d358bef279679162121a56e400ee549bf52d175fe563897454d679a551d9514170ebaab13ae3c5bd3e30
-AUX allegro-5.0.11-multilib.patch 340 BLAKE2B f36777114467418600b3cf7b07d7e0ac77f8da078a75d5d32dcd96e3bd9e8573d78eb1199a74d2b8fa32f13bb2a451b9d9bf3b8aac14543948cf512a0b17add7 SHA512 28bebec6e44f7b1fe7ca9e649fbfa070d6a34cab3079b223c968b8c58347f453697faf2187fda42cacb0b76383ecc1588f7c7a181ef6528598d59e29964e3ceb
-AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 609b146bb64540d6a72cdab064357b11b335dafb682b45a2a5c302d08594fb1e84ade9748b10f2f3aa84d9ee77e776d7bc9a48d29737dde413e59c8c3c214afa SHA512 ad137dd9c148ada1a3075135df10e92462271327fb9d07768dcdb4c58007a5909cde52912750eae235ef5440bf9d6aaa7488f2c62d443729c2ecc4da3380d8f2
+AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615
+AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
+AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
+AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
+AUX allegro-5.0.11-multilib.patch 340 BLAKE2B 61dd9c6308a1303ec07ec50b4d1ee0ede73a363b988b5b2c7847fb1baf924874aea48ec29a1e099569309a745f0c591a8527b2f458e61b276992dd2d3611a0fd SHA512 4a8d28e3a76a9974af77e9ab1d22c6d3fc3117efd23ab11e50121e4003f4875a75411c0fb7b7ff798a23d91c5a2145224034c71d62fa83e56cf8620de89e91db
+AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 9e28af560d359d1ef2e2a13ac30ede196252a5ff2e33e90fdd3bcf6b5a5f2efc443ef6634fea6d7dbdeea5a6c9843539993f475de3811a35b30bc38b3b01b00f SHA512 aaf982cf3e91bb6c5f300f3ac5f925a14e7dec7a2366ca80a734410926e382339ad1b0b0e8be9efedbd2126da899f3babba92d4458bdfb338b8fe609a764d8f5
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
-EBUILD allegro-4.4.2-r1.ebuild 2540 BLAKE2B 730e993961e06aedebb4d552e0fc7eb434810c401ec871afad821acd070b96816d54c0a42704c20c5de18e816a9c91a629aa9ad62d3fd75995200482c803d46b SHA512 c56a71d7568bd9cda03d752fe6106fc6db00f865be6b0f4f661e53eb92042112dab81a514bdb921503ab4dbf0f2135d789e8f07e906c58d7b2d0fb701aeeaca1
-EBUILD allegro-5.0.11.ebuild 2457 BLAKE2B 7187a51596046c1517011b76d98218e02eaec9c3fe2bd587a674469e3df26462bc9bdccf72821380610f0ac3f34ea68a4828b24d77d64a94681bf46b843bd9a6 SHA512 365821339df7886eca0f84818ff1bcddb59dd01b9908d277888c69680d8c802fe7c66281303830ce6d8716a3b0bdc5802eb2fb02c6f974e8f00e9067e87cd87b
+EBUILD allegro-4.4.2-r1.ebuild 2465 BLAKE2B d5fb5a8eeabe45dc5b54d53ff3725741560c75269da58ce131a62362906a7b5a453d18a6e1b5d3c9295be1d0bdd17b7c9bb11fea8f0e6600e1ffc8b363d062f6 SHA512 fd80275b9d42851765e0af9703ce4472e2b233b4a78a7dd6d005c2e46af2c691ef927e3de238d0d8e61a502869c532c8984fb8f5e47c6f491957483538e843a0
+EBUILD allegro-5.0.11.ebuild 2374 BLAKE2B 04971e4b4750e37e7e4fa1d0a1ee5d8c21412502935b5e8cabb3c5772c96adc8791e5fd5e5df9bcf6b2466189003c9b89a2679daab30ed9e6a84e1bd8ceec04f SHA512 48493bd135f0ced07ad854aa2fe0f0c9393f0ba154a1f846bb06200abf020eaeb2de3024730d0c911650c55a5cb9a543a182efea63a5a67e1efeefd9890a2379
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index 0cb5aac9bf36..fff77ed7e25f 100644
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils
+inherit cmake-utils desktop
 
 DESCRIPTION="cross-platform multimedia library"
-HOMEPAGE="http://alleg.sourceforge.net/"
+HOMEPAGE="https://liballeg.org/"
 SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
 
 LICENSE="Allegro MIT GPL-2+ ZLIB"
@@ -14,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0= )
@@ -55,44 +57,40 @@ src_prepare() {
 src_configure() {
 	# WANT_LINUX_CONSOLE is by default OFF
 	# WANT_EXAMPLES doesn't install anything
-
-	mycmakeargs=(
-		"-DDOCDIR=share/doc"
-		"-DINFODIR=share/info"
-		"-DMANDIR=share/man"
-		$(cmake-utils_use_want alsa)
-		"-DWANT_EXAMPLES=OFF"
-		$(cmake-utils_use_want jack)
-		$(cmake-utils_use_want jpeg JPGALLEG)
-		"-DWANT_LINUX_CONSOLE=OFF"
-		$(cmake-utils_use_want fbcon LINUX_FBCON)
-		$(cmake-utils_use_want svga LINUX_SVGALIB)
-		$(cmake-utils_use_want vga LINUX_VGA)
-		$(cmake-utils_use_want png LOADPNG)
-		$(cmake-utils_use_want vorbis LOGG)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want test TESTS)
-		$(cmake-utils_use_want X TOOLS)
-		$(cmake-utils_use_want X X11)
-		)
+	local mycmakeargs=(
+		-DDOCDIR=share/doc
+		-DINFODIR=share/info
+		-DMANDIR=share/man
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_EXAMPLES=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JPGALLEG=$(usex jpeg)
+		-DWANT_LINUX_CONSOLE=OFF
+		-DWANT_LINUX_FBCON=$(usex fbcon)
+		-DWANT_LINUX_SVGALIB=$(usex svga)
+		-DWANT_LINUX_VGA=$(usex vga)
+		-DWANT_LOADPNG=$(usex png)
+		-DWANT_LOGG=$(usex vorbis)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TOOLS=$(usex X)
+		-DWANT_X11=$(usex X)
+	)
 
 	if use X; then
-		mycmakeargs+=(
-			$(cmake-utils_use_want opengl ALLEGROGL)
-			)
+		mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
 	else
-		mycmakeargs+=(
-			"-DWANT_ALLEGROGL=OFF"
-			)
+		mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
 	fi
 
 	cmake-utils_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	rm -r docs/html/{build,tmpfile.txt} || die
+	local HTML_DOCS=( docs/html/. )
 
-	dohtml docs/html/*.html
+	cmake-utils_src_install
 
 	#176020 (init_dialog.3), #409305 (key.3)
 	pushd docs/man >/dev/null
diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
index f54c046fec53..858be8f9f103 100644
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ b/media-libs/allegro/allegro-5.0.11.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-multilib
 
 DESCRIPTION="A game programming library"
-HOMEPAGE="http://alleg.sourceforge.net/"
+HOMEPAGE="https://liballeg.org/"
 SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
 
 LICENSE="BSD ZLIB"
@@ -13,9 +14,17 @@ SLOT="5"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
 
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
 	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
 	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
@@ -23,18 +32,12 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
 	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-
+	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 
 PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
 
@@ -42,32 +45,32 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_want alsa)
+		-DWANT_ALSA=$(usex alsa)
 		-DWANT_DEMO=OFF
 		-DWANT_EXAMPLES=OFF
-		$(cmake-utils_use_want flac)
-		$(cmake-utils_use_want jpeg IMAGE_JPG)
-		$(cmake-utils_use_want png IMAGE_PNG)
-		$(cmake-utils_use_want dumb MODAUDIO)
-		$(cmake-utils_use_want openal)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want physfs)
-		$(cmake-utils_use_want pulseaudio)
-		$(cmake-utils_use_want test TESTS)
-		$(cmake-utils_use_want truetype TTF)
-		$(cmake-utils_use_want vorbis)
-		$(cmake-utils_use_want gtk NATIVE_DIALOG)
-		$(cmake-utils_use_want X opengl)
-		$(cmake-utils_use_want xinerama X11_XINERAMA)
+		-DWANT_FLAC=$(usex flac)
+		-DWANT_IMAGE_JPG=$(usex jpeg)
+		-DWANT_IMAGE_PNG=$(usex png)
+		-DWANT_MODAUDIO=$(usex dumb)
+		-DWANT_OPENAL=$(usex openal)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PHYSFS=$(usex physfs)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TTF=$(usex truetype)
+		-DWANT_VORBIS=$(usex vorbis)
+		-DWANT_NATIVE_DIALOG=$(usex gtk)
+		-DWANT_OPENGL=$(usex X)
+		-DWANT_X11_XINERAMA=$(usex xinerama)
 	)
 
 	cmake-multilib_src_configure
 }
 
 src_install() {
+	local HTML_DOCS=( docs/html/refman/. )
 	cmake-multilib_src_install
 
 	dodoc CHANGES-5.0.txt
-	dohtml -r docs/html/refman/*
 	doman docs/man/*.3
 }
diff --git a/media-libs/allegro/files/allegro-4.4.2-gentoo.patch b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
index 119d9c789508..660a48437e6d 100644
--- a/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
@@ -1,5 +1,5 @@
---- docs/CMakeLists.txt.old	2012-03-04 20:20:05.566881387 +0100
-+++ docs/CMakeLists.txt	2012-03-04 20:20:50.659714153 +0100
+--- a/docs/CMakeLists.txt	2012-03-04 20:20:05.566881387 +0100
++++ b/docs/CMakeLists.txt	2012-03-04 20:20:50.659714153 +0100
 @@ -71,11 +71,12 @@
      string(REGEX MATCH "[^/]*._tx" basename ${page})
      string(REPLACE "._tx" "" basename ${basename})
diff --git a/media-libs/allegro/files/allegro-4.4.2-rpath.patch b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
index 57bdb6bf8d0e..ab646e485d95 100644
--- a/media-libs/allegro/files/allegro-4.4.2-rpath.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
@@ -1,5 +1,5 @@
---- setup/CMakeLists.txt
-+++ setup/CMakeLists.txt
+--- a/setup/CMakeLists.txt
++++ b/setup/CMakeLists.txt
 @@ -1,3 +1,5 @@
 +set(CMAKE_SKIP_BUILD_RPATH TRUE)
 +
diff --git a/media-libs/allegro/files/allegro-4.4.2-shared.patch b/media-libs/allegro/files/allegro-4.4.2-shared.patch
index 665c03e31204..7b4417d35c1e 100644
--- a/media-libs/allegro/files/allegro-4.4.2-shared.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-shared.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -830,7 +830,7 @@
  option(WANT_LOGG "Enable logg" on)
  option(WANT_JPGALLEG "Enable JPGAlleg" on)
diff --git a/media-libs/allegro/files/allegro-4.4.2-underlink.patch b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
index 33dc9d260b2d..7e6ea9398c3c 100644
--- a/media-libs/allegro/files/allegro-4.4.2-underlink.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old	2011-06-06 23:46:06.057320691 +0200
-+++ CMakeLists.txt	2011-06-06 23:46:21.900313261 +0200
+--- a/CMakeLists.txt	2011-06-06 23:46:06.057320691 +0200
++++ b/CMakeLists.txt	2011-06-06 23:46:21.900313261 +0200
 @@ -392,7 +392,7 @@
          message(FATAL_ERROR "Unix port requires pthreads support.")
      endif()
diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
index ffb0c25fc8b6..8cd1dc1037b3 100644
--- a/media-libs/allegro/files/allegro-5.0.11-multilib.patch
+++ b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old	2013-06-16 10:16:08.000000000 +0600
-+++ CMakeLists.txt	2016-02-25 14:32:40.350446191 +0500
+--- a/CMakeLists.txt	2013-06-16 10:16:08.000000000 +0600
++++ b/CMakeLists.txt	2016-02-25 14:32:40.350446191 +0500
 @@ -560,7 +560,6 @@
  endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL)
  
diff --git a/media-libs/allegro/files/allegro-5.0.11-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
index 7702c1d2c6db..1e0b502ed3e4 100644
--- a/media-libs/allegro/files/allegro-5.0.11-underlink.patch
+++ b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old	2011-06-06 23:56:09.367125536 +0200
-+++ CMakeLists.txt	2011-06-06 23:56:19.311748807 +0200
+--- a/CMakeLists.txt	2011-06-06 23:56:09.367125536 +0200
++++ b/CMakeLists.txt	2011-06-06 23:56:19.311748807 +0200
 @@ -703,7 +703,7 @@
  
  if(ALLEGRO_UNIX) # not MACOSX
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 1e6bdd60c0df..a87c10258b84 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -13,6 +13,7 @@ DIST babl-0.1.44.tar.bz2 653829 BLAKE2B 8014d66886645c67291ffbe218b95bf492512cb8
 DIST babl-0.1.46.tar.bz2 653887 BLAKE2B dacfb2c4761a454012532dd74a31aa425a7aa989a98b9862c69c4f74fe6238a6b4d7af32358711f53c40094c3a0e4995c105a97282418eb30fc78b429c92a605 SHA512 a62d78d49565cfb5c3187353f31d7793156ae318e2a29b7430ca08272ea98b9101afb602d73c5cc87bc9f20a4469bc08bf8c6c197529260ae0e41d183f300648
 DIST babl-0.1.48.tar.bz2 659945 BLAKE2B 7daa742f27f39dee9ec1ff6955082585246ecd4532e83b664e28d219151d74cdea7856dc45ee26468c85fce5d2400399f02074b6ee7ee7fce65158e17d782607 SHA512 1fc9e2c60980b3e0531ba0418231e988ea5d96ebf5a22b96dc57536e17d45bfe8816408707179438df5c7e487b62421b968ffad491a97d54221f236198b53471
 DIST babl-0.1.50.tar.bz2 661756 BLAKE2B 634e5bdaf4e32fe78ed913051d7bd226de9417d7a81535597bcef24b61b7fcc6cc76a0b9a2e7885ebc90eb0215d826a5c2f1e99d64096552e2fb7e0328c18068 SHA512 9b321933f6da41ce9be85a9b5e33a24857cb33d2a2a02ec30173c99dff66354d03c53e5e94ae46f9b59b11b9404b0cffbc39fc14e360412eca70584b61d25097
+DIST babl-0.1.52.tar.bz2 665120 BLAKE2B 5584ba82b69151a7eb7d1157b3619dbd88db6ee50126178568db92c63c82913b3f118cb6cc8c87a8fc5d620f4fe5386a1da0c2c5289b23550b16ffe8e0b469e1 SHA512 39fddb2393e4533665c444ab77105966f86c2938a3b48ca7683ccaecefe0c1b8b08374f0028360ccd05b0d03848dfadba54c7bd9d73ef40549c4e0501e61785f
 EBUILD babl-0.1.12.ebuild 1336 BLAKE2B 0034d85113ab047a7e0eb363e1bce67246678b4c08a5d562cd4121fa8465ab4c8f571af5ca46fed7e9184e2e710d36a0ecd57dc7c181e47e8a3f0488488da630 SHA512 4b97fc493ade3c9ab855e007120e710a6918875481656f86f9d721dfae0e68d591208f55787069fc6a7473da9ecdabe27dec7031906b3ab0f1116f1b9a7f03d4
 EBUILD babl-0.1.18.ebuild 1466 BLAKE2B 8aa28a3d191cec1963032c99a7b8f6bcb663ba90290062c1e86efd760d96086a9e94de7f0bcc3881ce27ff583d627ded168e81693a9062a563ee47075aef9ca0 SHA512 4b4af9460080eeb97899a303c04527e7c970664b8bc754073b11ac8ace172b048109c40831bad70e14d3bd081a6a9f3509418f6f9995cbc3ae171e5d7a232d99
 EBUILD babl-0.1.20.ebuild 1474 BLAKE2B 670df7c287b3ddb67aa63e770e58d546465f2fe67b484fc4847d761c4268a7582f7af84d55b3ca4db4b7e3a38ea46e9947cd3c1eb75a25683b0df3951fa86557 SHA512 76b6996b06b4b346d500752f2d6096c7b0ad568d8d81c540f0662454175143aa143ca856140cafb96941fc1259e6633892501281b421c66f6b7c1d322e83cb9d
@@ -27,5 +28,6 @@ EBUILD babl-0.1.44.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc7
 EBUILD babl-0.1.46.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc
 EBUILD babl-0.1.48.ebuild 1589 BLAKE2B 332a0d1f01e977bd1d657c6c342a012219a229c8a58580ec9a59ad22acd3363b85baa551cea45436297dc614e0aa65c8ea938c063496bd27b612638296a95022 SHA512 9f3f6b897e9805b1272dad65066a545feda96be7dc7a398737f41649b8cfc17eb312dfeab080e9e8151279f4e5306d70b9141b4da30aa6bee59c107e61b87150
 EBUILD babl-0.1.50.ebuild 1597 BLAKE2B 60e227d902b027c7cdf4b6835df6a36060caefc0c79ec3dc26943b0c5f57a57db7a462d4337d7affaf6e530a028da277652879ddaf1b5e95ac7a7a56c9c29441 SHA512 03f85b11813203af2ca948dbee32c3252602d9515b98c50046c8cae4b0b3e25f52aa810276c80b247cd7f87b0490f01a99a0065bbf2fa905997d2a46dfabd154
+EBUILD babl-0.1.52.ebuild 1533 BLAKE2B 0cc2974e7b34bd1c19cfa66b7426e29da1b1a7853fddac00032f3718fd625fde73afa6ce295337009eac6366e098001609e57b0bfd2e9219b809a399252167ef SHA512 d0d2a701b353898601c308de5b50c0119f0290c16cfd80b069b02cefff4c308cc21baecffb65203884a7973f042670341bbe97eb3922366ab60d016f4ea372a6
 EBUILD babl-9999.ebuild 1603 BLAKE2B 8a870dfec71b8ff498107eba616c3878784c94f1dcc528d4c41df02323cab14f61d3777c87e999acfa97ac7768c92eda3262daa494779157b29e1c946511b988 SHA512 eeab542b8d7eecd2142cfc89f2948ee4a475e35dbaaa3c4d3b726b1c2d3f34c3fcdd0a2d29df2a6dcb35ce60e217462fb7c267a8b7d699147af252d9dbca5232
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.52.ebuild b/media-libs/babl/babl-0.1.52.ebuild
new file mode 100644
index 000000000000..e3d94c34b54e
--- /dev/null
+++ b/media-libs/babl/babl-0.1.52.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/babl"
+	SRC_URI=""
+else
+	inherit autotools
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_f16c f16c) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index a50f524eac08..c6b703f50fe9 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 1114 BLAKE2B bbf2ef4493626a210150be1c908f5078c6620dd87acfc798065d1eeb37df2a0147cf4bc410ff9409c98f0e339d052b84f6a2adda49c78ecafb858b2952cbf4ce SHA512 93ac39e934fbe58fa498f67a544b528bbe7d02606fb4ac4bdd968885b7ab923239b19298ef7111de734f2bfe5f2aa699a8c17250601f0b84b8aefb2548a5e675
+EBUILD bio2jack-0.9-r2.ebuild 1113 BLAKE2B 5ee09177b04626796bcf12f62456703ccd3ed850570d4fb366c14e9fd97646683c7d09db5b9c8379359e363f70f9c6a4a302db867d9f6049a154975d1af7cfac SHA512 c90ecfbf8289e65fea6b548eae41e22760da1cceacba0eaba64f3234e4b8fe335b471803a7b71ba1f66e7be84c00cff693bb21a38c023da415b65a856204f872
 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 570aeab5fee2..1365950c7e60 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/dumb/Manifest b/media-libs/dumb/Manifest
index ffeba2dfb49e..0c25cb3117d0 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,5 +1,5 @@
 AUX dumb-0.9.3-PIC-as-needed.patch 2730 BLAKE2B c5d26002613ef712952c0aa3eeb376e9eb96c2943e7a5c09f9afeade7f65390a737faf4f3af49e11080a4bf64ecd643f0084e86b8ac9233f16796a408a448efd SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962
 AUX dumb-0.9.3_CVE-2006-3668.patch 637 BLAKE2B 876d7cf59b78c5f94320b08395ab64eaf71d5a97edc082f1ea73afec25e9a9bd8fba20b87df44ff936ea0ee31387dc818ab8e5ae040ff1517ed86cc6da8346e4 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
-EBUILD dumb-0.9.3-r3.ebuild 1944 BLAKE2B 0e2701789e7b33a8a8b3d0487aad9b07eed5f0ce2f007617653011d493f635cec9d8b93d1bcf8be24bd2873fab1edfc62630f35fc412062b18c0db0c5dac6ced SHA512 587d0f8d3eb232e90cf07ac7e9c9a1115d3129b492addf04f1f70b3a0c8872aebc58a32d7bf8f89054b9d2e22892fcba860c480d40cf495ca897f0e27891dc08
+EBUILD dumb-0.9.3-r3.ebuild 1947 BLAKE2B 612f433ad4ae673863914fb8bd64514c93c01128ceb7005496009d5b76b1e0098fbc74d98df1c15d57a6b6a6f84a7695aa00204d1817641105b74f72fbb2d69c SHA512 64e6af5676877de8c537f1637ae3d13365294115a8791b15f72f7e1836d77acecff00cd958c0615560ab69ada4895a0924e2759b20d66a5b666c51992db97210
 MISC metadata.xml 327 BLAKE2B fcd9433fc71614181970b679dfd2a3bb386b0d89199a2528c48d8c73d84490be56a5ec05a71eb629c82acd216361e0813b90f311ad1d311ab991355851dfff5c SHA512 e82c8c18d0744758b19a533b606aee382cdf2cbc36f431c3ed286704d75b759e663f2c3aaa2259c7a62352f4d73587ad34aff26a47ae06e20ab7372aa5a8c82c
diff --git a/media-libs/dumb/dumb-0.9.3-r3.ebuild b/media-libs/dumb/dumb-0.9.3-r3.ebuild
index e6115a753b43..f71ed0178b24 100644
--- a/media-libs/dumb/dumb-0.9.3-r3.ebuild
+++ b/media-libs/dumb/dumb-0.9.3-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-build multilib-minimal
+EAPI=6
+
+inherit toolchain-funcs multilib-build multilib-minimal
 
 DESCRIPTION="IT/XM/S3M/MOD player library with click removal and IT filters"
 HOMEPAGE="http://dumb.sourceforge.net/"
@@ -16,15 +17,20 @@ IUSE="debug"
 RDEPEND=""
 DEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-PIC-as-needed.patch
+	"${FILESDIR}"/${P}_CVE-2006-3668.patch
+)
+
 src_prepare() {
+	default
+
 	cat << EOF > make/config.txt
 include make/unix.inc
 ALL_TARGETS := core core-examples core-headers
 PREFIX := /usr
 EOF
 
-	epatch "${FILESDIR}"/${P}-PIC-as-needed.patch
-	epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch
 	sed -i '/= -s/d' Makefile || die "sed failed"
 	cp -f Makefile Makefile.rdy
 
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index c5a58b4d20a3..a0ad637af2ec 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -17,6 +17,7 @@ DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350d
 DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
 DIST gegl-0.4.0.tar.bz2 6762190 BLAKE2B c138ee79806178f60eab2fae492fcf441dc49b54364abcf023f6ade0cb08d216200ae14a289af8b6da2f0eec97dc81d376469245d0aa6d6cabf269d42c0a83c0 SHA512 4e319e861f6a27f52d0d4920942abe3734e6015eaa76491ab55179d8c677ccf8eb7f4296ef43f55a5e77ae9e99bb2ba6f5bd20aa08f194e9d42a1159fae20c6e
 DIST gegl-0.4.2.tar.bz2 6781136 BLAKE2B 522d4e7b2ace519423a66b7e65faab49bd0740173be6a8e108ec95b65c0359937df7b142e0a68589a4d773b839689ad6cf2ee67c5ea5b89267d46199b23e3f15 SHA512 8d842f5e192d279529615e09da8a76b051baa9c257ac699eba5f8ce46b4511554949e35f494e99c190b1477a700e018e2243a9e84c3c79e331824ca364b6cefd
+DIST gegl-0.4.4.tar.bz2 6817195 BLAKE2B 928e91e61bfee8b9954992e1ad4dbc874a5f53ef5a8274a6805b2c7d9bb007e3ff9ab5e8fc0a767f7e7d05c327581231b42eebcc6f9781f9feb5abe17c22bbdf SHA512 6953bf7df225914ce9c8166f5a0490615664c69d5a66cf8ca805f75cfbe272186c7745d273fcde29c685e22a66d4483dbdf45064ec9c0007fd6d0b8aa3ebb164
 EBUILD gegl-0.2.0-r2.ebuild 4788 BLAKE2B 25850756b366f53d563d098b21036d84f7790dc0dbc1e0640f10b590d1d43be11f2b05d0cf1301e87da2522cc49dfbca09d4cc8854e02494a796f5ca60e1538b SHA512 022f22d1ed529d6061b179b4edb89cd022be4de213a2f0048fb89b760fdbe5fe2ba0b3682874577556ec92869a28683431967b73f3b6fa5369ee423e078067b7
 EBUILD gegl-0.2.0-r5.ebuild 4995 BLAKE2B 20da1cb203ef3ede096fb3a945bf563278dceb0192dae4870556d593e8e00ed02e8d146a0a5c10943376b9e00f7737d1ff465388bb536fd6076ca4be52dfc9c1 SHA512 54409f06ece1431191c2c6ecb77d8d536e8d87e78da3324e201796efa0f6dcd24ce7e0f4288f5ed419559ede5d2f8a35f4cb84b7f3bdbea36c59ca67d5e0d215
 EBUILD gegl-0.3.0-r1.ebuild 5379 BLAKE2B 5bf00dfd8c77e110bd708267604b187d1997046fe9f70a1590caaee8e98e09086480136ebb3ab1bd901489585ade5222e661acbca12139d86a3355529bc73cc2 SHA512 c0dc2b5848b79c1eebcf067f37baddc0f4f7bdbe3b10ec4a97981e5392b4200fb2d5f4a3cb6b347fe881113f3e6ce3b0cd7198b61bc3c5a5ff1789d43d064efb
@@ -28,5 +29,6 @@ EBUILD gegl-0.3.8.ebuild 5217 BLAKE2B bad2de922c96941e6d305e0f8e7bacf1e5a86a4608
 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-0.4.2.ebuild 5415 BLAKE2B 6c91dfb8dd056f84306ad4097ea1e303eee6538a0a3f9bea534d6cae6da33d66ebd07a6cd69c95ee49e2813d2edc62050e1ef26c66d4b68fada3d0fe3ba84194 SHA512 7f8b307e3be7b1a05460acee0cf70a539971f0c1e1c252cd5c2de4c05aee1f5d76f01935e95b9dbe60e322d20ed44df2dbaeb5c3ccbef55c900cf632125b7522
+EBUILD gegl-0.4.4.ebuild 5415 BLAKE2B 46ddb004dfad7540a9508f6c0e05471f50e7901d752ad44ca23d74a20e0489471c69889867a99575ee5820be2efdc03e5d896aced1e9bbc056e6a9da605aa3cf SHA512 649ef096fad3a913ba9b2bd71fa5f04e075ee91506a1612fd2ad05ced31b1b89c84457744e71b2a4fe05a7da082f14d13deb8536ad5d6440b0c7c7d76d2e6846
 EBUILD gegl-9999.ebuild 4921 BLAKE2B ae0b77a07f047281531c0698f3c830a0906f7938025733daa73f54fd4dcedecfb357c05d7a660991423d685d555e34eddb80c67573cfb60c9744417473b14a1c SHA512 bc4243e9921eefdb4211d44e962a571ca55897dac69fb22460a045eed3cef5089c9d3f2e01a23e1d824837e4ac850adee6b53c1382da444c55082163857de2c0
 MISC metadata.xml 472 BLAKE2B e5dbc6beb699846057be74ff6c05e1273bdc2f19910be0ff73c1397b48173526e0c6eda649e7178a9858aaf055628df0285792107cfd49bf5ba4dc9c56f8c835 SHA512 3d4b87f67a5665c0520996c36297afbbbaa1410bfbe244db215286b044a57c030b2a24d4dd9370fba6a7bd148a71b0bf8e2ff85c49ca321441da831ce47b9faf
diff --git a/media-libs/gegl/gegl-0.4.4.ebuild b/media-libs/gegl/gegl-0.4.4.ebuild
new file mode 100644
index 000000000000..47d42fbe9e69
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.4.ebuild
@@ -0,0 +1,189 @@
+# 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.52
+	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
+)
+
+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/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 863fcc5e2a00..efd5153dc4fa 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,11 +1,9 @@
 AUX gst-plugins-bad-0.10.23-CVE-2015-0797.patch 1044 BLAKE2B fe60f1069711c17e8e14e7e08081ca4c97697bb866587be45c471a85539d8c161d425a92aa8f01565bfece5aad0f5a3cd835d711edab977e11c9e9355d7d795f SHA512 cbe01dd53450cffb4cddf9313e78f2b61b27a8e1c35da13ab9429fa0de6cfce2585a4bbe1d3a9f6aac503c79a5a9d661420001b0196683a3c8b778685844c969
 DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 BLAKE2B 90ad2a742de6d6b3efedb1a2fc16a9f24cf0566fd455a27f113afa0fc2ceff5f2517a31e8db8ed6ed8b4c92595b333a29dbb451077975f3d726808976f4a8671 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
-DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
 DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978def1356299034d14ca2cba8f07df93d5dcf5ed257290bf111298c4f8063b32ceee38dd78c02eae508f6e88956b132740bfa36 SHA512 6969b6c91279fb96bc28acde0284ce980b3982ae0c77820284a903beee61dffa863554dcfadb55de1987404b59c3c7c421372e65dc7b4014fe64a0c91d4ce729
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
-EBUILD gst-plugins-bad-1.12.3.ebuild 2812 BLAKE2B f6ea1539d722daf9296ea0c1ce99653f709e36297e0c04ccb1ae45705ae3ee11325036e892aeffedba002632f2379f0c7486cfc92b67fae76b69036ed58b1ac4 SHA512 27e72cde6700f40d738abe14e709072326ca2af3e556b65acd09604b472168f7e705808c8756edc8d14a1992c8091a6065c2500cec6aa9cbbdda137a229a0bc4
 EBUILD gst-plugins-bad-1.12.4.ebuild 2819 BLAKE2B 19d7afaf0e34e98ffd67ac1dbb453ce8477cd719803560a445e0cf2c8829c07f8355780151cd2273ea36e4bf624c1bdb278507ab8aa0da44e42746037abab895 SHA512 3414136d383f5669e11edfee11732de39b5f4f1fe20f821e2add0cf0d66b675fc337bfeed392770d3beee2144b70505c067121a2b7381c67c347dec431986425
-EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2613 BLAKE2B d0324bbe57ca5fcaf8e77219ab4d797b3938ffdeea69f28c4cf27233deb01b9b69fa54f977fdbedece3ff19a61c12b00f7df49837af840aeb07dcc7e1c32d0de SHA512 3898a6e401b95c0146b56c6a50544101df1f4e48ec193cd7f6948d717ca96cc89f560d6ba6ef718a7da9f48960c752fcdb0bc0226f7e39ccbd562b32ccf70196
+EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2611 BLAKE2B 931b78d9a731d4e25f5340544edf00c8e72c1259031a198b6c06d315ba6ea4b6e121ae20c262a5fd2c35012babd0c2a19e906cb3a84d6ea03c1ea5dac96ffaee SHA512 38e7b0f667b8ddfc1bafe077d0aaeded6939bc11fc63ea75d3b50393edfe69a9f2978e6dcb1870c24606833c206086aea6930254045188b3c8263b4d3344dabb
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
deleted file mode 100644
index 5dd32650676e..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit eutils flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
-REQUIRED_USE="
-	gles2? ( !opengl )
-	opengl? ( X )
-	wayland? ( egl )
-	egl? ( || ( opengl gles2 ) )
-"
-
-# X11 is automagic for now, upstream #709530
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	opengl? (
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.4
-	)
-
-	gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	addpredict /dev # Prevent sandbox violations bug #570624
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if use opengl || use gles2 ; then
-		# Actually enable the gl element, not just libs
-		myconf+=( --enable-gl )
-	fi
-
-	# Always enable gsettings (no extra dependency)
-	# and shm (need a switch for winnt ?)
-	gstreamer_multilib_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable egl) \
-		$(use_enable gles2) \
-		$(use_enable gtk gtk3) \
-		$(use_enable opengl) \
-		$(use_enable opengl glx) \
-		$(use_enable orc) \
-		$(use_enable vcd) \
-		$(use_enable vnc librfb) \
-		$(use_enable wayland) \
-		$(use_enable X x11) \
-		--disable-examples \
-		--disable-debug \
-		--disable-cocoa \
-		--without-player-tests \
-		--disable-wgl \
-		--enable-shm \
-		${myconf[$@]}
-		# not ported
-		# --enable-gsettings
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Tests are slower than upstream expects
-	virtx emake check CK_DEFAULT_TIMEOUT=300
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
index 715840165ea3..5a357b147fe7 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 804935179172..b1020844e629 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,11 +1,9 @@
 AUX gst-plugins-base-0.10.36-gcc-4.9.patch 387 BLAKE2B 5ff5d2b0ae4a97240f86ef857661cb2a12bfa41796f06afa4b64b2d0d194d4949166529d9c8b0b22729237fcdc84580c4a8b0a9d797481da0171ff8fef187cf9 SHA512 db107ac701928d4f9787724ecca5b1eb087b5319e116a75be7cb5aba024a32336b4e94bb45a4923f97762766e263a3bce832c138fff6d69620b346370d289a97
 AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 BLAKE2B cbf4d51313e94df62ff3c3e4df859c04a91e22e994587e4ca6baba59294dff572a7ed80cceb3944d4070717fd6f9ce680e42e71a95032d54c8ca6693df29e21f SHA512 fbc252f10f4539f0448eb6f652a945ecf522f6100cb63fb362617a8990818efb1ba4bd5f866b25d439f39e32a41fcab7ef9b176d4be0e6e5bbb6c1853aa2a688
 DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
-DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
 DIST gst-plugins-base-1.12.4.tar.xz 3119468 BLAKE2B d5ac157618a25c8f0323d1922d5b26b0b5c49f56cb75df3ceeadd0566f873be1a06c863a1da6afff40901fbbbeb1ec6cd6ef4614309ca7f7ff988c0fa9040a10 SHA512 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
 DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781ae11feec66c215febfffefe4a22353c56e82a585647688e2078603b6c3ece6f26afa99969091a72886880a2f8549dd9cb379 SHA512 bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e
 EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
-EBUILD gst-plugins-base-1.12.3.ebuild 2559 BLAKE2B ecc42507c99ff833f3918fff11b4667b210b1f7c8688d55c1cad1b5ceb0e637369027bf28e343ad7528af409d81ccadf1da7a128a1f1873cc4195f6e2c6e5e2b SHA512 0ff63387e44a61fc8d2be8d93d75cd720473742ed68652d1e901cd85fd167b8a683870065a4bfaad10af91348dbe7cbf1adc4d00cfb909df7d284daf700c1998
 EBUILD gst-plugins-base-1.12.4.ebuild 2635 BLAKE2B 135ac9f8423f4d994fc90320871716c18bc37afef01fdd8fbadb25b1b37addd05aaf9efe915850a64d041f3d1cb52231cf64af87021cb4cc24205e4618d85536 SHA512 01ccfae2d189a9506ae1261f15126aee3967bf76e91808d88b0d2214083e19d628ceba84e44b6a1f47ef673137d42dcecf13ba7750e4f279dbc4a605948e3f76
-EBUILD gst-plugins-base-1.14.1.ebuild 6104 BLAKE2B e66271b2fd842d988bd0fe77cb77c3a625e5822c76ae15f282a50d632290071d160aa3b4970190d6a363d390d51c2e612416199792d53eeab954ec073cc0e1a4 SHA512 942521fb60f0507b9c9d0f8ce400f474d7cc9eff4377f8fc60209c260afbc44b26eaabcb6f8e7d7bd8c759809ced9952bea79f150b417ffea0b6b276bf6ce3f5
+EBUILD gst-plugins-base-1.14.1.ebuild 6102 BLAKE2B 2e5543ef26b921e51d23a7a0755a421c77b912a625b19b0c98000dbea15965215f0d82972da1fb4445aa04e294cd9dde05c83227d54978bb5c3d1ca0a75972ba SHA512 6e88ebbb6df81bdb4366bb57ace44029c156e6d9d14edbab27cbc0c21c2a457811372a96572aefd4f05dac3f20e6db1f3a9c92871853cc57699050059a3a830a
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
deleted file mode 100644
index e2424730804f..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
-REQUIRED_USE="
-	ivorbis? ( ogg )
-	theora? ( ogg )
-	vorbis? ( ogg )
-"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
-	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
-	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
-	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
-	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	!<media-libs/gst-plugins-bad-1.11.90:1.0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	X? ( x11-base/xorg-proto )
-"
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure \
-		$(use_enable alsa) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable ivorbis) \
-		$(use_enable ogg) \
-		$(use_enable orc) \
-		$(use_enable pango) \
-		$(use_enable theora) \
-		$(use_enable vorbis) \
-		$(use_enable X x) \
-		$(use_enable X xshm) \
-		$(use_enable X xvideo) \
-		--enable-iso-codes \
-		--enable-zlib \
-		--disable-debug \
-		--disable-examples \
-		--disable-static
-	# cdparanoia and libvisual are split out, per leio's request
-
-	# bug #366931, flag-o-matic for the whole thing is overkill
-	if [[ ${CHOST} == *86-*-darwin* ]] ; then
-		sed -i \
-			-e '/FLAGS = /s|-O[23]|-O1|g' \
-			gst/audioconvert/Makefile \
-			gst/volume/Makefile || die
-	fi
-
-	if multilib_is_native_abi; then
-		local x
-		for x in libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS NEWS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
index 6d910085c953..35fed391acd0 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index de04d308439a..21fd0bd11a4f 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,10 +1,8 @@
 AUX gst-plugins-good-0.10-clang.patch 662 BLAKE2B 19fd6e7bb5bd66e4414360a4b71b1b7594d91d0d4a0665c0b926dcace76cfe75115849b3b6130a4fde6237bc1b07dd87521919fb8be0af35b1158eb22325864b SHA512 773dee80e639e982e71048bb7cbe1b8be2bc94ad6f95403d5cab2e7df97234ccb7be17f9bdfaadcd61f35a47efc8ef616e219a704ec1abcac07c3b989819ac2a
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
-DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9abc969bbf6338f65e42c2a74abb425f9e48e9cf2f71e89b92eefbcb9a3eff0ce765336b35b648a386214164cfecf66d03c2fd SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4
 DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
 DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
 EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
-EBUILD gst-plugins-good-1.12.3.ebuild 1430 BLAKE2B d8779e22c9fa2e946ffab5b57b3e0e8f1fd6cc5ad99f3973b464b153cb903f26431c8417fdd7698ec9906c381b1a6d8234fa654bdabf8cf8684bac6d9172fe79 SHA512 3f468cfa4b74dd8f98093cb6b9acf9cb46b172e17de538f7689dd7463be13363bdd89509a2bd38867d80692017ea4eae0178885bf2c2e4bbc602dfd5c1775420
 EBUILD gst-plugins-good-1.12.4.ebuild 1431 BLAKE2B 464355f1ed004290395cb487a31d32c82a61e400cac1b0260c1e4254854db8d4414fda88d849502fcac10faab192018959a6d4386861300c391843d2dee23186 SHA512 1b7e52559dc1287bd8b9b1256464c21662f396f648cf50a66430f712bdcad6baf52c03e78c40153795df74586ab71f4f0cd219b38ab743f00c063a8546d1e568
-EBUILD gst-plugins-good-1.14.1.ebuild 1439 BLAKE2B 44e76bc1d79b79386d533e97e583e5fd6e7dd8a9f6b62f948b6e23e1ebae6e719c299d152d0afffe69fbb9fc8ebcd69672596627103462ff2699e3b0edded55e SHA512 5368a3ab607946bbfa623a1821b465c47b246e66e48ea6cfb6cebc94be6a87143f5786c05c26982a7d9c6546d3699b2113b1637383447716d5950b6a90a51ffc
+EBUILD gst-plugins-good-1.14.1.ebuild 1437 BLAKE2B e2a22d187156052777a9c0df885de197edd9dd88601a683ae78346ef0b34340d719eb240a5c89e4eeebabc02c1958ed7127743c660aed5b679feb222094f006e SHA512 6f2032ebb369be24391101d9ace064a1cada5475f61740d50e608a4f3650328a700ee007d9c26506201ec07c4b30d2539cadcd9d2f0429a422a2c66753196d76
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild
deleted file mode 100644
index 8c087fc54a51..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit eutils flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-multilib_src_configure() {
-	# Always enable optional bz2 support for matroska
-	# Always enable optional zlib support for qtdemux and matroska
-	# Many media files require these to work, as some container headers are often
-	# compressed, bug #291154
-	gstreamer_multilib_src_configure \
-		--enable-bz2 \
-		--enable-zlib \
-		--disable-examples \
-		--with-default-audiosink=autoaudiosink \
-		--with-default-visualizer=goom
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
index fa738a81f978..8cb61b850058 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index ec4101d7b9a7..c4529024d96b 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,9 +1,7 @@
 DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
-DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d385af3611aaa003e1f0f315747f8df1680529c4c0332c5b4130eadfbcbd57d18b7fa1deb794e07cc9b0d8db22b98e27d9cee SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34
 DIST gst-plugins-ugly-1.12.4.tar.xz 904592 BLAKE2B 6ec59cea23ba45e705fc3140530576232c758884cc7cdcc293022233f4aeb440918c147563706a7309253dab318190bd6484fe2ac21af4b54af61ede349a1e82 SHA512 920f5be5a060293319f4c45bf7f28e14953e897473a04e1c83bce61261365198a6dc2d7ad6cf5396b2bbdc35a5f77014741e902e67c00c3c6596680ab9924e8a
 DIST gst-plugins-ugly-1.14.1.tar.xz 884668 BLAKE2B 8e1cef0ebabac65ad2b1d6ac3fdc04fbb3ae0da0b9f4c0d18f03533ae12dda03d04763bbeab079aebe3637df664dc2e94adc36008cacfb6c00b9ac8b4a228241 SHA512 0eaa9435e93596cb2c2ed1d3540dd3c4f4de1dd18da8359ca5918b0fbdccda9d5b8f33e5aeb54186ed9d70518712aca92e8ffe7884fc13a3ca3174552c10a688
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
-EBUILD gst-plugins-ugly-1.12.3.ebuild 1028 BLAKE2B 0ab269cb2db715e6c7cabcc1f40f7355fd646fd110ae98587db9e882b6ac60dcfc25801345e0f343052452e35816c2f38021e0474e750913701ffc01b969df67 SHA512 68a1e42a72aac1427d57a79be67a7f611c0a83caa6d5852d82579623dd3f8e1d946f5e5bbf3c0c69859e4114cec199002c2b9bb94d8b5de5ce7b60d5accf0330
 EBUILD gst-plugins-ugly-1.12.4.ebuild 1029 BLAKE2B 552f9a5075bd61c3b8cfa6659fa834fef445a19059f9a10cf7c6ac0e72db070dfa807f02db3534a037eebf94c1effd3555f701d1131b2868f0694ec9dae3f81e SHA512 6c0815445be549b133012a5e1fe90fe798df27f4c55f73e8bf816db04f5871c4e12f5c8978ad117696a1afaf3202e5627f8a849b78e642d97a76543ccabdbdd2
-EBUILD gst-plugins-ugly-1.14.1.ebuild 973 BLAKE2B a2b1e717b3d055ffb47535ee724a4ff000ce6ee512896d0ad5884b761db45ba350b1ccf7d6294a1539962fc4fb9f9fb37165155a7411ae6514133ea164040066 SHA512 0836934452813ae059837938ee8244fd6c3fd1a8078fd50b2848afcbbe19c2abc1d9ac04f32177aabb33118bcd9590655eb99e7aa1d310eb8ad73287ea87ff80
+EBUILD gst-plugins-ugly-1.14.1.ebuild 971 BLAKE2B ec697b8dcb53d1f6b24436bd90f61e7b36bf595d5ff700be4f6a66d772aa723d1407c47a313533776c7d4acf657d00786f326007cab6cb813bfa044611d9bdd6 SHA512 bf5ab5623e1aaed37de2b0575f204d21de077748b985dbe9518edf6dffd01da756a27a19385121d14cf3314f5038ae9b0c4fc8456921794ec2bf039deb003ae7
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild
deleted file mode 100644
index 3900a8995fc0..000000000000
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit eutils gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-"
-
-multilib_src_configure() {
-	gstreamer_multilib_src_configure
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
-	fi
-
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
index 5239eada034d..3fb380a37599 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index f803629722e6..e3c23bddf189 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -3,5 +3,5 @@ DIST gst-rtsp-server-1.12.4.tar.xz 632488 BLAKE2B 86c9734128a34f3c3bb983133475ab
 DIST gst-rtsp-server-1.14.1.tar.xz 662316 BLAKE2B 9ff6abe945b1a4936a713e098a2013c0d954a1f7f0fdf4f9d9ec0df9ff19f5526c96a95c101ae58db97a886cb477c001eea1dc056bd4e35e4bcd4cdd16a4dfcb SHA512 c559177434cd710702be623da0e9821e3867f865c94bfc425e558a467288ff77ee1ce9114389d8f8462fd979eb34a8da665d40e8e0b10a54a077f53ec954d07a
 EBUILD gst-rtsp-server-0.10.8-r1.ebuild 2664 BLAKE2B 1bfce81aa8708ae23b01096abd90c08e92c58a55c1126d0df3dbd9c50a78e09915c599ac7a32f3fcbe6ab3793521e3b74a6ec20add132fd7640d157a2267e900 SHA512 2c521e305cc9d6d759011fc85e51d9ea861d378aff73683b40a43af995481829d3c3e2d19fe2caf066b1f1d9e852b0f992b6f9289ef34b4b050ad22f33b5e464
 EBUILD gst-rtsp-server-1.12.4.ebuild 1966 BLAKE2B f5cde39a32483b1f3479dc91e5fb2805d04593b44ac7d0a0c994a58bdf08e21044f7e31fd66dea7d4108a9a348fb9fa589b276eb4e69cb027488e05784c35636 SHA512 105eb7ff35eddd4e352fb29a9bd8ee82c3d60724d938d60a6a3477d0e0a1f5821aa4a27ead53d894a27734fda9e7c760f34867f68439bad840d6da786d60bd99
-EBUILD gst-rtsp-server-1.14.1.ebuild 1974 BLAKE2B 2e650b3be363d1e2ffe8f4318c13a937d5f14485badea612e8c9bdea2b720f3d8090d0e552fbfd1158d60c9dfb77435b6b0d41b2b2f1a25c69c7405f48d0abee SHA512 991cb978f85a33174d8ac1bd7e89ae04a478ad11ab03c1278d800806f1166fe17d528a62cd7dfd75a0edf556ac94565c0217007249918a3581aa62ee74037e5f
+EBUILD gst-rtsp-server-1.14.1.ebuild 1973 BLAKE2B 965c56a9d22f5a74fdce76c7cb074e0ff96134ee4995705f055c10d4ed776618f55d9ddde067797085765e4e8f443e9b6ec6a3e2b7f30f62346a0360c7c1ffcf SHA512 2ecb777ec98eb73e32bcdebe52c7b3fb48b7429c01812ff128ce9a6e03e4f807b1b56ba6538fc341bce068c84a8f9f3b9ea32e62662f4b1e3d496df3aa97799c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.1.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.1.ebuild
index cb2eb36b50e6..37f5627705a1 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.1.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A GStreamer based RTSP server"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples +introspection static-libs test"
 
 # gst-plugins-base for many used elements and API
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index b0abf647db31..7c944f567601 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,5 +1,5 @@
 DIST gstreamer-editing-services-1.12.4.tar.xz 1062972 BLAKE2B e2f401e419e793a37b3deac71696326f6d2c7491d7a138c40de8af46f2bd5ba415b56b9656a9d225d9704e3339b15aee3e587299441c2b75633a7792a954d4b3 SHA512 b845fc897384aaf691a9dcbf26e6ba682c9eca161e0ad227f47fb0865527d05254fd7b08d082e824a026bfe6909efe8069e3205e209a2e6dfce07f5a7d18dfdf
 DIST gstreamer-editing-services-1.14.1.tar.xz 1059888 BLAKE2B d176c5d4341df208ee87d71f1838e5bb6c3bce7f072a3214d6907b91e75a81f5cd79cf424266205641281d525dea7e36423ffb98adef3cddd54814ea763a8d00 SHA512 3801769a515f248b923c50ad51961175094a66f2aa55184e82ecb948331c05b6e297a723d5443db11ec3274ee48f56d6dcc8af8a95cf9e701cc4e02615f8e6e4
 EBUILD gstreamer-editing-services-1.12.4.ebuild 1585 BLAKE2B 75868a617e96b42260bd6a262d63d7bdeee53775abd3e69a6c89ab27ddad6fbf2d1f409fd7654cce486c7fdc9c2732c7237dae360aa22953cecb9e6889cdb7a5 SHA512 288c8f8e2e9051fac527270753ebb72509b930731093344e313ad59a5f94c9f30516419cd42491c95ad4828d551a0bf47047b13eee093c9680d7932a48a8ae8b
-EBUILD gstreamer-editing-services-1.14.1.ebuild 1523 BLAKE2B 9eada41853150ed537ec047ee0cd3eecdd4ae082ac2d928f38c6b3c0188b5fa2c36c1b2894ff4e1d95fc27035b840a9bc8c932fb5a3d3edfb1077cdaa95d930e SHA512 6f04d7d3333d65fceaa3738b7907dea1a20e737f873201efabeed7c2f089fffa7f341233bd590c92f180c6a0c87309ddc5d53d5587daaeb61dac7c6447205c7a
+EBUILD gstreamer-editing-services-1.14.1.ebuild 1522 BLAKE2B 297dc0113cc3ad65279c71ccb0431f111752ecf67a26168873490775f443226237270520d9e1c85321a168a8ad84791e5e4af2885d826d319ccdc2158351dc9f SHA512 472e50e1987851dab0b3eed55a18d14f2023b951ed1f229e6e7908f08954a7b548535c4fc68f1c6e05741ca5efbeed73b96268d0ac6222ee0e73b415173b8205
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.1.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.1.ebuild
index 3fe3cbc6e919..c92668368cd1 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.1.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+introspection"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index f710e04806bb..334ecf628bc9 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,11 +1,9 @@
 AUX gstreamer-0.10.36-disable-test_fail_abstract_new.patch 1319 BLAKE2B 6b7fc64688f7b078d5018d0ec9b90dc8aa6c0c48bbdd19873a95fabd4da7ffed5b767ac1756ffa6b802d6dd2f261a9f2170a52c7a029732296d22b45999d5cda SHA512 6d2ef5d837551481c85b75edc9246049ca237d8b7efd462646a39ce5526a9b309a6390f2257930bfc54383c9b13447002b2c61f777d38e717995eee6030f5198
 AUX gstreamer-make-grammar.y-work-with-bison-3.patch 820 BLAKE2B 1809d190e37fde67c1e7108315e477ed05a3602e401013c26aff33dd0a74e2db8fc4e3d72d6e0b2d5fd79b3c4390c2ec5d2140fdcdb60530facc5e546c1dbe31 SHA512 8f5e904cc42be918c0a170c7227e22d0a31b5eb613a44294dbc03e5b1d7315d565f29d3de796ffbca822fe53b10b83bea54694b58ff2bf453af4b8859741ee21
 DIST gstreamer-0.10.36.tar.xz 3025876 BLAKE2B f0f70f483e8ccb2a294fb3bc8b51aac089f5e76522249b64e3e60e7b488a9e03b9300617e2c137bdcc0e3e61668b7b203e899f270f004e2dfcee0927fa7dfc3c SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
-DIST gstreamer-1.12.3.tar.xz 3175480 BLAKE2B e42b908b6fef2be5d4a0ad435cab5760a5e73e6f09afa0fd0993dd84d01f956b6437beb367082002e875307970f3b4b3fcb8735f7f69836da0ba76ed186e42db SHA512 fceeeca4314aead7ff358db3474bd6fe1eef70f745a6ba20505da6c0caaea6ea6317246dc66c23edab396ca811a610c52fa930f8f99c701241ae7f15857aa2b0
 DIST gstreamer-1.12.4.tar.xz 3177208 BLAKE2B cb859503edbe09cebbbfa70cb4edc5d433bbaa5b299e05921d30e6096f8765e17d449c45bd7d5ea3e4603ae46d337d4e3291b1d0456c7b72a7ebb41faad9e73a SHA512 849aa4ddf8ef465f2915e05d36fc0c31c2e31ae28be2fa38f8069a64a91b7347020fac5b881b7f3ee54c2198c3596138d49f27b09f258303834164a5d68b38a2
 DIST gstreamer-1.14.1.tar.xz 3252440 BLAKE2B c2142621b126926dd9ec886f0478154b3f0d9b7adebc6169200b8bc7e4cd089dfe77cab2b436bf3c74cbcae5f84c95afbd05ba282d0afe3e8e226e6bc0f33e33 SHA512 9cf16d79774293dd7fa10c08f6628b83f4e77f0386bebbfd47ded0498e4abd48eee1aee164af53d59fbea2d395e42eb5a12ef4b8f631bc4fd5d4f69545191f9b
 EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009fd0dba7f402c4a28c20c768ad6290201a900200a33f21b2d97bf6aa7596df06a0001530f001164eb2777a9f3b5cb0adfb SHA512 3a9be6924cb416b173297ff022edffb6a8c496607a4b5f88c1b81fb8489ec045e9f611a88a736fb67a84418d472e37fbdb078e9e9d8593a03418cb6658de6c67
-EBUILD gstreamer-1.12.3.ebuild 3309 BLAKE2B f2dae365901d455f952bcb9a568a4aafaa46ac2da6e90307108ebc1f28d89adec2e96c3c0aae0811ce20f6dd7559d5cf90e4c8e8022a65c3ac26b06a9ece3997 SHA512 4fd05a9b129e65dff3420defc93b5dd7b3f2573c3c587f410c301732b879e12b904dbaafcab98aa7f8aef0b9cb897488e62fde387d40c199a42929172a9c7119
 EBUILD gstreamer-1.12.4.ebuild 3310 BLAKE2B 3628c62235e16443c6cc95dcdbaaf51b8e5931f6b50553eaa786b21b98fac481bfa27bdec00bfcef0f8abc78f3be5f1652e9996a13d75d8dc2022da1d368f07f SHA512 04ee255b76d7aa2fb18c978baf51dd427586a8255449931165c7e327eb16387e640a1a0f5ff7354dc3080f19dda5610a430994dfbbb41397df43d3155c183133
-EBUILD gstreamer-1.14.1.ebuild 3382 BLAKE2B 09786053969fe12c761f69ef4a5d3b728cdf1d943a71db3936009704a3705fa1b8a2ac009f77034b37a0b56b32de6ddc63076654fc62a88b768962fe80a44ce7 SHA512 a885ba4c33bb2f5561893ce1367feb1ddd9e1535f6fe9ece5f2eaaa7af5d8020161d4cbfae10de4152793b2761a4068005c1a9d602675e2bb6388b9ae31d499c
+EBUILD gstreamer-1.14.1.ebuild 3380 BLAKE2B 7f792b5e552de5918c7d5d0bb2aaae78c3681fbab1c8c1c2ae9274ea0b0b08b89ec89a6d8ce903e3e916dd02e124a50dea6f6cf662a23b8651ba699c60868b7f SHA512 569e34d8b04d4fb5455b5f53baa855165e86155f49bdd1c853311dce757216c87842e0d1d69d5c553a36106443cdf2ed4d146adfaedc8e5eb36f12a29004c182
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.12.3.ebuild b/media-libs/gstreamer/gstreamer-1.12.3.ebuild
deleted file mode 100644
index c7edd553697d..000000000000
--- a/media-libs/gstreamer/gstreamer-1.12.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils multilib-minimal pax-utils
-
-DESCRIPTION="Open source multimedia framework"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps +introspection nls +orc test unwind"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
-	unwind? (
-		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
-		dev-libs/elfutils[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/bison
-	sys-devel/flex
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	nls? ( sys-devel/gettext )
-"
-# gtk-doc-am to install API docs
-
-src_configure() {
-	if [[ ${CHOST} == *-interix* ]] ; then
-		export ac_cv_lib_dl_dladdr=no
-		export ac_cv_func_poll=no
-	fi
-	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
-		# GCC groks this, but then refers to an implementation (___multi3,
-		# ___udivti3) that don't exist (at least I can't find it), so force
-		# this one to be off, such that we use 2x64bit emulation code.
-		export gst_cv_uint128_t=no
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local completiondir=$(get_bashcompdir)
-	# Set 'libexecdir' to ABI-specific location for the library spawns
-	# helpers from there.
-	# Disable static archives and examples to speed up build time
-	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--disable-debug
-		--disable-examples
-		--disable-static
-		--disable-valgrind
-		--enable-check
-		$(use_with unwind)
-		$(use_with unwind dw)
-		$(multilib_native_use_enable introspection)
-		$(use_enable nls)
-		$(use_enable test tests)
-		--with-bash-completion-dir="${completiondir%/*}"
-		--with-package-name="GStreamer ebuild for Gentoo"
-		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-	)
-
-	if use caps ; then
-		myconf+=( --with-ptp-helper-permissions=capabilities )
-	else
-		myconf+=(
-			--with-ptp-helper-permissions=setuid-root
-			--with-ptp-helper-setuid-user=nobody
-			--with-ptp-helper-setuid-group=nobody
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		local x
-		for x in gst libs plugins; do
-			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
-		done
-	fi
-}
-
-multilib_src_install() {
-	# can't do "default", we want to install docs in multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
-	einstalldocs
-	prune_libtool_files --modules
-
-	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
-	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/media-libs/gstreamer/gstreamer-1.14.1.ebuild b/media-libs/gstreamer/gstreamer-1.14.1.ebuild
index 761acafba3c2..daa2b5ef45b5 100644
--- a/media-libs/gstreamer/gstreamer-1.14.1.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a5a26dd81a1d..44e1395f2581 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,11 +1,11 @@
 AUX harfbuzz-1.7.6-test_fixup.patch 789 BLAKE2B 6a57e25b3b20607c571c61c06f9f37f10b2c506e1f0c303f2b52302d1c32e7cb282a8a0544b91689da9fe1bfc6d07c2ab5d56698377af83752d4939f582536cd SHA512 87184db1f0a8e7bdf66fdabb1b556e2fdeb44c26ae7dc215e2a8a8808116274822e08d71f47c21fc3f027bae1bb15010404881ce36c053143e447fe252df9e40
 DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
 DIST harfbuzz-1.8.1.tar.bz2 3804867 BLAKE2B 9687b35bbdb74a42c28764a7b026a46ff90640b84bc40702bdbfadc79bbe3c393de837d4cdbbb8798f28aa8c75687c4f07e1c79e98bf9bd506403d89b4baf6a5 SHA512 7ef27232b294883b0c7404c8412837acfba95f12677f226d764f87e22cd169fe037e7bf13a9309e78c9aa905225fb332b3a143a01b13308b05fcccaeddb0c931
-DIST harfbuzz-1.8.2.tar.bz2 3820498 BLAKE2B 7ed1509a7b54571e14d72fa097d19a56e27b3c0020243e51315ff783910319486e6c1af7cec88060c17ccf5788ff1b09f26ee4dbc879b009c983ede767e00316 SHA512 c88a3e9e55866608647318a1af7c5d848863cd894d635583b8a2d2a7a02eea875b7a5a4f0f38555d80f2e81628743e40710f5e6f9251bf629f1d15ac51103e5a
 DIST harfbuzz-1.8.3.tar.bz2 3828043 BLAKE2B 038a714480f10b05b2b31ba46667ce563598b43d122f64ab4adc6f267b2b99ea23ba92a1ae0df173be13f29da8960d55a5c5fdee25aa9fc4541a109c5e76946d SHA512 d3ec8f31ff51315fb35f6b5c69b3fbf29e1dff710fb11158801990fbeb99be5fce691f3c06df1c295a08bfb6c14021c511993b0d22ca96e76d8212ddfda198b6
+DIST harfbuzz-1.8.4.tar.bz2 3829479 BLAKE2B df4116945a00130b83198044665c4f0f0da497cf7d198a39632bbbe6b95327f8189dc7486262eb4d03b181c0151d89bea41223e092613c2f8fec9566eb6f9434 SHA512 8ec72b065b3f5d227b0af1486ab8019414bbdfaafce2f99d5a8bbf7d37a2709cadb545efcc46c5a5c44ce405966f01d8f3e8607f31907f8ed7ebe10150c9dcaf
 EBUILD harfbuzz-1.7.6.ebuild 3252 BLAKE2B e9d0be30511ff76b2423c84a97488fae78af56b346ab3b650bc24e392513dd8748b0f9fc59032d24529b96020fc83463e2a38c66bb9d2f49c8979322fcac3d48 SHA512 ab4b7ccb76e49f3bccc5ed61a8282db84d03f7b70b75963fb01b5a2613ff4ea568379464b89ae4357edd6d6eb057088cc5424d59ae20b6f0c4a4bd6ba665d0a3
-EBUILD harfbuzz-1.8.1.ebuild 3210 BLAKE2B 5728ea38556eb2aa0d113bf2f3a4d4632c1dfbe1a05d4531fa4553a17130c2fe56f49bc6db688e5ab00666c27cb655a67c7f4fd16d77f6503bf1cb74264be832 SHA512 83efd6b91b845884a7a43abf4dd8cbe2a0e6e04c2c0701b2dc9974796e0c22b39311eef27987b9db38a10719f4167b47c4f669d96b192ba1244e91bde710b3c0
-EBUILD harfbuzz-1.8.2.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
+EBUILD harfbuzz-1.8.1.ebuild 3207 BLAKE2B 1dd250ac33c8b6ec4fa9fff4ba6d1746d2881cc18a6510b2848ea06b20e70fcf8b00b03e01defe0fe8888627004e4440083e611a79476856a5a40e2042715591 SHA512 30763dd7704d2b41d2b3d85aec21c9fa3ead4ab11cacea58bca739cfa3c1d0801fbb6aeec0565e25e0d8b812c51c9f57edff2d93fbcfc8f2fd360ccd18a9f68a
 EBUILD harfbuzz-1.8.3.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
+EBUILD harfbuzz-1.8.4.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 63ceb77b82c4d56f58f15923dae72b22483e3316ba8bb4d6414fdbcc4e5062754e8825de9f0fb7ff7e73c63a5330ae8c30ea981e82ebd01b235ba024e291f4b3 SHA512 e06bbb4410096544d1f0f91eb7937afb5a6aa4aff80ce54ef32b4f2858c3cc38b244e7ab178d6cfeb74b0ec13b3ddf8161e71a6fc107df13b87f67c321565828
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
index 92d65fff155f..1d76676999a7 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.1.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/harfbuzz/harfbuzz-1.8.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.4.ebuild
index c723137a7e55..c723137a7e55 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.4.ebuild
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 6f5f01c5fc15..11443326b87a 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,10 +1,6 @@
-AUX libdirpc.patch 1877 BLAKE2B e8df5b7b5a662d68d3386e348964b17b15bfed49b8cafed55b9893878ead75e00a1ceac92e63f5dc446b03faf09af26e732c508c83e851a7e3664471c8dd8521 SHA512 ead273addda6b39b6f10b7636465cf313b1dfeb344457227acb1d8c03bdab8f78ba0e44ec90b1044359ae445e1e1ce1a87a06df91c86a406b6fd4ce41713df0a
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
-AUX pthread_lib.patch 561 BLAKE2B 7d1a68f9c8a9f250aee9ca44a2cb787a802195708f0dc156d22073f21f83772167c5c57d953551a55385edb13ea8c5e8c28cd1379814175ff915d03ad8bf2860 SHA512 7a7060aa7a7062d85ba9ec3e0bdacdd552c5f2b7ee5c326da1d0d4a48b28693651703deccddcbc31b6e3190fcc6ac6e665bf09621b0ad278638d0812f557be85
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
-DIST libaom-0_pre20180421.tar.xz 1927112 BLAKE2B 3e70917e58ea4871c640f9df1da17f50dd7b1b1c41b99a2411bc68f11ae4acd76f358d1aaab17ba240dfa104fca1d5ebea057a0ba5666741658943dad10601ef SHA512 169872495a210192ae4f97d4d630b00d2219aa085999d9d90136274ec2dcf60d5001c91b5d920ee5b14b76cf02a9a067a3bf57a152bee9e9bc5a524c9205642b
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-EBUILD libaom-0_pre20180421.ebuild 2205 BLAKE2B 9cf6720694c443ec5d20bc7df86a7a6abb4a91fe53e90678e07b2634537167a21e645f8c4f6722e093ff26d84ee83b18aaacb959d9a13bea3b6b4136cb3637d0 SHA512 5c9a0143b6b88adb7753285ff9169def2ee2bd9ff5dadb367f110da152d06b34eb188e8b76b0227cba40da29124fd8a7400ed0c68a551e5b58b5f754ac2d32fb
-EBUILD libaom-1.0.0.ebuild 2327 BLAKE2B 96fb2a1b53847b34059f8afcac3ce84a3092ff8082201ea08d42cc48849a7533f8a9f76270a76446395ad42f382cfe4b07955c95bcd1705e3459e6cd277c2922 SHA512 7e1cf492f664ff77f797ce9464e62aa33a650e47d62193056cc64a81e1fc3b158bc3dcf2f05b1c58f688fd3fa5536cb040887b4e88cbc6719f0c1e3d676e6188
-EBUILD libaom-9999.ebuild 2327 BLAKE2B 96fb2a1b53847b34059f8afcac3ce84a3092ff8082201ea08d42cc48849a7533f8a9f76270a76446395ad42f382cfe4b07955c95bcd1705e3459e6cd277c2922 SHA512 7e1cf492f664ff77f797ce9464e62aa33a650e47d62193056cc64a81e1fc3b158bc3dcf2f05b1c58f688fd3fa5536cb040887b4e88cbc6719f0c1e3d676e6188
+EBUILD libaom-1.0.0.ebuild 2369 BLAKE2B f3fab7bda7c1aaaeab7dfb6cc3da7ddec3e1176e48a48a912b0e11a8206ce3ee3200993b94fb00759f3b75e701659157f15b7fdca2208d7d1d07a59f75969409 SHA512 7f7d1450f4f7c1bd605c86f0d0900b50d1773a7f19b2da3efb6f1077f46acc1912c7c5635010ba57661cacf5cef436040f3257d817812ce538b3f5785d03a965
+EBUILD libaom-9999.ebuild 2369 BLAKE2B f3fab7bda7c1aaaeab7dfb6cc3da7ddec3e1176e48a48a912b0e11a8206ce3ee3200993b94fb00759f3b75e701659157f15b7fdca2208d7d1d07a59f75969409 SHA512 7f7d1450f4f7c1bd605c86f0d0900b50d1773a7f19b2da3efb6f1077f46acc1912c7c5635010ba57661cacf5cef436040f3257d817812ce538b3f5785d03a965
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/files/libdirpc.patch b/media-libs/libaom/files/libdirpc.patch
deleted file mode 100644
index ac6466433683..000000000000
--- a/media-libs/libaom/files/libdirpc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: libaom-9999/CMakeLists.txt
-===================================================================
---- libaom-9999.orig/CMakeLists.txt
-+++ libaom-9999/CMakeLists.txt
-@@ -248,6 +248,7 @@ if (NOT MSVC)
-       -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
-       -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
-       -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H}
-+      -DLIB_SUFFIX=${LIB_SUFFIX}
-       -P "${AOM_ROOT}/build/cmake/pkg_config.cmake"
-       COMMENT "Writing aom.pc"
-       VERBATIM)
-Index: libaom-9999/build/cmake/pkg_config.cmake
-===================================================================
---- libaom-9999.orig/build/cmake/pkg_config.cmake
-+++ libaom-9999/build/cmake/pkg_config.cmake
-@@ -35,12 +35,13 @@ endif ()
- 
- # Write pkg-config info.
- set(prefix "${CMAKE_INSTALL_PREFIX}")
-+set(libdir "lib${LIB_SUFFIX}")
- set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
- string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
- file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
- file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
- file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n")
--file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/lib\n")
-+file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/${libdir}\n")
- file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n")
- file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")
- file(APPEND "${pkgconfig_file}"
-@@ -48,7 +49,7 @@ file(APPEND "${pkgconfig_file}"
- file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
- file(APPEND "${pkgconfig_file}" "Requires:\n")
- file(APPEND "${pkgconfig_file}" "Conflicts:\n")
--file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")
-+file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm\n")
- if (CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
-   file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
- else ()
diff --git a/media-libs/libaom/files/pthread_lib.patch b/media-libs/libaom/files/pthread_lib.patch
deleted file mode 100644
index d8770bc687ca..000000000000
--- a/media-libs/libaom/files/pthread_lib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libaom-9999/CMakeLists.txt
-===================================================================
---- libaom-9999.orig/CMakeLists.txt
-+++ libaom-9999/CMakeLists.txt
-@@ -598,6 +598,9 @@ if (BUILD_SHARED_LIBS)
-   include("${AOM_ROOT}/build/cmake/exports.cmake")
-   setup_exports_target()
-   set_target_properties(aom PROPERTIES SOVERSION 0)
-+  if (HAVE_PTHREAD_H AND CONFIG_MULTITHREAD)
-+    target_link_libraries(aom ${AOM_LIB_LINK_TYPE} Threads::Threads)
-+  endif ()
- endif ()
- 
- # Handle user supplied compile and link flags last to ensure they're obeyed.
diff --git a/media-libs/libaom/libaom-0_pre20180421.ebuild b/media-libs/libaom/libaom-0_pre20180421.ebuild
deleted file mode 100644
index 6b45d369d2b9..000000000000
--- a/media-libs/libaom/libaom-0_pre20180421.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-elif [[ ${PV} == *pre* ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/0"
-IUSE="doc examples"
-IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
-IUSE="${IUSE} cpu_flags_arm_neon"
-
-RDEPEND=""
-DEPEND="abi_x86_32? ( dev-lang/yasm )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( dev-lang/yasm )
-	doc? ( app-doc/doxygen )
-"
-
-REQUIRED_USE="
-	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
-	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
-"
-
-PATCHES=( "${FILESDIR}/libdirpc.patch" "${FILESDIR}/pthread_lib.patch" )
-
-src_prepare() {
-	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
-		# ENABLE_DSPR2 / ENABLE_MSA for mips
-		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-	rm aom.pc # ensure it is rebuilt with proper libdir
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc docs/html/*
-	fi
-}
diff --git a/media-libs/libaom/libaom-1.0.0.ebuild b/media-libs/libaom/libaom-1.0.0.ebuild
index 7b41eb397c28..eaba897ff301 100644
--- a/media-libs/libaom/libaom-1.0.0.ebuild
+++ b/media-libs/libaom/libaom-1.0.0.ebuild
@@ -12,7 +12,8 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 		S="${WORKDIR}/${PN}"
 	else
-		SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
 	KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 7b41eb397c28..eaba897ff301 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -12,7 +12,8 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 		S="${WORKDIR}/${PN}"
 	else
-		SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
 	KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
diff --git a/media-libs/liblqr/Manifest b/media-libs/liblqr/Manifest
index 8ed4865d05c3..35eb23fe2d72 100644
--- a/media-libs/liblqr/Manifest
+++ b/media-libs/liblqr/Manifest
@@ -1,3 +1,3 @@
 DIST liblqr-1-0.4.2.tar.bz2 344739 BLAKE2B 90ae891603dc525d460b1f180342b2a998ef3081a7504c642d0ddbbc5feef1ceb512a046a5366311d2a86869c8988f24f03faaafd3e7c77b1ff1f82b8a23acc0 SHA512 57d9ed67d5a11c970262263a34b6797576088e14f2ccb01b393eff55bfd22c8bb2b2189e3ed5ff6c187f709c556225fc1fb1038bd0d7e0c03d8839ef0ce998a3
 EBUILD liblqr-0.4.2-r1.ebuild 614 BLAKE2B 2cfa4ba2f4734209cf11065cd116f1df228e559f4539513f74ac81ceb2053c6e05d2ea45e3b6bd665a677005109acae336a04664b1c06a1f296171929aebb497 SHA512 b3552ed68393c113db0bb6ebf27ba6a1e96c7917a573cd6d73acd4f48c249c2f46710d4ee6e982f61fa040fa8082d600700fcd5758f4cf88b710705fd987ea46
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/liblqr/metadata.xml b/media-libs/liblqr/metadata.xml
index 2028cee3c389..6f49eba8f496 100644
--- a/media-libs/liblqr/metadata.xml
+++ b/media-libs/liblqr/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index fca877a3a3d2..f1c8d74d8d0b 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -5,4 +5,4 @@ EBUILD libmetalink-0.1.0-r1.ebuild 674 BLAKE2B c677bcc0cd9efbf1e176d6e10e9aaf4f4
 EBUILD libmetalink-0.1.1-r1.ebuild 798 BLAKE2B c2ccd770a6e05721b42daefd89a9a399eb5b88b86db97aa5bda3ae0518f844075a08129257113179d12a48bc9fdcd231afb94d5ab15fb10a22983d20f71f3975 SHA512 12facd74a93ca688f5f56194ef677e572a91bac2905798f0c4550df76f83a35daf28a1926c4199894a3199bb98ac67cbf0d0e185b1a06af59e2ba711ed36acd5
 EBUILD libmetalink-0.1.1.ebuild 660 BLAKE2B a0aae78f310ae5eb95b8656f2b101bae4270a58be13bc6028397ff7dd98bc856fc7bbebca4d9bb4eb3a2491f0039c57db592b859b1214ebf3d08ff1836e46ace SHA512 c1ccc97da9eaebda18732102ed62d6c03c6166b75e8d0e31699e292973228f6bf79a475bf3d51cdc4e1f225213866b141de5b35d085a8ecfc3c4b170cff6d4e4
 EBUILD libmetalink-0.1.3.ebuild 817 BLAKE2B e1b2a48973a259f98fcca7e00f801e01dde50e25158c707a0adfa9dc2e0996749841a729092c60df88de34ee7a780790c13af12b8f82f7e72c5e5bbc29f73999 SHA512 d95a4979c37deb8948d6e58d64e49f297e73c38119a25548a51f9a564a1f3b7325afc0bdb78e09a1513116e01a98db3102aa605fb16f20ae9b9df9b9fbd2fb00
-MISC metadata.xml 329 BLAKE2B 0d879ca1212ea558ed0ddb5e3382c96b77fb2fd45d6686f0de86e87c0e7cc76d23e7ee7c22e1397b09a54fe3af9e4e6491f0c8356613d046ce8887d08ad8849a SHA512 ae902588d433ad7e5596fe789a0aeb533aa3e523f77d011e61a1c6572b1351d4159dbeecbe09ba34653c9930dbc86a52f72a32a4ad14af18608302b53a68c500
+MISC metadata.xml 246 BLAKE2B 8de378056256c0217da9beda2aaea7afe4967f48fa4b62cf3d8cdf2428791003a6cf4bbef204342dadbfb05e1be7a8914a637de532ca6f8ea9f4f68273cb6f4a SHA512 c7a53354d3381e820c1a7cfdd90850f45dc034c96006ba7d6c9459727fd0f1adf5473a35ab52de8bde5a14b66099cc67333c75953199bcac9e7567dacea2838d
diff --git a/media-libs/libmetalink/metadata.xml b/media-libs/libmetalink/metadata.xml
index 1cb4a5357db0..7a518d3cf845 100644
--- a/media-libs/libmetalink/metadata.xml
+++ b/media-libs/libmetalink/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">libmetalink</remote-id>
 	</upstream>
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index a35c2746ab8b..23fd58d82f58 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -7,5 +7,5 @@ DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c6230
 EBUILD libopenraw-0.0.9.ebuild 1176 BLAKE2B b9fa4bbf8321a60b9e7ead13e84fcd5db9b4f857519c2af477faa512226904bcdaf41216158098d172d2bbc323e3c75df4f21ed92c55584cbcd751e769c41666 SHA512 29dbb8a80ca71dc8da754e60ef28a858237cf115d73d368acd8100106720fa5f8e12cde3f2a51c40873cb989e63ff3c0f9bb644922f29ce166abcc1dec4f1a43
 EBUILD libopenraw-0.1.0.ebuild 1228 BLAKE2B ca67ba91847658b3c342671b49c16d6980f23a9e000084fd62654d7d652cf17ed0514a817a8bb7688a8609e9d4fe1e848b9812537215edb8296dce29bbec8ffa SHA512 8fbc38c551dca7881bf55aa735c8ef6582cd2cc4eb1a0e122ddd547bed0e01505d59dadd9751f8e93bd3d7a34b69973123463e7d7f65db729d0c91ff4cea4aeb
 EBUILD libopenraw-0.1.1.ebuild 1120 BLAKE2B e26e96d57c6e619d51ce08403eaa14bc40d5b9fa297bdbec29e202ef7da5ddcfddf00191cf4ef711618866d6dc6097f7e8b8863bbe856ceb7897b5cd9c653ba7 SHA512 94a09d76deb2100a1f4d274f33c8e2da7eb7e080a7f57c19a2d354111c58e87eec285d67fbf309d99899439d76a4820e138552b830a5a56d2d6fa5dff715bc04
-EBUILD libopenraw-0.1.2.ebuild 1112 BLAKE2B 833dc253d10b448fe4e7fc7dd3d6c3466ea3515d807b7adf39bddf0d8c31bee216c3fcb3f956705d58457ffd1cfb698a8fac21e78b757861bfe879833882a920 SHA512 2d20280bdf6e80dcc146d91cb000c622f4b550e6f20c2d60b76a3e35417f4e7e22daa8c745aa69d31fecf9b86db61207a29fd312437f3912672ab0cec7f94b39
+EBUILD libopenraw-0.1.2.ebuild 1111 BLAKE2B ec6e50d2e20e471639dd4766d0801b8a12b5893cdf67043fee9526b652d59fef5084466354af22cea96deb9e57460f8420bdb264d7b73cc1b12dde9ecb6f06c7 SHA512 8b905c96e8f510b71781940ba8d3b27ae582ea96348b72b9b1ea248ca7242d8c621cdb3c5a5350a6cbd15cd870e9dcd9fe88edc2b437299e85c457f059bf6470
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index c2033d4fe9ae..bf5a873fea28 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index a088cec63a18..212670a1d1dc 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,12 +1,17 @@
 DIST libpng-1.2.57.tar.xz 656784 BLAKE2B c8538234f3aa6411629d15cf77d85846bae081f779b0a1dac92f863ae68f1fe5db84e56df44df1f782fe9f6cfa0f4fa3e418fd12472a73c6f3e7d013e0921f86 SHA512 51338d900690fc2d28ea1b5b364d311d73ce7ad498d000985e0c3926b5df0df97fcd7bb079fc954c6caa532fc6e6cbbc266e671d62fc67eca30e79a5f0e26f31
+DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
 DIST libpng-1.5.28-apng.patch.gz 10330 BLAKE2B f8d195a90e7b7a5b3d66c35dac2b3e7ecb531d52504c8bf7401458c63381a11cbec4053691fc17de8473ffc5c1e7b333ccf6b4abc08797a60f857ca4d254d8f9 SHA512 f99dd6ccd08083a3328841c40fbc94347a42326b29948ec0260497e18da937f1fcccccc4a3636e86a8e0c6b3a094ad8b8ab411af58f56df820b4cf78db25cd96
 DIST libpng-1.5.28.tar.xz 755724 BLAKE2B 5d8b653926434a0e7fae3c5698069883ef97f8a97fac3c0e304386ed51606fba2422af955f092ac20f74ab2593a2d7e2e26cd82f9ff766ffc6a68bf85a96d9b0 SHA512 25adcff4429e7c691a6336a70f3c3d212aa27da6c9d6393325d9866b4c7e1f5fd40b9fe23b1efbe5629753a6051ab52365688ac14913584faf40e84e0b9f514c
-DIST libpng-1.6.29-apng.patch.gz 10313 BLAKE2B 856fadba345bab488fde90fd2c40c33b4f84cc965acc858b0caafa32b6c16456c7aa5a5d8cf02fe65f6ac28e0c24d598a61212b290490d9d48e831e9a4731dfd SHA512 348121e2b7ab1bac8d4ce3ab6e60f56f1f28bedbbdeb2f87b32662f838713460d8bced3401e9d736969f6fe2eb40d77028c9d4f569c59a091c860b6507026975
-DIST libpng-1.6.29.tar.xz 987652 BLAKE2B bf825553a385a06d060aa86686152070faf6476cfd5670e804bff00f24f9f5e9c024a8ecbe7772121bd94744fef5c6d728805c18ebdd23e6459b8be099d92f5e SHA512 070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc
+DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
+DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
 DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
 DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56729a2d11e78361292568dce5c33f8fd24c56a5c5a007f419b8bc14fdaecff6db05ac2acea51b2374a1f57b848 SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51
+DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c7281c3abb0ea9cd119fcf0cb6584eb1eb5f244d57e4ec7198614f3df5f9b302c0de2b447ed0cbacaa7b15821c2e3c23cf7 SHA512 40cda24d003089c31786b70fd581cdd960f338ae89535646a2188bc8e25e603a6ad2080406017bd45edb298442a88dd60ada1ec650b001596d216e8194a3dda1
+DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
+EBUILD libpng-1.2.59.ebuild 878 BLAKE2B bcb170292ebf723944a3ebdcdabd0978d548778d214bd1f81243fe01323eaacfbe9fcacbef1c6d4d7b84b0932e9dbd0a2c1f87c82d882d47e5fbdf1beff036b0 SHA512 225d15ed33d45e502c8201a233a0267efe5c48224f070cb74df69a8aed938a3873386379e242df3263de3b6b524335462ee15512d9d90ba0fa89dedb1f4237ad
 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.5.30.ebuild 1660 BLAKE2B fb558f645b19a85903c441feeac99b167018e01e871049553c24638d29d1e346f08ee40145b041123e7e4edef91ac35e1457e346cb9ab31117aa6ea65fb4e3b9 SHA512 def71347be2803699ef0023dc55f1bf141433b857543d4b91d16a7bf25d983fdca25ce736fee58cbe992a44ca2f84796f7b99ddc8e1846a65a51ebcec1519e5e
 EBUILD libpng-1.6.34.ebuild 1371 BLAKE2B 95fd73fd3cc816d70f5c67c7769cd04d02a651fd90263c67127f8a58048ba7f05a9032b1b2c808aefe7dec4c8e1f54846f6867f24fd1ae646092e5a5a9cab57c SHA512 57e3acb2e8ceef43c00a95c06ebb851afaece1d37f760623236eaa1670f21e62699661cc5f19e6143613954ba3ae7ff5b4d066d5baa7a7921ece775eef329933
+EBUILD libpng-1.6.35.ebuild 1410 BLAKE2B 00db84214eae13e31302605bafc4d5aae90ec2c94689c07d83077f57af789a2f3d67029b62bb6a383a10ab5840d64809ccfa36d9a6602c2535f37671ad2fd3d0 SHA512 f0468a14a6af89f495a5c00b4e50709d675f6997353e73b7e66b66feddc0151c97cb8b5982c4bfbf1e46b7bf52e77c6e22677288d2f666f84d5fe657ddb1593c
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.2.59.ebuild b/media-libs/libpng/libpng-1.2.59.ebuild
new file mode 100644
index 000000000000..0ce40d82cebe
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.59.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="libpng"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	!=media-libs/libpng-1.2*:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=""
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_compile() {
+	emake libpng12.la
+}
+
+multilib_src_install() {
+	newlib.so .libs/libpng12.so.0.* libpng12.so.0
+}
diff --git a/media-libs/libpng/libpng-1.5.30.ebuild b/media-libs/libpng/libpng-1.5.30.ebuild
new file mode 100644
index 000000000000..0e1042a2c2ec
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.30.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( https://dev.gentoo.org/~polynomial-c/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 neon"
+
+RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	!=media-libs/libpng-1.5*:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=""
+
+pkg_setup() {
+	local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
+	[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
+}
+
+src_prepare() {
+	default
+	if use apng; then
+		# fix windows path in patch file. Please check for each release if this can be removed again.
+		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
+			-i "${WORKDIR}"/${PN}-*-apng.patch || die
+		eapply "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-static \
+		--enable-arm-neon=$(usex neon)
+}
+
+multilib_src_compile() {
+	emake libpng15.la
+}
+
+multilib_src_install() {
+	newlib.so .libs/libpng15.so.15.* libpng15.so.15
+}
diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.35.ebuild
index af03888d719f..2ecf29ecfe2e 100644
--- a/media-libs/libpng/libpng-1.6.29.ebuild
+++ b/media-libs/libpng/libpng-1.6.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils libtool multilib-minimal
+inherit libtool multilib-minimal
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
@@ -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}]"
@@ -30,14 +30,16 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_sse intel-sse) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_sse intel-sse)
+		$(use_enable static-libs static)
 		--enable-arm-neon=$(usex neon)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
 	einstalldocs
-	prune_libtool_files --all
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 24a5f0e2bf94..a3aed12967fc 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -9,7 +9,7 @@ DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e
 DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
 DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
-EBUILD libraw-0.18.11.ebuild 1845 BLAKE2B fda4dbc088c1afb3b6c260a06210f67487f15660792cbb533db188d92de63860c447efbfcca1261c359ad5fd554c035a0e99fb83fa128a8cc0cc3f694e7d82b1 SHA512 e7de5c7b91a2f27756d28920373cd3e4cca4f53a55225ac10783fe3b9a0866bd27913ee11d90bf38ab71887863c956bad44abfbe6c145a6fd2b75d2d69edeca7
+EBUILD libraw-0.18.11.ebuild 1843 BLAKE2B fd6d9bd5537532bf7fdb2e2f2665b3cb9915dabf8f07677ead3c44e53418eb3440d1a86fb4983834d436316c25f3a854066511c66e7b7352274e73e0ef1d2fd1 SHA512 d2793037aea9672d99ea1d53f4b8b8a16c62b0a0aa74b8d470b207a1b2a196640ee93bd630a7b987fdfe34b49f9f63f514fb73adc7573764d16145784b9acf46
 EBUILD libraw-0.18.12.ebuild 1850 BLAKE2B 3ac45ea0a2adbd0e593bbe72ce9b2d8ced1a0dcda0bf327114f0a3e7c9d7158928e5de593e2150ce78bbd260d75cfdcf2c18d198ca882ef6516fabca0256813b SHA512 e2aa30b3a5acc40416f04aef1b15f74c9df5c3772e78844bf7f99706c244c6a1dcbc85b7d20895f48a7e12ed3abe47424333bb8dd5f9f19e827b8fa5192a5b1e
 EBUILD libraw-0.18.13.ebuild 1850 BLAKE2B 3ac45ea0a2adbd0e593bbe72ce9b2d8ced1a0dcda0bf327114f0a3e7c9d7158928e5de593e2150ce78bbd260d75cfdcf2c18d198ca882ef6516fabca0256813b SHA512 e2aa30b3a5acc40416f04aef1b15f74c9df5c3772e78844bf7f99706c244c6a1dcbc85b7d20895f48a7e12ed3abe47424333bb8dd5f9f19e827b8fa5192a5b1e
 EBUILD libraw-0.18.4.ebuild 1774 BLAKE2B b34582c011016beb415bf262bb8a5db89e9a6a2e641b0cb3bc26b93d86fd4b95616255a42fe5a6e50a76a0974875ebe151f9684b674435966265a16e97845442 SHA512 a0277cda774fc2ec3f318544655dbb3a39266828bf9bdac80a839577f4fb5a2028b34548c7aeea33a61560753ff4631ccfb0ae3fa558440cc507e23c9bc246db
diff --git a/media-libs/libraw/libraw-0.18.11.ebuild b/media-libs/libraw/libraw-0.18.11.ebuild
index 0d2503c6f2e6..fa6cf6a88c19 100644
--- a/media-libs/libraw/libraw-0.18.11.ebuild
+++ b/media-libs/libraw/libraw-0.18.11.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
 SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index 9cfae7af7154..64b7621042c2 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,3 +1,3 @@
-DIST nv-codec-headers-8.1.24.1.tar.gz 53312 BLAKE2B debb3556399c19ab4d6b6399a187aae23d4480309531d8c60032cf0832f21943e6c568eddd05df200daa17fbfadb679f6b48f59721c0f66ce17ca916e3812dc9 SHA512 b3d8ac2611260bff20ecfb223e1fe84190ea1264a77fda7273624b2ec2dd1ccee3d92d91217546bf9db4c52997fc5c4a769466c363fd67b06dee4f962712776d
-EBUILD nv-codec-headers-8.1.24.1.ebuild 791 BLAKE2B 2caf4d406ebe5ea042f4f3ac321bdc95a9759ce9b9d9c15c68149e77fdde99718a1eed0d730b908e116b8bdfb96279ff6ac1484193ec2f6ca3d78e6b8cdf5a85 SHA512 9994916c7b592ea86289b83762832729a745002372e939396fdc5075f2850de5ed0cd03f027c4d38d39bec1a2f847282d466cb7e4dc7a07757065098bccde465
+DIST nv-codec-headers-8.1.24.2.tar.gz 53627 BLAKE2B 482c86824f81652b439fba1b765261de107d51a3bd780d3f0c58e1cdd53cd21ddad3fea59e8ab5d920fb34c73e43c10c007a5efe32024bfd3523ed8d4ad26f44 SHA512 daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
+EBUILD nv-codec-headers-8.1.24.2.ebuild 791 BLAKE2B 2caf4d406ebe5ea042f4f3ac321bdc95a9759ce9b9d9c15c68149e77fdde99718a1eed0d730b908e116b8bdfb96279ff6ac1484193ec2f6ca3d78e6b8cdf5a85 SHA512 9994916c7b592ea86289b83762832729a745002372e939396fdc5075f2850de5ed0cd03f027c4d38d39bec1a2f847282d466cb7e4dc7a07757065098bccde465
 MISC metadata.xml 319 BLAKE2B 227369d173003d904c042ec479371e9a483e6d7d58af0f8f1a03317e773bbbd0a06250e06583cf2cbbbe9020a1d7cd416b51467dc96649ead55f51785c79a019 SHA512 c1815f8f72b994c4f4fbd3edf1a856c89848e092b3b6515e706ef26b6b09d0096582219b7670b2b822ccecdfeefcbbbe768141acc3f4e55ca8879045a8ed51cd
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild
index 61ca145dbfff..61ca145dbfff 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.1.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index 8de882aff178..a740cb5f4b39 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -4,4 +4,4 @@ DIST opusfile-0.9.tar.gz 467683 BLAKE2B 7737e471fdd40bdf77883974569782dc7fcd12da
 EBUILD opusfile-0.10.ebuild 890 BLAKE2B 35e7a73420a5aac646805f1175d627c6e3227b7ae5bea191cbc102da955b3ff319099994d440853e9094d33e02a9307729da28be38ad82a04aa0c6df524f90d9 SHA512 36d9df9967f117c7a65354e949eff47e5e78ae681004c1d5f4a287d39fafe4d943c2b9390eb98a1aeb6c4f142911ec2d83271c477e0da3bf3e4cd8f1641fe6d6
 EBUILD opusfile-0.6.ebuild 776 BLAKE2B ac01c1df72626fbe4e2c0ea46d71ce7a5b22419b2f1a72e334abbb346bbd84fbb92760d1b1cc35947c24ef0e5e01330d3a988c7daba40de703fc1bb5f80a0151 SHA512 e6ab915319a73061ed951fa5c1617c434b2c3df1335fa23860175caa2b6773b7326bad386bcc1aa39b5792c90266b1e7bdfcad85f2d997b2f6625e1670909551
 EBUILD opusfile-0.9.ebuild 889 BLAKE2B fc8105af60cb635c8b22d19be1a17c592ce8358c484e3bb55957becbd1ebb324049e3bdf8aa9255f9535c642de9085a4490c323bc0b9084695fff3962c6fbb94 SHA512 d548045b13aaa8164028c0e0cebf02dfe87f36fbce8db921ad0598e5f469aeb2c7c802dea7b41f256a92f1730c5dc548dcd08bebf47e96ef0c29da1e392d414b
-MISC metadata.xml 449 BLAKE2B 7c34478a4f9f4d846d9140b15ab021c9e0ff6abeaf83d50146ba04c0879abf296eda3c0e2a99ac1233f78fee92207fc949a46d7a71841383cbfd299bdaf6873d SHA512 26016ad55f4ade7702375455e14e2e657e2938d35ed1e58c7e7032c432af6f154ec8da8438f353196c02651cc7c41c8b41b1bfec1e05221d06e525f8fcfadf20
+MISC metadata.xml 371 BLAKE2B 020407fca3397e32a82ee401d9b668f9f99755c7404a4c223b5cf05ff012a27928306d19dc866b39edad657647edd030d11b626882972b9d6455b830284e5656 SHA512 bc5c1673d5ea5c298afbc35a6fd68544c2e7304becda14c71e5b472c55e44285ba55f41043f8efb3ed58137b58a0f39245b6db5069c63536b514bce69517474a
diff --git a/media-libs/opusfile/metadata.xml b/media-libs/opusfile/metadata.xml
index 2fc68af2b4cc..a3fe34c1dc27 100644
--- a/media-libs/opusfile/metadata.xml
+++ b/media-libs/opusfile/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="fixed-point">Enable fixed-point arithmetic operations</flag>
 <flag name="float">Enable floating point arithmetic operations</flag>
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 92695a16d227..1949c2ea1a89 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,4 +1,5 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 EBUILD partio-1.1.0_p20170829.ebuild 1060 BLAKE2B b235d53fa705d5e6d515ee983203ac0349c23a7b10f09093980fba0aaef4d770fcb469a0f357bf4a15f07c1017cc19b933fa0f0df6d6207def91a12677bc9bf7 SHA512 c80ff6fcc5e52201819b6477c735a51e94c72e63992c404a24e7c10ebe05955d542fce76ac4e21ff1f8e7192f5c42a968988be2cee2a9cdc4a07720bf15e9ce4
+EBUILD partio-9999.ebuild 1120 BLAKE2B 4d5c4d89eaacf786e2f097da917b9b78bfce8e392c8ce468f9e6042e7d2f01ff39f73b4960d3459ef834b21a98b2af984b7026d4ba94ea6ce731a09892ebcdca SHA512 f6ca5099221bdafce8704328f5f879d2a9ad569970e5618185dc95fa3c115d3a16f06ea420d8d4ff82f28fd3dab689f51f6936de91ffdaada38c7f68062bc6ba
 MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
new file mode 100644
index 000000000000..45be65d43fda
--- /dev/null
+++ b/media-libs/partio/partio-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils vcs-snapshot python-single-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wdas/partio.git"
+else
+	MY_GIT_COMMIT="2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5"
+	SRC_URI="https://github.com/wdas/${PN}/archive/${MY_GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A library for particle IO and manipulation"
+HOMEPAGE="https://www.disneyanimation.com/technology/partio.html"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	media-libs/freeglut
+	virtual/opengl
+	sys-libs/zlib:="
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[latex] )
+	dev-lang/swig:*"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	cmake_comment_add_subdirectory "src/tests"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package doc Doxygen)
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index fae71aa95e75..a4a3a36f2ecb 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,7 +1,4 @@
 AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5
-AUX qhull-2012.1-format-security.patch 495 BLAKE2B 2926c676e94542901ad997e782088de837f23ff75f82b91fc82d0c14c32ef6284fb1a0a0ec216e26e772deb6907a49d32beaa0e54be20cca1fc7001a868cc955 SHA512 91df8963c8d90210281b1546a76a815c59d4343657f4771d4aa13ffa29d1935b10437441b39b85ef791da0eda8f76c381d7548b3152a0c2535ff6ff87997babd
-DIST qhull-2012.1-src.tgz 716665 BLAKE2B b704b87ac36be3d22ab45bce1ec3bf06ed0a3786f6294e6d07af3ead6e313c947a601edccdc03c96512daaf9dead147c024d8c0963c8f3d6125c3c99b41dbfc5 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
-EBUILD qhull-2012.1-r4.ebuild 1287 BLAKE2B d43d4d0f4e0ec371cba16fafa77c64e941c8ad3a57880ab1f4fe7c4233c4617de71eede17424496985c2576ff5e128ef4e318059a81bc335433f6f6a8d57624b SHA512 a15c12ce3713bf0afb205d66ce184fb33b5c6c14f9557b19b497b86619224e9079a573efc1b62dcf1ec254775262c7648c741f4cdd61235dea759b29b418a8e6
 EBUILD qhull-2015.2.ebuild 1036 BLAKE2B 9db340744c21e68cbe6591bad519c93b43e82041fd7872bda3e5372c228d3feb8ac6400c3b7c9c9c3af8d71bb9f46fbe3dd747cc58931aef24d2b1e876d71ef4 SHA512 e60fe0a0287216fb6c8099e682a4eebd5b913bf884fe267993428cf6a9ee69e8b7f6668be28eed50a24aba36f63fad368b1b6bddb463c0c9d4afb765cd5b9708
 MISC metadata.xml 977 BLAKE2B 57a86855387223c875830b8d60eb02f89f469dc4949f094255f43e0251cb537049d0a99a0eb9500c639730f6a0db518ec2b3a4ae050e3c9ea2f508cdbe790e98 SHA512 6e676d2faff561e67e077869a61747c834131ea67acb098497153c98d3bca38032ffa2ab57d6b612cfa4f1fbdb8b05b0c9a9132ab0cdeae5579bdac236b9a1f2
diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch
deleted file mode 100644
index 14bce2baa75c..000000000000
--- a/media-libs/qhull/files/qhull-2012.1-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/libqhull/io.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libqhull/io.c b/src/libqhull/io.c
-index 09a0079..2bd066e 100644
---- a/src/libqhull/io.c
-+++ b/src/libqhull/io.c
-@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst)
-     qh_memfree(point, qh normal_size);
-   qh_settempfree(&points);
-   qh_settempfree(&vertices);
--  qh_fprintf(fp, 9110, endfmt);
-+  fprintf(fp, "%s", endfmt);
- } /* printfacet3math */
- 
- 
diff --git a/media-libs/qhull/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild
deleted file mode 100644
index 64bfebe065b5..000000000000
--- a/media-libs/qhull/qhull-2012.1-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Geometry library"
-HOMEPAGE="http://www.qhull.org/"
-SRC_URI="${HOMEPAGE}/download/${P}-src.tgz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-64bit.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	mycmakeargs+=(
-		-DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	# See https://bugs.gentoo.org/show_bug.cgi?id=435006
-	# If qhull-2010 is installed we need to remove its include dir so
-	# that it can be replaced with a symlink in this version.
-	rm -rf "${EROOT}"usr/include/qhull || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	# compatibility with previous installs
-	dosym libqhull /usr/include/qhull
-	if ! use doc; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die
-	fi
-}
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
new file mode 100644
index 000000000000..2f20058117a5
--- /dev/null
+++ b/media-libs/woff2/Manifest
@@ -0,0 +1,3 @@
+DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
+EBUILD woff2-1.0.2.ebuild 559 BLAKE2B 3bd82a9e645af75ad5923837e749e756093d600544be2ecaefe40094afbff954b0b2829f5cf43826d354a6420e5da0807ba846574c17a793264c9c61978dd8b8 SHA512 52f04f154167e8488081a05d592d696e7633ae894dbcaabbee207bf191577d0668f19032062e7cece60cffb152e1e963a2a2fade8f61160bd3a3ea6dc88ddba6
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/woff2/metadata.xml b/media-libs/woff2/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/media-libs/woff2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-libs/woff2/woff2-1.0.2.ebuild b/media-libs/woff2/woff2-1.0.2.ebuild
new file mode 100644
index 000000000000..36a44eb0c5bf
--- /dev/null
+++ b/media-libs/woff2/woff2-1.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Encode/decode WOFF2 font format"
+HOMEPAGE="https://github.com/google/woff2"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-arch/brotli"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		# needed, causes QA warnings otherwise
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 4df4ef22c972..0351b404c18d 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,10 +1,8 @@
-DIST zimg-2.5.1.tar.gz 213083 BLAKE2B d0ea74d409fa19b6e9ed946c70d2c41d0ee35e38955b8c14eba9c9f769405db97fc4884043ab378c2e4c36540fae524ce97173ecd2e30f6ecde12bc579327a88 SHA512 c16402ee7aff40b811cd8c69c1e5d5f13775e628f3d5300e82548b6cc97d17e5317fa58d498a0cb4f7699d4eb2d1f424c3f4d9858f4cfbdda36612d6693961a0
 DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fcda5d9bf491fcebe7e8be538041cc536e40bc110e438370c8599ce0be35f71cea00429b16c6eeb680cb86 SHA512 7fc48c704b434d837c36d4bafc51b35789eaf90fc81a68dcd7ec546f1e82a3e41c53263f8d381541d5c0ce58e25dddf0adaf1c3575512842ae633b5581778938
-DIST zimg-2.6.3.tar.gz 238372 BLAKE2B 4651381c61b978bedd78871117fbe0b1be7e40e3b0d32b399ab47cab06d596befb61078a6f979f2a2ea962ba66046f776e18a2bbf304dee4a2428b303a3094a7 SHA512 497d3b5b0c004fe720c9be2460f251196789ed055a0081b774c78f8c311dc097c2b5d975cb0a7d41e819ca21527e961186b665b5791032787c3b30647011e7da
 DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a619fd0ac412b1e441fe2d8892f64826666fbdfa48ae441fa5a21512b5ba0977eeaca7dcb7e0fcc43447f6e4 SHA512 adbb525b2611ef5267a4c0d4e8c6dd164c2814241c4d58d5356545b23dcf0cbeabb140141ae6ff0e70ef8e0741e351cbfadbadd60923061ddd693a2c3d9e5fde
-EBUILD zimg-2.5.1.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
+DIST zimg-2.7.5.tar.gz 246416 BLAKE2B a0ce1497356238aee5d3965a7ec57f1591d51c5df2475fb05d208a07f1431f073f8caaac110775fb17c6df8f887ed974b53f262e01f5532de13dc4c539958c1b SHA512 600139f86b074f2ed9614daa58d969465fa3d1578d8165bd2f841193f7b793c4b36389064dd4eee8e01e66a745d1c71c62e5bdb0b5283e54c435ed4a130a5b3b
 EBUILD zimg-2.5.ebuild 823 BLAKE2B 1b5643d3bb640c804cf63b3a8242a4af066265ccc909e10181b87a02b32f5a1c112e672fb95f339c05ef33811311f7bdfc4f84b5cc61ac8ffd642559da083edf SHA512 cca5c262169ef0ccff3a739a346f0f17f48b24aefb56aecf3102a2851ab256d8a2f4fe3645bf6f45d6f3dc05cb0b0f85c10465f5ef8c3e298c6663911a254325
-EBUILD zimg-2.6.3.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 EBUILD zimg-2.7.4.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
-EBUILD zimg-9999.ebuild 831 BLAKE2B 0abe9fd5f08a84b02a1cda0247532b13f0ba27ce0ed566995c1e3257c6f64e0e0fbf972aa4f3a7421817772089a4e46612e3fbe10ca2eca30376394f3284405e SHA512 c0bb801fbae480836447c87e888c2c96f834d39e24c815fb52bb4e681ddf1b73ebf9b5f69e63382de7327d26b64ba874783607dcb5874bf2efbd86e3b7a7e7a9
+EBUILD zimg-2.7.5.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
+EBUILD zimg-9999.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-2.6.3.ebuild b/media-libs/zimg/zimg-2.6.3.ebuild
deleted file mode 100644
index fe1991fc9e05..000000000000
--- a/media-libs/zimg/zimg-2.6.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
-fi
-
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="Scaling, colorspace conversion, and dithering library"
-HOMEPAGE="https://github.com/sekrit-twc/zimg"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-
-LICENSE="WTFPL-2"
-SLOT="0"
-IUSE="static-libs cpu_flags_x86_sse"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	autotools-multilib_src_configure \
-		$(use_enable cpu_flags_x86_sse x86simd)
-}
diff --git a/media-libs/zimg/zimg-2.5.1.ebuild b/media-libs/zimg/zimg-2.7.5.ebuild
index fe1991fc9e05..fe1991fc9e05 100644
--- a/media-libs/zimg/zimg-2.5.1.ebuild
+++ b/media-libs/zimg/zimg-2.7.5.ebuild
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
index efc3a2b24237..fe1991fc9e05 100644
--- a/media-libs/zimg/zimg-9999.ebuild
+++ b/media-libs/zimg/zimg-9999.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
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 19:06:58 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 19:06:58 +0100
commit	f3b17e517082e3c6581428440a122f1a2679e278 (patch)
tree	874b962f0cd31907c24532d3159a5622db355700 /media-libs
parent	511de054920d6e2f43eb973d13aee9b4e3e9a926 (diff)