gentoo resync : 19.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-19 14:14:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-19 14:14:48 +0100
commit: 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch)
tree: 8f255dfacbacb657e3ac3654d01c1e11e651c066 /media-libs
parent: 8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff)
54 files changed, 351 insertions, 909 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 304dcb540014..4277181baeef 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/bio2jack/Manifest b/media-libs/bio2jack/Manifest
index bd710a5f4cec..7db2551353a7 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 1120 BLAKE2B bda00fb4113303e035b0f42d9403f45eae4645822f4a7259b6c9562ccba250838b4764156f36dcf985d62bafd0ac3e18fb5f58604d2f46535cede0246f91cbf5 SHA512 869f9d8a13be1128bcbb79e7457a947f7a938bce55c58922d1272b32cd59278425c04f40f3e8974ae5c2aa27fd5accd78fea79be822aa33dda24c0929f435e48
+EBUILD bio2jack-0.9-r2.ebuild 1119 BLAKE2B 96f929982db123d15546c8b03ccb683a1c515a1233f89da9f98b7404e76fc33dbf86167408b8de22c68e8046ea16c9df2c49666f367cbbc73c0b3b83f7232481 SHA512 7096cdd764eebac626864880c147199cd64a24a32a1de9085e448b8bd265c54c7e0bad161f9010f7fcac0df28e95053c42ec4c58e03ce7b8d5e710c86b99bc6e
 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 fd38ec0396da..ec1824b9d5cc 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/elementary/Manifest b/media-libs/elementary/Manifest
index 0711c326b093..7688877f0dcb 100644
--- a/media-libs/elementary/Manifest
+++ b/media-libs/elementary/Manifest
@@ -1,4 +1,4 @@
 DIST elementary-1.17.0.tar.xz 18491592 BLAKE2B 3b2acddec0825ee1be29cc3fdb06b478beafb03aa064137ec39d12dc4021fd61ead72aacd79bf7f7e3d82d171ce981d850c353d330a72498845aa18cf11a96d8 SHA512 60862e164770a93c0b864f35b5880f8d28f9fec520b7b440935143a14ffc9cd2dacbb650463c2abb7ce364c631509e1ddefce6eb49def1b016a752416d619065
 EBUILD elementary-1.17.0.ebuild 1474 BLAKE2B 01e5a5465870dc8feafde65eb86b96dcfb68d94887dbfabda2cdb1cb584f17e986ebc211acec413665af383f9c429d77338687206b55656dbf0628148cda3828 SHA512 f810d4aa5cfb2f06537428d304894a293480d04db2dd3bd9623b464b3b3bd2435f1f89eca11ac788eee42532a7cb931037ae04bfe5de51adab44563373e87be0
 EBUILD elementary-9999.ebuild 1336 BLAKE2B dfcf7337c3016f83a46a8b54bfe11579f6977857e17fbfe48f4e6441ed64e9184ea06664e57b4cfd100544d63aa81c2438aefdf7b475c05e5ce5ca48e6e7a2ea SHA512 edd8a97306030b6642db960c8e5ee0d33e06823de14f68dd5ad59d26ea9ffada516d1eeed548954ac11f0103db2792639b3238f1a42b19fcda0b8b295981d7fa
-MISC metadata.xml 968 BLAKE2B fa0d541645a6dcd64a62a9d935b711c3faf22462a6b880c18594ab043e84a5b2a774a181f63720cd5d47459a30f17982ca73b2c7bd7f5db94134f019e4fc8d81 SHA512 5c99e4247ecb26577b0ec7109c3edd30d400dc3cd885b0550686fb2f58fb810b69ae2429d6f7e653cd093da214073946c570ad7864dcfdc6e271cdba297d1afe
+MISC metadata.xml 876 BLAKE2B a9440a042503d015814658044343e1c628b32f6166fbb2b36ffa134e8503e6ce3d4a8e4507bddb367f576676a0e852987a9b82fa61c5b731fd1de0f8f68f8061 SHA512 4200a005ffd727307fff456584c7e3b3c5181693b4399dc4a40fce93b0745580f1755ba9c0afa5ed90e00bdf8fc06714d1d20f217257c8a5c571526a623d0a24
diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
index e535c6d44279..22cc8cf372a3 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/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="project">
-	<email>enlightenment@gentoo.org</email>
-	<name>Project Enlightenment</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="quicklaunch">Enable quick-launch support</flag>
 </use>
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 0265f585f002..f82214e62dcc 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -5,5 +5,5 @@ DIST exempi-2.4.2.tar.gz 3911796 BLAKE2B 73fc84dfff84b608e1408678af06b017617c3be
 DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
 EBUILD exempi-2.2.1.ebuild 1067 BLAKE2B 0c3a3a919e27ed78ef0cd4c9912dd48aff0ed0b378214fe11b6abd25a67ec4ced85b0fc8191c2df91981535199ae7ac65e1a823b9b1a3aac0dbd6588dc758e6f SHA512 4671cc734e821f6fddea6a84c7b67f3dd58549be5d76acf8f99c44aaafda9cfcdf1ffca73262c8b67f355431f58a5fe3ebe37566c64ac58d154442305c35c8fa
 EBUILD exempi-2.4.2.ebuild 1168 BLAKE2B 20951be88c2e85f5ffc13bf7b36ab63d7130d84e8213c93c413f83e415f194c2c4477ccd8e228a706461499f549a0e00bf77f1b69a4bbbc645dbb441b8dacc66 SHA512 45e1f895a0cb7054f08f4d426d47c1be81e8d2367f3aceb2c2ca9cb3becc52742c314ded6e1da97fdc0af69b5e49404285b236235de340bafbfde0f8c0b26072
-EBUILD exempi-2.4.5.ebuild 1174 BLAKE2B 62ab3cbeb11f312efa774f3e4890bf0ea9d0a91f1a5f87dd8d76cae3318d24270820bf0e2353923f7828fbec9c80dd8af77efd84f009ef0dd3ec342108367a01 SHA512 5f0362322858834f6841c74ac5c48f80e79fa30702ede121a98a9eb3e69d32cb24f826f73de34214a0333118361b84bb1c2e0cd6c651f8e7b688cc2817839f6e
+EBUILD exempi-2.4.5.ebuild 1173 BLAKE2B df97f272d97bc02dd66aab88d9f8d1bdadfdfaa8e180b783530b78cdc59dc6eb78ede0957e831212a155a4dedd47349f5163ff8c1555129da46fabeb8feadda0 SHA512 d60f39627ef818780fb5e3a1d3633727a0be39afe8b872c97d6d51e882e3a16420663100f7b21dbe87bb602ed1bacd3cd18efe1747f47d6f83552b8b5eeba28a
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/media-libs/exempi/exempi-2.4.5.ebuild b/media-libs/exempi/exempi-2.4.5.ebuild
index 9c0622f5fe64..95c6013e696d 100644
--- a/media-libs/exempi/exempi-2.4.5.ebuild
+++ b/media-libs/exempi/exempi-2.4.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="examples static-libs test"
 
 RDEPEND="
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 28f5fe87a587..c5423c9799c7 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -5,6 +5,7 @@ DIST Image-ExifTool-10.89.tar.gz 4381960 BLAKE2B f64d2508b3ba8b428395e6033149488
 DIST Image-ExifTool-10.90.tar.gz 4382245 BLAKE2B 94b699cf7bf793dd92ee95eb28b0296ed985370fef8be3ce4d5007d14a3aa641f38ddea4ade6369a7486c283b5f048de92f6b49ae8a5b67e32fe2dd3fa55dc0d SHA512 4b0eeb1a92dfa19414a8fe52b0741ee5efe09ca31a69ce8e542e2a5866bef01001d98e3577557906db43a2a51cb0b497edf4ad9ac7e93732d9f4d2ab00a37a9b
 DIST Image-ExifTool-10.91.tar.gz 4383944 BLAKE2B a29f8b5ca16f172d3632fbcd49207f9cb05cf8ac26e61bff4f4512f66f7bf7ad906f3efb14f517997951fb3e9fb0b062bcbbe5d1f125d96043f83c10c564f25e SHA512 03720caa018faf4bf1a3e73abc37eba9116fe5faafd1f79641a24dd18dfc535e9d4b1d12f6a8f6b5b1adae1bb753e51df7aca1ac2b4fa00831448ef1b4b9bdf6
 DIST Image-ExifTool-10.92.tar.gz 4384854 BLAKE2B 26410f70d61363708d0fea8df34990c1f81ffea72daacdecf12ed01b491b6a0311d3809cb8cbe29cc707833aae9d2e51c20f2dfd7b281221177db2579f674a8a SHA512 093c41b7f74c74fbd7b82333f67ee0994563631d25003c662dc6ff938464902ced5a50d98606158a060bbe9ee719767f6bb1ccea619ec14abcbbb03e344ac5dc
+DIST Image-ExifTool-10.93.tar.gz 4386567 BLAKE2B 1ce53e13b58deca4e898ffe069aebadddc2508589f878c12db9abaeefe426cdebd976801fb452819f7d33aefa50d7c55d74a5ef1ff76e3c6710efb5efde0f38a SHA512 047cd3bcd6c67736b85cec3edaccb6d7156dd2e63a86fe918a0e1e0b319f2cda8edc87fb356639a0a43fe4d37fb6ad9dcc91f1f00cb76ba6ac535297678eac39
 EBUILD exiftool-10.79.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
 EBUILD exiftool-10.87.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 EBUILD exiftool-10.88.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
@@ -12,4 +13,5 @@ EBUILD exiftool-10.89.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594af
 EBUILD exiftool-10.90.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 EBUILD exiftool-10.91.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 EBUILD exiftool-10.92.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
+EBUILD exiftool-10.93.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-10.93.ebuild b/media-libs/exiftool/exiftool-10.93.ebuild
new file mode 100644
index 000000000000..ec856d3619aa
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.93.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+}
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index bc9d6a644e2b..4a0972903f26 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -9,6 +9,6 @@ DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f78
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
 EBUILD fontconfig-2.12.6.ebuild 4995 BLAKE2B d7843faaa1b48b4db2138ec08fe53f797d3ba02c05b4eb1c6b91cf261edee105e94ea9bc200f5b08f9b08fced53d9bef93719ed529f7aff53fe7c4e589211190 SHA512 a15943efca6a4a88cae289702f6bc29c8fc603473c3a7565f8bbab64260d5c041918f2f1a70ee531f312d2900278da33b7b1ad4f5c0a7bd5347877e2ca342961
-EBUILD fontconfig-2.13.0-r3.ebuild 5000 BLAKE2B 9a5a37aca4c15007b12bb99986215ed5e6dae84d24ae39d835c4a6006998c7c2bdaae223e1fb93dd6c9ad4dd31ea62ce2d1c6f79b3e2580e15d6ffc1409c9172 SHA512 709847945001589047b828bd4fd9c02045fdd6615e3d58b4a59a8c7b4280de01974bd71ae6c0101786eefc6f9efbf5bd7fb2e970cbc6379731ec68cf324d61f0
+EBUILD fontconfig-2.13.0-r4.ebuild 5050 BLAKE2B a301c45c95b780453352e843a7a9dd81f634473eccde16a3b82480e76957ffbc5afbe98f22f756bf6f25e2558121e0f5cb42e920728a96f617230aa054c23791 SHA512 9045b0730d60e1c628f7a08a373b93416a0c4275155e31a541c7d0bdaf9aee718b9fabbd2649f7c89d63cf4532075c324a4214802eca7eeaaad144cfa4b19f0e
 EBUILD fontconfig-2.13.0.ebuild 4886 BLAKE2B 53afd9c7099bbca51d0b247b7af20ef985c373fe3a4217a58b22b1c27a26e111d171e2907759fb4f7101e319370cea32ab4ee24ed0c99851ed6a1089fffa7331 SHA512 8cddd384732d2115c4476f2d40fd6de6bc4616120fd484adb78e7d77aaaa9927e63b3cbac5e9364bc33870137a11e7c5e1f3ecb4b095903504d3db8757de8fe9
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 1e73daa19290..c281f610ac28 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -7,19 +7,20 @@ inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="https://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
+SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=media-libs/freetype-2.8.1[${MULTILIB_USEDEP}]
-	sys-apps/util-linux[${MULTILIB_USEDEP}]"
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( =app-text/docbook-sgml-dtd-3.1*
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index e1844aeb6a86..98dbeb302e51 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -8,5 +8,5 @@ EBUILD gexiv2-0.10.3-r1.ebuild 1309 BLAKE2B e84c8556178cc05c47eebd511139abd9d1d2
 EBUILD gexiv2-0.10.3.ebuild 1270 BLAKE2B dc6f81c5599f6bbf9f51a632c37e141227527b20b1d0274911242b40867c65329e9ca4d513589e08dbdf596b5efce125784c408db2ea0fac1cc138b59284f3a5 SHA512 85dfd941c7ef4413ab277489e2e05eb9d5b55aba4a61fa56546200517fe7a4bf3e4f3ed66e9475d8137e9bcbef95c318b4e77044b201ab9f6504c25479162e18
 EBUILD gexiv2-0.10.5-r1.ebuild 1395 BLAKE2B 0cdfba0d2a67f586aac986c5aabbe66375868004c476ab700053e94f2cda1602974501645d360e0755168a3dc3a14a9b66aeac32dec343721e20a6fb33bd5200 SHA512 d4eaf6dad6c7ae160c0cff8b10a8c34dca7f88538ce70671e7cbd936b81a5139acf30703f515ca47280f00b8cecfd920866f57992c4ae7af2edd35697a80ede6
 EBUILD gexiv2-0.10.6.ebuild 1333 BLAKE2B cd2474b63ecbab4fc5ca47e836e3afbd82d85023cb0d3744967b269f05a4316c39cf59dd6774989d7532ee67cc6a0a7eecac2be55a4c9e8e0351796289670118 SHA512 377878817bf52c642b012af0f15433866eebb0c06974b26c23faa1865ea26beb7ac647181b1a6e4b98fefe0a5ed1efa9acd879bb9e90d46641d05681c636ca6f
-EBUILD gexiv2-0.10.8.ebuild 1513 BLAKE2B c6a58b1c2f872560225cd2e6d54197d989241fe5a2bb0a8aca4f4eb14bd1e502ca8e905638647ef109efa83e1efe1bd781a721a087fab3070c91629a012ddae5 SHA512 bf33e64801d7a7af48475d6595d7ac7a16a781132a8ee756f958a64a9f968cc0aa27d444de1dc6494f4eadc7029c7111456fc3b070b1695fef8eb6c8a1249dcc
+EBUILD gexiv2-0.10.8.ebuild 1512 BLAKE2B c80236a31cb8e78dfc4e939b38e522086f5721105912966bd7d3af3ed0050a3a4f8c709268350bde41549d425befcf0c0b687b8b253d5868d6daa7f8d3752f56 SHA512 d8ebbde07890772946f28fa38e1fdb0c7436566dcd30f558e209ce759bc9549794d024e486d4add19dce0321ba0903174231d6bbdb1cb2619cfb43a8c47294df
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index 311e9d0dfdfb..dca051d1b597 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="introspection python static-libs test vala"
 
 REQUIRED_USE="
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 3ea15e348635..d0cceb8f5f19 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -3,4 +3,4 @@ DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538a
 EBUILD imlib2-1.4.10.ebuild 2087 BLAKE2B 4be5f44f59fbe143b3edbdd90c9cafff323f78add0e2e9909e08a5e27d5d6de9adea2266dbfa1d80a3481ee36b217a0bdf6974fa515589fb59f417df8b2ab36f SHA512 a1e9ec3050489cdede172c5f0bb213663f17f6ab9f06c24592d282568f5eacd9f591c353aabdcad97ed214cd752f0a802db1d2f94256bad5a4c4f13734325efd
 EBUILD imlib2-1.4.9.ebuild 2070 BLAKE2B abc5e363da21bad5b8f2e10ce45a0d03ae3e439b40b454a5f56463ac052d1ae272f28fc1418c1bdfcb7180f7a4117a4b772a094e094e8faa9ec84adf2b8835c3 SHA512 76e64aed5acea1542e8ab67b5d69101fc6f3fe64d5ecabe38c4528c545fa435a4e3188304a84c9b8ef6810e8b65bd297ef6f6b0432a9333485efb9b9d006cee8
 EBUILD imlib2-9999.ebuild 1902 BLAKE2B 6dc263963a9d811487849c4d210db0ee8548d425d382254310da3af807f72b69822f6e62023ddd1853c2b42f05d9d7bca3a8ded648c3657fe70af0e754923000 SHA512 cf07610f0fc4b9ffaa4a75fdab9af7f84d1a9de58f73f68a00a723291eab15c612b2b4b4e2e641a6b590873d9f95eb9506b89e8cf84fa1a826aa291c683d6bb6
-MISC metadata.xml 2370 BLAKE2B 610943e00f625a9bc677723009bf9a82af74e864cac1c338d37d8c0e3533117daa1ec116f56c4fde501454caa615e22ac99ddda4ff6861a1d1a983733578f77e SHA512 46a9a97c857ab3cc3d0a66dd8005fc53f8ab9d7f17c6de1ade28008477fe8b9e7081c4703e424399cda001cb145fd10e5cf6161ea82eb577f08a53b678811d05
+MISC metadata.xml 2278 BLAKE2B 7461b5d38509f5908d239712947f2f9d3ba91d5dcac79cb82f78ba74c0f8b51b54740cf734b0cf70acaf450f22b8c926ef5661631ac99269f3037d00ace553f8 SHA512 c9ac86bfc0e1cc55096dfb4f99321fa5c5efec65c7beb6d14955b7359ec362f8f41b15adf5e511ed88c1080bd568b59bad2c258fa98d6b89ba5a9dcbcf5b6c67
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index ee8c339dab07..b1209376c6fe 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/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="project">
-	<email>enlightenment@gentoo.org</email>
-	<name>Project Enlightenment</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 Imlib 2 is the successor to Imlib. It is not just a newer version - it is a 
 completely new library. Imlib2 can be installed alongside Imlib 1.x without any 
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 211e58952a84..fde72d23b489 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -5,7 +5,7 @@ DIST kvazaar-1.0.0.tar.gz 473495 BLAKE2B 7460dda4b791bd1d2a046350e8d88ce0ba3ef30
 DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 EBUILD kvazaar-1.0.0.ebuild 1452 BLAKE2B 35fad1c8f4de6d0d2501884ac9f4fbf82b803f2ce0a147f852366236e8fc9dd66edb9ba2877f278661940dcc8808c117e52340a119f437b768870ebcfc628adf SHA512 ab038716fe616b6ab9297b5629762c0800940876ec9ce338a59b8b61a2b8e5a4c350c8bd9e6bbf2e586fc5f5a2acb2c8798befc2e72556e25b1e2360304216d1
-EBUILD kvazaar-1.1.0.ebuild 1513 BLAKE2B 0aec0009f16e83992c602917b82ae12f1d963f8f699f78db03646aa9a95f434d69caf438086e549540bf3c744d19fed920451c8b83cddea9a14a0e1a192318a2 SHA512 1daa21219b874a74f5476c8649ea48c8cd7447df3abe99b0004108f5ff99be86c765eb857a04553bbae3d06cb34dfa0d291089e09bf957dc8ddfb8544cbbec63
+EBUILD kvazaar-1.1.0.ebuild 1512 BLAKE2B 4f8f062035d7fb2fb5ecaafa6e76cfc7fae234cabd9cb572db8cb13c7fa505d6b46b8899656d35574af17f15e81bcf051f8d18e1be0faa12b1891209592e3ba5 SHA512 0f973ad261941f971e12a93dff71f9af57083657dbe666245cd11a004041f889d829e6a6af9a83b6ac176e7a285dfcd29fd41eb09eca6d6e2c0de6426ec2420e
 EBUILD kvazaar-1.2.0.ebuild 1582 BLAKE2B ea2ffc2aa7e1638e5131af9b908dfb52c6fd8fbcef50cfcb3383e8f94097f17c082c44989ed6a2d4a1c1d78f9ae4ad735709d8856f06c835295ab2944ed272ac SHA512 02132db61e2af2e095f4a0f77558518fecaf4e4da910f7ddc5de2a2195f4d0270bfa7019b1912be0f7982c2cb61b06ef9b07d72ab2a106f738927a447a4ff459
 EBUILD kvazaar-9999.ebuild 1575 BLAKE2B 94a121eda6db1010030dfd331eaae047fdc068f0e5fbbd387b54ac506f915b83ddb9f896843ef46b68e6305754e0334b744c5784886e778e8d15aeaa1b08e191 SHA512 4b67098e1a756008a83c645972392b0ea8cf102274b5f95fcc083ed6f11818d0ad1b5fe2401d9240a253c9bffd2679b16b142b3c32f459f79f7f64e8c55258f5
 MISC metadata.xml 314 BLAKE2B 59244096c1566e9c0ea7eb52c8eb8eb63cc188febd8c1fba49006c31185669340c7f8d83e9b5d745dde96b43abefdb117c2c7d3b3c9177174aaf796b5f4ab9fb SHA512 3cf0527dc69a26ad9b7f33b2d5df536712fb19df9bac7cc0f067eac31d2b420ddf22dd744d643bf053caf27615f133478c1fd0d601e553546e73a0bd5e5897f2
diff --git a/media-libs/kvazaar/kvazaar-1.1.0.ebuild b/media-libs/kvazaar/kvazaar-1.1.0.ebuild
index f03f828d47fa..88a19051ba67 100644
--- a/media-libs/kvazaar/kvazaar-1.1.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.1.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 07d86468343d..1853fd7a1738 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,7 +1,6 @@
-AUX liblastfm-1.1.0_pre20150206-cmake.patch 2863 BLAKE2B a3bfd133819615ac059e11072ef6761074a2c9bae35caac25ec7c99c6e91ca0a13ddd6aa44302033a30d9f7328da1587e667ca02941b86e24fe50eb44279ddc5 SHA512 e8bd568d9b48f67f491db88099cb2f84410196cb4bfb3b31c1ca8c6c8e14f49727edbd3d6e80f25cb5603aeab79f57d334cf9266447a8abf9bb18f74a5d70983
-AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 6169 BLAKE2B 101077c99e91bc3f1b2024788adaed119d903012fe2263886d19105ff14b86120459ef7c0a795fe320373ebc19dff63cb6993d6655bb19ef5c432cf601e1c267 SHA512 e0b477fe8e059861a11791d98a315af1d9e2e84328913b1db84573c712db815efb82b0d68edfb7ec18934c864b5a51196365531d3ae0cf70a501ac72315dd6ee
+AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 9192 BLAKE2B 0c4e96448692869202514ad54e0c1b371e839c9f9c4ea6ff9b085fc28f29d9f65912cd501d0c83b442242e292f868eb1d79eea6e36d20ef967cab9fb681b6b2b SHA512 f88acaed5b7a53e7e4ab47100a769a88c9579f373b7d6d305b8fd9ccd3cc749a5d5ec544e0d8f30734d940016bb8ce23e49ffc4347afd87601ad013a7111bacb
 DIST liblastfm-1.0.9.tar.gz 119320 BLAKE2B 4c661b703af1e94b42d2bddffd994e0d33360979e47e0079f3824a9febcdba22c3ccedd8599da5c1d4b701a329cb4779bd680181837152cb1d23a231ec6eee73 SHA512 9d2bcf71b26d8a95920a07649c97b3faa071c49a8269268bb08fab01537392774873233d03cada09d3ce3fe2c45b0affdb74cd27c41f69342b973896effe1018
 DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166
 EBUILD liblastfm-1.0.9-r1.ebuild 1713 BLAKE2B 6f97bd3c43a5435b3b5e793966e71a8f23406589b9457b5d1715e6c6d364e9212616b4b1e74619b3f901b0b0f64d6105d9bff897b8586bac5c5693392a704614 SHA512 08262b6e37da21b66d869504c671cb46d4402a204a705571adac67bcc70b9bafad389905c8ec339196927580c0de3994113bc73ac6c41d365c4a1d1bc4a3de5b
-EBUILD liblastfm-1.1.0_pre20150206.ebuild 1100 BLAKE2B 98936bbc8dd4d9cddb3537c5d326cf36a511bf100ecb323db3ea7fe089c4775e1e511f4fc20c4c016f9f8a34e36582b5c0d16fafacedfec29f346550b319cc76 SHA512 cc1861f792777edbec11c57e8df39eb56c2594cbb5f764954ff74f8fc8749b34c2ce4a5932e570e7f01aa145e44c6e20069e968043b15ab9230ef6b9f12facc6
+EBUILD liblastfm-1.1.0_pre20150206.ebuild 1067 BLAKE2B 3a511140f786137ff95137efc75e2715978d67e5aae850f6949fd58f950dedfe150e873383c73ea17c146de2e216a97701e509b07bc4debc8f5141431010c25a SHA512 ea439b4e081b9089c856cd85cde0fb16e0e6dacff23f4a9aa35fdc17f10f3a69dc4291e88516cd0acbd1c91b5e67867b20ea6aa05023ef26356efb6638e414a6
 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6
diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch
deleted file mode 100644
index a42baf0ca30e..000000000000
--- a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 8703c12d7a177627fab4a2f67018d01cc7bf0808 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 11:51:42 +0200
-Subject: [PATCH 1/3] Make Qt5 build default and simplify logic, add missing
- deps
-
----
- CMakeLists.txt | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be88967..a8c81dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,16 +27,12 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module
- # setup qt stuff
- set(CMAKE_AUTOMOC ON)
- 
--option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF)
-+option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF)
- 
--if( NOT BUILD_WITH_QT4 )
--    # try Qt5 first, and prefer that if found
--    find_package(Qt5Core QUIET)
--endif()
-+if(NOT BUILD_WITH_QT4)
-+    find_package(Qt5 CONFIG REQUIRED Core Network Sql Xml)
- 
--if(Qt5Core_DIR)
-     set(LASTFM_LIB_VERSION_SUFFIX 5)
--    message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
-     include_directories(${Qt5Core_INCLUDE_DIRS})
-     if(UNIX AND NOT APPLE)
-         find_package(Qt5DBus REQUIRED)
--- 
-2.16.3
-
-
-From 22f6900552839bc90c0fc68b62707d42544eaccf Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 11:56:48 +0200
-Subject: [PATCH 2/3] Make use of FeatureSummary
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a8c81dd..d5fd5b1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON)
- 
- # installation dirs
- include(GNUInstallDirs)
-+include(FeatureSummary)
- 
- #cmake module path
- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
-@@ -93,3 +94,5 @@ if(BUILD_TESTS)
-     enable_testing()
-     add_subdirectory(tests)
- endif()
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.16.3
-
-
-From bf3ee28f1aa5de7a3f3f5a3077adc97804e27b0e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 12:06:48 +0200
-Subject: [PATCH 3/3] Cleanup include dirs
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d5fd5b1..ef7fdd5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,10 +34,10 @@ if(NOT BUILD_WITH_QT4)
-     find_package(Qt5 CONFIG REQUIRED Core Network Sql Xml)
- 
-     set(LASTFM_LIB_VERSION_SUFFIX 5)
--    include_directories(${Qt5Core_INCLUDE_DIRS})
-     if(UNIX AND NOT APPLE)
-         find_package(Qt5DBus REQUIRED)
-     endif()
-+    include_directories(Qt5::Core Qt5::Network Qt5::Xml)
- 
- #     macro(qt_wrap_ui)
- #         qt5_wrap_ui(${ARGN})
--- 
-2.16.3
-
diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
index dfbd694ed3d5..fc0e9b8938dd 100644
--- a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
+++ b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
@@ -1,7 +1,113 @@
-From 5d6ef4c27804a43b26dffcb46d6b27523a1ca340 Mon Sep 17 00:00:00 2001
+From 62a08d490a1e75e3ef5d08f3fb37e65c1563e706 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 11:51:42 +0200
+Subject: [PATCH 1/4] Make Qt5 build default and simplify logic, add missing
+ deps
+
+---
+ CMakeLists.txt | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be88967..e628611 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,19 +27,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module
+ # setup qt stuff
+ set(CMAKE_AUTOMOC ON)
+ 
+-option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF)
++option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF)
+ 
+-if( NOT BUILD_WITH_QT4 )
+-    # try Qt5 first, and prefer that if found
+-    find_package(Qt5Core QUIET)
+-endif()
++if(NOT BUILD_WITH_QT4)
++    find_package(Qt5 REQUIRED COMPONENTS Core Network Xml CONFIG)
++
++    if(BUILD_FINGERPRINT)
++        find_package(Qt5Sql REQUIRED CONFIG)
++    endif()
+ 
+-if(Qt5Core_DIR)
+     set(LASTFM_LIB_VERSION_SUFFIX 5)
+-    message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
+     include_directories(${Qt5Core_INCLUDE_DIRS})
+     if(UNIX AND NOT APPLE)
+-        find_package(Qt5DBus REQUIRED)
++        find_package(Qt5DBus REQUIRED CONFIG)
+     endif()
+ 
+ #     macro(qt_wrap_ui)
+-- 
+2.17.0
+
+
+From ff32d56e5e1bd8b1f86a8e9840c778249ff19118 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 11:56:48 +0200
+Subject: [PATCH 2/4] Make use of FeatureSummary
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e628611..dcdfd91 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON)
+ 
+ # installation dirs
+ include(GNUInstallDirs)
++include(FeatureSummary)
+ 
+ #cmake module path
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
+@@ -97,3 +98,5 @@ if(BUILD_TESTS)
+     enable_testing()
+     add_subdirectory(tests)
+ endif()
++
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.17.0
+
+
+From 5762278b29c1ab6559dcca7a1e8fbad1d75134da Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 12:06:48 +0200
+Subject: [PATCH 3/4] Cleanup include dirs
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcdfd91..52589b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,10 +38,10 @@ if(NOT BUILD_WITH_QT4)
+     endif()
+ 
+     set(LASTFM_LIB_VERSION_SUFFIX 5)
+-    include_directories(${Qt5Core_INCLUDE_DIRS})
+     if(UNIX AND NOT APPLE)
+         find_package(Qt5DBus REQUIRED CONFIG)
+     endif()
++    include_directories(Qt5::Core Qt5::Network Qt5::Xml)
+ 
+ #     macro(qt_wrap_ui)
+ #         qt5_wrap_ui(${ARGN})
+-- 
+2.17.0
+
+
+From aeb0cbc56376021444a56a984613faacefedfea9 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 15 Apr 2018 21:31:14 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (drop qt5_use_modules)
+Subject: [PATCH 4/4] Fix build with Qt 5.11_beta3 (drop qt5_use_modules)
 
 ---
  CMakeLists.txt                 |  3 --
@@ -11,10 +117,10 @@ Subject: [PATCH] Fix build with Qt 5.11_beta3 (drop qt5_use_modules)
  4 files changed, 55 insertions(+), 47 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be88967..57da635 100644
+index 52589b5..c8bc89d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -56,9 +56,6 @@ if(Qt5Core_DIR)
+@@ -57,9 +57,6 @@ if(NOT BUILD_WITH_QT4)
  #     endmacro()
  else()
      find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED)
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
index 6e0926da1028..b20109621436 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -33,10 +33,7 @@ DEPEND="${RDEPEND}
 # 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-qt-5.11b3.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
 
 src_configure() {
 	# demos not working
diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index 7cb21b126487..bffa2fa083d1 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -1,6 +1,5 @@
+AUX libnjb-2.2.7-exclude-samples.patch 288 BLAKE2B 8d9646562a8b7a07460577a563ae576bc1793ba7fb330a5a141a076ecc443872759dfbd51c0425fa52fd1460d3a5347fd4f0b46c4a5bef9165bb6dbedacacb73 SHA512 218ad125a74545340bb3c1295e7bde74701ae656ebf0955d96d23f554dc1119d20e8ebe530d658883c799d0552144f094e1c825f2dc6daae529ea8d37114d7f6
 AUX libnjb.rules 1773 BLAKE2B 3fdc3a8ceaec9b065e5ea174738642311b57f4cf41f2759375160ef0cdd6044434427f82dae8dc4cad167bfd4578b51bb019a3e4924883f8a6f9efc06a7fe6be SHA512 21d9aa5b0d0c170c3f8071a81981590714f6bbf203d5b6f973aea6a2365f69cde5008969748a2136b9791db327fc476d33fe8937cc7c7d26168ac1803738419a
-DIST libnjb-2.2.6.tar.gz 504329 BLAKE2B 6e89b13dbb84fb71f2112ae1523c8b431222d6b4af85a2a7d318653a4a62beca2c5f48efb37475499e78f1d05ecfa5d18be26673f253f343b6886eda52b6e765 SHA512 c079abcf5d2c1fd56dfd6da6a7bf08d1f35e365b6186072f526980a49d8f72cf04c79381eda4fbada5ca467ae6c9e96c6e3a13b753937040530f6e6c61b012f2
 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06
-EBUILD libnjb-2.2.6.ebuild 894 BLAKE2B 950c060237f41fae0b58485d30dc2d96ad8181cfee2bf86d1534b9ba41e04262b957acaa94b06876a1aaf4e87bd549fdb817d3ed47acb0c2cfd10e0a3873d927 SHA512 b81453e5cfecbdbb6c3a7aa3e346b7edd7d699380c5b68b4e831d8d72a4c603e60641d4fbc34b3c781175e275fe9817e0d617bdb36036a27841e29a18fa58db3
-EBUILD libnjb-2.2.7.ebuild 914 BLAKE2B 22fe141972476cdde07f70e9994ca2629e2814afac5c7e8d17f52a24bb0bcb0de442b021df66361d322210b9fbbe3db717f2368e4f6e955cd13ad4fb6f42649a SHA512 f585a40c4c3ffdc872cb15882ce1ca34fd7b27aeee958da935e1f520ff0624a3e7a66207e11a601811c05d041947c8cf62c881b54d216a86d8ad2f4478b85058
+EBUILD libnjb-2.2.7.ebuild 850 BLAKE2B 0060fb046d3fdc28fa9788ca8f44ecae213e3e34fc4b95a26fc2a04f63b9bf2cadfe66a28a306f7b5581de62f55dd8f26af169812526b6cb23d4a21423d7bc0b SHA512 408a6de816e4e09aabdec27907a1df7c39734a10e97a6eb666c778606c49479f8ef4d3d8067ee7d411a4867782f68814e3caae287fdc9907077527c0a185aaa7
 MISC metadata.xml 329 BLAKE2B 113696bd928069036fefb90161fd3e1ce0ba24f9539b16ec7a7199893fe45aa05e5f69343f51c1f0fd90407977be6f698df03d982c3163a7290e60097a9cc2ee SHA512 c431cf889d0fb22891d12ed46abf92d356c162d5bb9b897519ba90faa9effdf44db671028ec8775d0e4ec09c3bdc89a58b2f27db55ff34e83a0cdd76b9bac5d7
diff --git a/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch
new file mode 100644
index 000000000000..f241338c2123
--- /dev/null
+++ b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -249,7 +249,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src sample doc
++SUBDIRS = src doc
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libnjb.pc
+ EXTRA_DIST = libnjb.pc \
diff --git a/media-libs/libnjb/libnjb-2.2.6.ebuild b/media-libs/libnjb/libnjb-2.2.6.ebuild
deleted file mode 100644
index 132f4be4850c..000000000000
--- a/media-libs/libnjb/libnjb-2.2.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit libtool multilib udev
-
-DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player"
-HOMEPAGE="http://libnjb.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="virtual/libusb:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \
-		Makefile.in || die
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog* FAQ HACKING README
-
-	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild b/media-libs/libnjb/libnjb-2.2.7.ebuild
index e1285c049c4b..48e23269a9ca 100644
--- a/media-libs/libnjb/libnjb-2.2.7.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7.ebuild
@@ -1,29 +1,27 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit libtool multilib udev
+EAPI=6
 
-DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player"
+inherit libtool udev
+
+DESCRIPTION="Library for communicating with the Creative Nomad JukeBox digital audio player"
 HOMEPAGE="http://libnjb.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-DOCS="AUTHORS ChangeLog* FAQ HACKING README"
+PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch )
 
 src_prepare() {
-	sed -i \
-		-e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \
-		Makefile.in || die
-
+	default
 	elibtoolize
 }
 
@@ -39,5 +37,6 @@ src_install() {
 
 	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index b59cbd36b4fc..4e5412f87917 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,21 +1,12 @@
 DIST libpng-1.2.57.tar.xz 656784 BLAKE2B c8538234f3aa6411629d15cf77d85846bae081f779b0a1dac92f863ae68f1fe5db84e56df44df1f782fe9f6cfa0f4fa3e418fd12472a73c6f3e7d013e0921f86 SHA512 51338d900690fc2d28ea1b5b364d311d73ce7ad498d000985e0c3926b5df0df97fcd7bb079fc954c6caa532fc6e6cbbc266e671d62fc67eca30e79a5f0e26f31
 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.27-apng.patch.gz 10343 BLAKE2B 243208017cb0186f380fda616853fd1462bcd08fc4a5ded544272eec6a86e60259d2e93849b6a419460375dee20e34b0a1cf69b91005a24ffb1caa5c9f576cf5 SHA512 0052f7cd76847094f64e3533be7510e8c5d673e927eced76a80480709897626eca2a12981540de533e74de49e7b00b128a4914d82b62bbcb3950bd1182bd409d
-DIST libpng-1.6.27.tar.xz 984316 BLAKE2B 29a01ff7bdc819037abaa519afcba607f82c4c0824c5a85d2192d1ed96f6a54b723f324fd951e729e9df2a6d0e35f6dcf92bde99e41382953d4a327e8112588b SHA512 9dcf54147fa2637a72364246e8565c0a6d25e4313f26150689b166eabd4358177e1caf38ff622b04c71f3b7cfd550f7fd6ca87892c50203a63b92f365fc7c8d7
 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.6.31-apng.patch.gz 10308 BLAKE2B a5392b9d362138e218964e4d5008a506092065e7222b4e008060df18324e61af11a3341f495a1c5398ed95a16a61fb2b4adec160b32a2dd1eb0339c281603651 SHA512 58d9893adf5b5e225c06fa9bb9f8d2e1deb8f9de7eeeeb79f63ac96bb70441b375f33524c0decc693cbb4c7753ea6ad10a0c2c2fa5fef6b3d524765df479fab2
-DIST libpng-1.6.31.tar.xz 991824 BLAKE2B d2c4acb7e61a14d2c8f2dfe85b4a22532d98da18c8494abb3da952700b8135b28d0cf28fab5a1e2567c46bfffc8a840011182d8bfc695c1c5e5bbae834494a5d SHA512 714da63e19d32eadeeb44edf7f2afeaf6ac59f2756e0951015313a98c0f3c1216296886301c5704958b56f4c96b00725791ba2efe9f26b4a92cd743410cc36a9
-DIST libpng-1.6.32-apng.patch.gz 10382 BLAKE2B 572f2f9e4fdff185de2c86781370bf880f48b7fc4cb31bafc32af2fb479602ea6580dff349baf75b753fd1b9532175121def7b3973746156a32058e1d16e37e1 SHA512 a7f5e8f18ca762c19c69a1ce2d6be2e6425e2d8935379554b5017049d1f3b2eca461120d15b5a9123998cd4a0b24b62b0b98e40ce6f2973d22449dd367757cdb
-DIST libpng-1.6.32.tar.xz 997136 BLAKE2B 5013e8740ac7b263de4bce4abb536def085de18aaa36561aba3af1adb2a54fb7cf39f291b2e92ad6dfc5bcae76436eb264c16b0997063a7ef319c03a7a5270e8 SHA512 24cf4d38dc08d1db7721fc580d8bf6cee9a105afcea32f1245b7bb3727c8a8645ad733a24534782ef5dfb0d4315a5fd6b0eee9e7f0704e0c635350f80c19a708
 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
 EBUILD libpng-1.2.57.ebuild 1003 BLAKE2B dc6e1f723471ced6448d0458213a9d88995efd397003de2952c4f393fa64a84990a61737b5abd81cdccea800e2efd1fa675dbe9020d1e1cb747f2db99b296b40 SHA512 3ef798d4f394e35d833a3b1ee66521186cfcaa00770141a64347e7592972f620a10321f9cfe32d8eff8e0c2b2c3c91b3b690e8ed51b5aa493410d2f253e1ca08
 EBUILD libpng-1.5.28.ebuild 1778 BLAKE2B 544221137ad9594e82f7204f09631804984015ad3db7c8eb7123bbdca95c80a55206b212e51a54521e699bf95c1bc08ec8e5704d73e58e691b0af9c8f96341cf SHA512 67fef4c1a3bd619de59515c6409b566ab8d595ef1b777bc48646fcff8acbb315719462961275b078d9a7bf70200e523b081dc2669c5338b0d7de26fb4596d190
-EBUILD libpng-1.6.27.ebuild 1384 BLAKE2B 4e061b59938050d4eb0cda041f5a80e9d152f0704bdc1b9f98c9728d3f5568c1babcf7698f9eabae3376789a47cf6a20bef617ca38d3909349f2f9848ded609f SHA512 eded8c75fc7f472e588837b498693883312bb45a9c591bf3578ebfbc082b3ee44d9b1ed31bfb10abe565f1a6353ba8d5ff540ae886e31685dd6e754d6d4afc11
 EBUILD libpng-1.6.29.ebuild 1460 BLAKE2B 56dfd9b28af80de44dc8806acc94cf9c880e32d4b5836c4ebb8a5e8852d63fcafdfd92b8170113d795993f6f66968a96f65ec8262b318137658275a6511a9e17 SHA512 acf6222a6f9d8d93a2921bb1d493b1668a3c9a0638dd3901cd0a5c33710e9172fe4d168fb1e61995255221731ef649187bd6758bf1a863226c4e57cec3df1f2e
-EBUILD libpng-1.6.31.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
-EBUILD libpng-1.6.32.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
-EBUILD libpng-1.6.34.ebuild 1509 BLAKE2B 49ab1b188b11188e6c9a6b3b51f35ba0b4a221c8bba69a2182a5bb2f42c76c14654041fe4edf42dde0cbc0e86f5544084859b079a40464a49c09d295a40c2947 SHA512 f55ca8f187c874361b0287b99cb4010386c023efe7ea1b63b304b88abef3b7931a89eda0234907d9f66ccefa777c79075048a41c509cd85a2783808d7348b4ed
+EBUILD libpng-1.6.34.ebuild 1508 BLAKE2B 2e61d65a438c7d61acb659852105a5800cde67e7e8e1495318d024e7e762ce0f0a0b08c714849304113a3b379a8953f1dbf7ea6c53381eed64b380730a1bb8d2 SHA512 d3efd2dc7e77101dfd73d6ff0f46eef35e472ebabcfbecefa4c6a9e6f90d9dd01fd8522da38aaa70b767d23edd1f95da5f420beae242ad4475e8a4069ff0b4c3
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.27.ebuild b/media-libs/libpng/libpng-1.6.27.ebuild
deleted file mode 100644
index 608fa8163258..000000000000
--- a/media-libs/libpng/libpng-1.6.27.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng"
-SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	default
-	if use apng; then
-		eapply -p0 "${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 \
-		$(use_enable static-libs static) \
-		--enable-arm-neon=$(usex neon)
-}
-
-multilib_src_install_all() {
-	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
-	einstalldocs
-	prune_libtool_files --all
-}
diff --git a/media-libs/libpng/libpng-1.6.31.ebuild b/media-libs/libpng/libpng-1.6.31.ebuild
deleted file mode 100644
index 056acfd714aa..000000000000
--- a/media-libs/libpng/libpng-1.6.31.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-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"
-IUSE="apng cpu_flags_x86_sse neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	default
-	if use apng; then
-		eapply -p0 "${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() {
-	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
-}
diff --git a/media-libs/libpng/libpng-1.6.32.ebuild b/media-libs/libpng/libpng-1.6.32.ebuild
deleted file mode 100644
index 056acfd714aa..000000000000
--- a/media-libs/libpng/libpng-1.6.32.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-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"
-IUSE="apng cpu_flags_x86_sse neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	default
-	if use apng; then
-		eapply -p0 "${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() {
-	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
-}
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 056acfd714aa..788fa4022637 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 8fbf79a2876a..f63fb3ecb360 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,5 +3,5 @@ AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd046
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r1.ebuild 1487 BLAKE2B a9f35c71711fc80ba92b021ca64a7553b46b58636b44b9593d99011bb91b4b4c691485376f9cd8ffbb4f5b8e077074306c64e63c87c566e0603a1ef75c40df64 SHA512 c193f1203dfc28da59eb4d953f172c5f47efaaa661d9d25401e83c9ef9c68c0a3740ee86bd533cbc71b19b0ddf2c62fc1cb02f1169e4c5d73e74de7d9e48df55
-EBUILD libprojectm-2.1.0-r2.ebuild 1494 BLAKE2B 2c913982cc5c95abfe2e9b22e427062c7a9a18efc59aef51aaefa788591a8041b1d61159969270b19c41aff49208d361efadeea63ba6fb0585f896baa2e80088 SHA512 6dbcc3d021e37da1cbab04e954e15a9cc17659c0d0420a97c13965755442aa37ad89782cf8893cd0a0abc337b4c5a1db0696a0d80393acba4789c02465a5b880
+EBUILD libprojectm-2.1.0-r2.ebuild 1493 BLAKE2B e1d3da5b90183388067b557915cbccc4bf0e09f2ef61be437c9f3b0d5cbe78e5fd962473c6d7f315051423b26f93d6aec920930b03eb9d97c9c00449692d0731 SHA512 266513fff6f8ee4ed0a7d6800a5c99b8c2bbd4dacbbd77c44e8855dd4a4d8f7885161dbd06efdbed0fe333ce4eb20bfec605426dc05097d9913f2f913ffeeb29
 MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 5e3dad0a3f40..9dc70f6ab3b3 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libsbsms/Manifest b/media-libs/libsbsms/Manifest
index 0e43b8281cc6..34cba4058645 100644
--- a/media-libs/libsbsms/Manifest
+++ b/media-libs/libsbsms/Manifest
@@ -1,10 +1,5 @@
-AUX libsbsms-2.0.0-cflags.patch 688 BLAKE2B b531941dfd8640aaab4a660380c9a8cf815bf3df269d1771ed5aa79ed8c7c2aca88a1f305ad07f8936a3b50394190273e09840f051b256e124e9eb7ea968bc82 SHA512 f968f88ea1f66fda6539a949266371adc8927305366ec8c4d9ae32a7c2d32d10edc762469b2c8bcd16a7c1d73598b0f90d5e01c7cf872065267ee8ac3aa6a139
-AUX libsbsms-2.0.1-includes.patch 342 BLAKE2B 1331ea645b561babeb1c3b57b91a9c217282c4a89ebbedb565de449ef0a0c6e11b3d600cfebf57be52f0e4c08d012bf048c174d489bf66504efd5e81fa82112c SHA512 ab8b944a7966a9b297b6d80aeb5dfaffad4fb28662d8041621d9d871aeae3e79fbfe44486c29bd10a6010ce853933db50355b300d7dfb6ccd1020fccf61fe746
 AUX libsbsms-2.0.2-cflags.patch 688 BLAKE2B f42728c599064927973f65a1eb3443cdf7a931f4f5d971a61d749ba4f0b990b34d8c47a2d52b08c5720202732e8409f006dae481b94634ba5b97a57f76bfdf40 SHA512 330a26e5b4b99f00546a2f625c4bae90f8a8645e855379e7de4f833a1c561c3c8e23f0faa954a989359f0de09a1310374ff93644d2f646bae3b9788293cfcd29
-DIST libsbsms-2.0.0.tar.gz 832881 BLAKE2B d059317b8e4fd577172c1b5f1b3d177bdb6c5ec1a24810bfa19c1cf973c0c6a5c5f8b06eb061c00490ebe233fadd7b2df56e94fccb972ac2dc976c1ee71cfe87 SHA512 c3047310c5e5080eb437f426ac679fda3cd18ccf06e287667701aa9ef50e47285df4cc29e5d1dd82e9bdd1e668bf33ee437d9bc8499ba1687b172ac904d80d92
-DIST libsbsms-2.0.1.tar.gz 741474 BLAKE2B cbc855a2e26ba2966bd4722463d4520fd0707a3f37be98f7c7a4460a543d237407f379fb315d1d5fcce7954271f74ec930fddc51fb92e631e30b4142bf2fbd6c SHA512 62d5b3bc58069d697f0cf9505f2da22555a1fa8c966191cdd369161d56266069ae47a41100103439dc58b7dd01bbc3b11279400a2d0c161b2b4b9c854199ae45
 DIST libsbsms-2.0.2.tar.gz 450170 BLAKE2B a9e75f1f2a3da2a407d21bd267fe842d2c2367f85e4cb588902ae34e56b76297c2f60968113ae7a08a6652e57bc20376f1a60e97d6d59863f9f1ae30589e0723 SHA512 8aaab3e191f3e10e559683ab4ebdcb8d951cf0e776390234f25675a98640d60d20aed872061ba72fdc3bd7827b7d46bc27225fe947cdd7fa4312f75cbdd78e6c
-EBUILD libsbsms-2.0.0.ebuild 705 BLAKE2B 79194768d922e9077655602ca0b75d57bed380d9f059b600006c406bf12c1087ee3a39cdd5cc0eaf1cea614c3b5b78c1f832b384ff9440893447a037996cbec5 SHA512 17ecc8575892f659b939b6e75d09337331187b0005921670df54c93015a90d9e55f77369f0ff8bf0530dc157361bfb13f7a332f206d48c9bc352fc0a9c75939f
-EBUILD libsbsms-2.0.1.ebuild 775 BLAKE2B ded99396f2db7858aefe362bc5f105ffb436c498bdd92bce6e2b2b16e80dffd3b95c6ebae86542f78df4cdf4aa16e6c79e9101a64fd1677d3c404fe40217c071 SHA512 52e7466ea91977aec9929299129fc909e324f1ff08c63ab058e4609ecdcdb60f761c658ce1420d58882f9ff15a9f84e07a406461139a86665ae8c62425c7734c
+EBUILD libsbsms-2.0.2-r1.ebuild 763 BLAKE2B 450b674ebd93e994b53b82f1ab2f19136b4cb2f4ca5a0d29c4ffdb08275ff304e3bb6d1f3d5e4f6a52040076d8c336aa9cb7fd350fd5ef0045d3874f386ac4fa SHA512 3c00bb75a643e6d916aaac2967570a192e315f2400c670727b8013f2fe76e35937b1014b1d485d6d45204284e484ed9def263841efb4086ef265c3d0a8ba79c0
 EBUILD libsbsms-2.0.2.ebuild 719 BLAKE2B 55acec37cbe5b91798d60adec0081c386fac9a75edfea35159619fc393205f613f14e72d6fd6bd978e96153d5ff30901da1245000ae9cb9d1318e49aa201b958 SHA512 ebfc7e0316c67e1fa2d9cd34a6c79386fa634879509731bde60ee08ae528f98fad4cef6ca19faf40545216cf4a364a698947a4fd1aeb7498db46e227d032dd8c
 MISC metadata.xml 334 BLAKE2B 27f96c580033502f5fae3be23efbde22dff9671695e36128f4e8aa1103d81383d718dd36225f1a966b0bf800a7566a89f735197aba72d4842f7162f3e7f06333 SHA512 0bdcb69cb01f3ee3734ee6374e72b0e2d6b413660067b0c63df773f61d13230d0e1b7af19ed5ffe8a31472a4f8e715c3da3b76bdb3e350cfbadab5dbb4d25a59
diff --git a/media-libs/libsbsms/files/libsbsms-2.0.0-cflags.patch b/media-libs/libsbsms/files/libsbsms-2.0.0-cflags.patch
deleted file mode 100644
index 63de676beb66..000000000000
--- a/media-libs/libsbsms/files/libsbsms-2.0.0-cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libsbsms-2.0.0/configure.in
-+++ libsbsms-2.0.0/configure.in
-@@ -69,8 +69,6 @@
- 
- AC_ARG_ENABLE(universal_binary,[  --enable-universal_binary enable universal binary build: (default: disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
- 
--SBSMS_CFLAGS="-ffast-math -funroll-loops"
--
- if test x$enable_static = xno; then
-   case "$target_os" in
-      darwin*)
-@@ -81,12 +79,6 @@
-    esac
- fi
- 
--if test x$enable_debug = xyes; then
--   SBSMS_CFLAGS="$SBSMS_CFLAGS -g -O3"
--else
--   SBSMS_CFLAGS="$SBSMS_CFLAGS -O3 -fomit-frame-pointer"
--fi
--
- if test x$enable_multithreaded = xyes; then
-     AC_DEFINE(MULTITHREADED,1,[Define to compile multithreaded sbsms])
- fi
diff --git a/media-libs/libsbsms/files/libsbsms-2.0.1-includes.patch b/media-libs/libsbsms/files/libsbsms-2.0.1-includes.patch
deleted file mode 100644
index 63937fa6157d..000000000000
--- a/media-libs/libsbsms/files/libsbsms-2.0.1-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN libsbsms-2.0.1.old/src/buffer.h libsbsms-2.0.1/src/buffer.h
---- libsbsms-2.0.1.old/src/buffer.h	2012-12-08 18:43:46.772667486 +0100
-+++ libsbsms-2.0.1/src/buffer.h	2012-12-08 18:44:04.677668212 +0100
-@@ -2,6 +2,7 @@
- #ifndef BUFFER_H
- #define BUFFER_H
- 
-+#include <stdlib.h>
- #include "sbsms.h"
- #include "grain.h"
- #include <list>
diff --git a/media-libs/libsbsms/libsbsms-2.0.1.ebuild b/media-libs/libsbsms/libsbsms-2.0.1.ebuild
deleted file mode 100644
index c4a25747efd2..000000000000
--- a/media-libs/libsbsms/libsbsms-2.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="A library for high quality time and pitch scale modification"
-HOMEPAGE="http://sbsms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="cpu_flags_x86_sse static-libs"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.0.0-cflags.patch \
-		"${FILESDIR}"/${PN}-2.0.1-includes.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--disable-multithreaded
-		# threaded version causes segfaults
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/libsbsms/libsbsms-2.0.0.ebuild b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
index d29fc3b908d3..4e77d0d1ecce 100644
--- a/media-libs/libsbsms/libsbsms-2.0.0.ebuild
+++ b/media-libs/libsbsms/libsbsms-2.0.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
+AUTOTOOLS_AUTORECONF=true
 inherit eutils autotools
 
 DESCRIPTION="A library for high quality time and pitch scale modification"
@@ -11,11 +12,13 @@ SRC_URI="mirror://sourceforge/sbsms/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse static-libs"
 
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
+	default
 	eautoreconf
 }
 
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index ab5f3917baab..73fae5a13f37 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,14 +1,9 @@
 AUX libsdl2-2.0.4-static-libs.patch 4899 BLAKE2B e294903f7a675f01fa884c8a98897b6a2c6e836d7baacb0f121f2aa48f2d0408c549f72e6f7886cba2db255486d4f29ed01b608cde133686d3c4809fd571edd9 SHA512 a71a6807251a8348f14a9dc1c5990d59cc63e067ee611a43b850950d8afde737830cf0bb0b0fd1fe6dc37e16490020fa21fbb9c70285333ee44ae2eb292f1a5a
-AUX libsdl2-2.0.5-ds3_ds4.patch 10482 BLAKE2B ed44bf23118bb3baad85a53cce40d7c4d9ff5b34384864fd684335db0febd9a58e62d422a70e47ff99890808d4c0ac9d0f0ec6962169ce1d12698afe041ea46b SHA512 01e8f09f48b464a7f60d87ea47418b51f26f28b4463f2d55e9b2e9374f6824ac1981e98b599d244c0900409a93f93d4a4f363b51c0f8e1a84e4f04ffb883ca27
-AUX libsdl2-2.0.5-static-libs.patch 4686 BLAKE2B eacc05e558c5fc9ba99f090e15e85161f6d474b57ecdcad928fcdde1a982ad4faff2a6100f995153e35c5570975d5139b12af5e883e90d7720b68aa08cd51180 SHA512 98f02ace8419e25f5feb737fdb39dddf55b8db6188cd517bb720d9d02537ddcd4cc6a0c32efd7ec699a694dd719366866fd9eb5174775749802ee75dd2e944e6
 AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25eb0eb3436478c1dddb4165c14d543793e2c378401f7b371976ffea38d6c3ceba4c4e4bfe415c0cfc4d07e62f2ec18dfc3f SHA512 c03037185a21ac3e2a664ab85847a0af95a44f579c2959fbc74d55ea8e59f7ed04775dcaea1fc2e284fca7ce6debca15a4062ba0e9bb0086f3dec49ba8044fb0
 DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 DIST SDL2-2.0.5.tar.gz 4209352 BLAKE2B c0a040e39117ac355e49950434a96b790dba2af13116071bdad6e50131b8f62f494463ec5fff5e4aff370733ac226888033ba189e431cc527cb3149076548159 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750
-DIST SDL2-2.0.7.tar.gz 4432499 BLAKE2B 730c6001a11922720975453059602a28116ae046da25cfa3a2b2f29be306b8807cc720f17dff9f0c944d4cbf9c1340a19085b17d23e1e594e7b63b514e736cf1 SHA512 eed5477843086a0e66552eb197a5c4929134522bc366d873732361ea0df5fb841ef7e2b1913e21d1bae69e6fd3152ee630492e615c58cbe903e7d6e47b587410
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 EBUILD libsdl2-2.0.4.ebuild 4724 BLAKE2B 81b738d8d00280008bc2e764e07210847ed765c4867ed8b2e071c8bbe16ddc250c9600afe30b4c9c2941e56eaa81249e6e8f872f6d15c7c47cdcde81342d683f SHA512 a02673ae1dd84a173d9479ccc572470484666f429fa36a4a2c4cc39bcc21e93b1691ce51cbc012d1c06c1e9cf073e7d694b77f25b1b9a229e5ea719c1c835254
-EBUILD libsdl2-2.0.5-r1.ebuild 4812 BLAKE2B aa3de1979b7a8c4551ab0ca97295683fce4fa7752009309ce1abd523e8059ec8823257e08d001280474e004dfe165a8a49e6c0946aac3c18d793876c7416d619 SHA512 2303183c31c03c36d161097c6db7fd0eb8728c90c9ad4261c6ab9e145ef4ef9310a99e350a87340b40c02838acb3f98f96fccc317449818ac27d0c93b7838522
 EBUILD libsdl2-2.0.5.ebuild 4760 BLAKE2B c23874aa322c300b1f4de2e5d303bd6a60afa27c0ce194e1c3eba2c6f51d86c7aa2f13d2a87ef77de7d3845c6cfde24e6806f7dd7bbc1782669c0516fad24ede SHA512 96834e25594b9d568c261991e24f3c1a7985fde2edc9c17facc726e11790939d0ae6b122e2d80d808781ee01949bea16756a3a7e1112b30ff22c190873d58078
-EBUILD libsdl2-2.0.7.ebuild 4857 BLAKE2B a41d920eb304d9603d4465d8cc5437551ece341a2481ef0d8924c5cc6a2ac553ff7adaa184a0942f31d1663f9adc899b5356e3d6749e3065caa0c5cfd1a8b3a6 SHA512 58cc65b2082d0d2fc3cc09143ae447f0409944a5410fa8560639a5bcf4e386453556ee2aacaab28a074605834c432b5a60335d264631f0e276ed4a8daa826570
-EBUILD libsdl2-2.0.8.ebuild 4857 BLAKE2B a41d920eb304d9603d4465d8cc5437551ece341a2481ef0d8924c5cc6a2ac553ff7adaa184a0942f31d1663f9adc899b5356e3d6749e3065caa0c5cfd1a8b3a6 SHA512 58cc65b2082d0d2fc3cc09143ae447f0409944a5410fa8560639a5bcf4e386453556ee2aacaab28a074605834c432b5a60335d264631f0e276ed4a8daa826570
+EBUILD libsdl2-2.0.8-r1.ebuild 4818 BLAKE2B f2f4cf8f24359f1c1066826df0cae1a6f212cad1e5cb3cffb93b7e6a69fb903456a10f7c998820d6b56874a656c524e3365639c9aa15df144d4f5a25f9f0ecd3 SHA512 3d53fa083920b57bb312f0436cca50703dcf1cc6aab1a91606bf00ed01807ee67ce1ec3909cb3afcb319dd8dcfec5ad3c75f7ca1fee464315f92f491bab8c858
 MISC metadata.xml 1609 BLAKE2B 036c0f14aa213417757191a7b05d957bb24723733e2a847f6d6e3e23539674eacec37e5e569ab35c8382f0fafdd156b323f3a0468182854848ba3c944e30d9dd SHA512 5e04e0574226a2f3d0bcce5b1aa38b9c95226d9a7192beae0e77ca8769e0ad02d0c8f3b72fa699f4a6704e9ae7f543aa1e5607f3346ba1c021a30aa1b72287a6
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch
deleted file mode 100644
index 34455663a563..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/joystick/SDL_gamecontrollerdb.h b/src/joystick/SDL_gamecontrollerdb.h
-index 1e623cb..ae84c6d 100644
---- a/src/joystick/SDL_gamecontrollerdb.h
-+++ b/src/joystick/SDL_gamecontrollerdb.h
-@@ -47,6 +47,8 @@ static const char *s_ControllerMappings [] =
-     "4c056802000000000000504944564944,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
-     "25090500000000000000504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,",
-     "4c05c405000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-+    "4c05cc09000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-+    "4c05a00b000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
- #endif
- #if defined(__MACOSX__)
-     "10280000000000000900000000000000,8Bitdo SFC30 GamePad Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,",
-@@ -62,6 +64,10 @@ static const char *s_ControllerMappings [] =
-     "11010000000000002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,",
-     "11010000000000001714000000000000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,",
-     "5e040000000000008e02000000000000,X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,",
-+    "030000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
-+    "030000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-+    "030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-+    "030000004c050000a00b000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
- #endif
- #if defined(__LINUX__)
-     "05000000102800000900000000010000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,",
-@@ -85,12 +91,23 @@ static const char *s_ControllerMappings [] =
-     "03000000550900001072000011010000,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,",
-     "050000007e0500003003000001000000,Nintendo Wii Remote Pro Controller,a:b1,b:b0,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,",
-     "050000003620000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,",
-+    "030000004c0500006802000010010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
-+    "050000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:a12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:a13,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
-     "030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
-+    "030000004c0500006802000010810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-+    "050000004c0500006802000000810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-+    "030000004c0500006802000011810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-     "03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
-     "030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-     "050000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-     "030000004c050000cc09000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-     "050000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-+    "030000004c050000a00b000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
-+    "030000004c050000c405000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-+    "050000004c050000c405000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-+    "030000004c050000cc09000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-+    "050000004c050000cc09000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-+    "030000004c050000a00b000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,",
-     "03000000c6240000045d000025010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
-     "03000000321500000009000011010000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,",
-     "050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,",
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch
deleted file mode 100644
index eed72dcccc35..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- SDL2-2.0.5/configure.in
-+++ SDL2-2.0.5/configure.in
-@@ -3197,7 +3197,7 @@
-         if test -f /lib/w32api/libuuid.a; then
-             LIBUUID=/lib/w32api/libuuid.a
-         else
--            LIBUUID=-luuid
-+            LIBUUID=-Wl,-luuid
-         fi
-         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
-         # The Windows platform requires special setup
-@@ -3597,23 +3597,23 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
--\\$(objects)/\\2.o: \\1/\\2.rc\\\\
--	\\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
-+	\\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
--SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
-+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
--\\$(objects)/\\2.o: \\1/\\2.c\\\\
-+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
- SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
--SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
-+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
- SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
--\\$(objects)/\\2.o: \\1/\\2.c\\\\
-+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- # Set runtime shared library paths as needed
---- SDL2-2.0.5/Makefile.in
-+++ SDL2-2.0.5/Makefile.in
-@@ -36,10 +36,10 @@
- GEN_OBJECTS = @GEN_OBJECTS@
- VERSION_OBJECTS = @VERSION_OBJECTS@
- 
--SDLMAIN_TARGET = libSDL2main.a
-+SDLMAIN_TARGET = libSDL2main.la
- SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
- 
--SDLTEST_TARGET = libSDL2_test.a
-+SDLTEST_TARGET = libSDL2_test.la
- SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
- 
- WAYLAND_SCANNER = @WAYLAND_SCANNER@
-@@ -144,15 +144,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--	$(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS)
--	$(RUN_CMD_RANLIB)$(RANLIB) $@
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--	$(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS)
--	$(RUN_CMD_RANLIB)$(RANLIB) $@
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
-@@ -173,10 +171,8 @@
- install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
- 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
--	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
--	$(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
--	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
-+	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
- install-data:
- 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
- 	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
diff --git a/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild
deleted file mode 100644
index 24af0fc24cd2..000000000000
--- a/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: convert FusionSound #484250
-
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal
-
-MY_P=SDL2-${PV}
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org"
-SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
-REQUIRED_USE="
-	alsa? ( sound )
-	fusionsound? ( sound )
-	gles? ( video )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	wayland? ( gles )
-	xinerama? ( X )
-	xscreensaver? ( X )"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)
-	virtual/pkgconfig"
-
-PATCHES=(
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	"${FILESDIR}"/${PN}-2.0.5-static-libs.patch
-	"${FILESDIR}"/${PN}-2.0.5-ds3_ds4.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
-	mv configure.{in,ac} || die
-	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
-	use custom-cflags || strip-flags
-
-	# sorted by `./configure --help`
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--enable-atomic \
-		$(use_enable sound audio) \
-		$(use_enable video) \
-		--enable-render \
-		--enable-events \
-		$(use_enable joystick) \
-		$(use_enable haptic) \
-		--enable-power \
-		--enable-filesystem \
-		$(use_enable threads) \
-		--enable-timers \
-		--enable-file \
-		$(use_enable kernel_Winnt loadso) \
-		--enable-cpuinfo \
-		--enable-assembly \
-		$(use_enable cpu_flags_x86_sse ssemath) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable altivec) \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		--disable-alsa-shared \
-		--disable-esd \
-		$(use_enable pulseaudio) \
-		--disable-pulseaudio-shared \
-		--disable-arts \
-		$(use_enable nas) \
-		--disable-nas-shared \
-		--disable-sndio \
-		--disable-sndio-shared \
-		$(use_enable sound diskaudio) \
-		$(use_enable sound dummyaudio) \
-		$(use_enable wayland video-wayland) \
-		--disable-wayland-shared \
-		--disable-video-mir \
-		$(use_enable X video-x11) \
-		--disable-x11-shared \
-		$(use_enable X video-x11-xcursor) \
-		$(use_enable X video-x11-xdbe) \
-		$(use_enable xinerama video-x11-xinerama) \
-		$(use_enable X video-x11-xinput) \
-		$(use_enable X video-x11-xrandr) \
-		$(use_enable xscreensaver video-x11-scrnsaver) \
-		$(use_enable X video-x11-xshape) \
-		$(use_enable X video-x11-vm) \
-		--disable-video-cocoa \
-		--disable-video-directfb \
-		$(multilib_native_use_enable fusionsound) \
-		--disable-fusionsound-shared \
-		$(use_enable video video-dummy) \
-		$(use_enable opengl video-opengl) \
-		$(use_enable gles video-opengles) \
-		$(use_enable udev libudev) \
-		$(use_enable dbus) \
-		--disable-ibus \
-		$(use_enable tslib input-tslib) \
-		--disable-directx \
-		--disable-rpath \
-		--disable-render-d3d \
-		$(use_with X x)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
-}
diff --git a/media-libs/libsdl2/libsdl2-2.0.7.ebuild b/media-libs/libsdl2/libsdl2-2.0.7.ebuild
deleted file mode 100644
index 7926374b19b1..000000000000
--- a/media-libs/libsdl2/libsdl2-2.0.7.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: convert FusionSound #484250
-
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal
-
-MY_P="SDL2-${PV}"
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org"
-SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
-REQUIRED_USE="
-	alsa? ( sound )
-	fusionsound? ( sound )
-	gles? ( video )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	wayland? ( gles )
-	xinerama? ( X )
-	xscreensaver? ( X )"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)
-	virtual/pkgconfig"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/SDL2/SDL_config.h
-)
-
-PATCHES=(
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
-	mv configure.{in,ac} || die
-	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
-	use custom-cflags || strip-flags
-
-	# sorted by `./configure --help`
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--enable-atomic
-		$(use_enable sound audio)
-		$(use_enable video)
-		--enable-render
-		--enable-events
-		$(use_enable joystick)
-		$(use_enable haptic)
-		--enable-power
-		--enable-filesystem
-		$(use_enable threads)
-		--enable-timers
-		--enable-file
-		$(use_enable kernel_Winnt loadso)
-		--enable-cpuinfo
-		--enable-assembly
-		$(use_enable cpu_flags_x86_sse ssemath)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_3dnow 3dnow)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable altivec)
-		$(use_enable oss)
-		$(use_enable alsa)
-		--disable-alsa-shared
-		--disable-esd
-		$(use_enable pulseaudio)
-		--disable-pulseaudio-shared
-		--disable-arts
-		$(use_enable nas)
-		--disable-nas-shared
-		--disable-sndio
-		--disable-sndio-shared
-		$(use_enable sound diskaudio)
-		$(use_enable sound dummyaudio)
-		$(use_enable wayland video-wayland)
-		--disable-wayland-shared
-		--disable-video-mir
-		$(use_enable X video-x11)
-		--disable-x11-shared
-		$(use_enable X video-x11-xcursor)
-		$(use_enable X video-x11-xdbe)
-		$(use_enable xinerama video-x11-xinerama)
-		$(use_enable X video-x11-xinput)
-		$(use_enable X video-x11-xrandr)
-		$(use_enable xscreensaver video-x11-scrnsaver)
-		$(use_enable X video-x11-xshape)
-		$(use_enable X video-x11-vm)
-		--disable-video-cocoa
-		--disable-video-directfb
-		$(multilib_native_use_enable fusionsound)
-		--disable-fusionsound-shared
-		$(use_enable video video-dummy)
-		$(use_enable opengl video-opengl)
-		--disable-video-opengles1
-		$(use_enable gles video-opengles2)
-		--disable-video-vulkan
-		$(use_enable udev libudev)
-		$(use_enable dbus)
-		--disable-ibus
-		$(use_enable tslib input-tslib)
-		--disable-directx
-		--disable-rpath
-		--disable-render-d3d
-		$(use_with X x)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
-}
diff --git a/media-libs/libsdl2/libsdl2-2.0.8.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index 7926374b19b1..5424e85e492e 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: convert FusionSound #484250
-
 EAPI=6
-inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal
+inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal
 
 MY_P="SDL2-${PV}"
 DESCRIPTION="Simple Direct Media Layer"
@@ -15,10 +13,9 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
-	fusionsound? ( sound )
 	gles? ( video )
 	nas? ( sound )
 	opengl? ( video )
@@ -30,9 +27,11 @@ REQUIRED_USE="
 RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
 	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	nas? (
+		>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
 	opengl? (
 		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
@@ -51,7 +50,6 @@ RDEPEND="
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
 		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
 		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
 		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
@@ -115,6 +113,7 @@ multilib_src_configure() {
 		$(use_enable pulseaudio)
 		--disable-pulseaudio-shared
 		--disable-arts
+		$(use_enable libsamplerate)
 		$(use_enable nas)
 		--disable-nas-shared
 		--disable-sndio
@@ -136,7 +135,7 @@ multilib_src_configure() {
 		$(use_enable X video-x11-vm)
 		--disable-video-cocoa
 		--disable-video-directfb
-		$(multilib_native_use_enable fusionsound)
+		--disable-fusionsound
 		--disable-fusionsound-shared
 		$(use_enable video video-dummy)
 		$(use_enable opengl video-opengl)
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index b002d467c3e7..381da8d06b38 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -8,6 +8,6 @@ AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r1.ebuild 828 BLAKE2B 5b12c8f42573463ce0144c6cacf7479f6b137b8e84c93e763084477d927768bd80cd344b533431d92aae3b56bbd7e6b053a890d88683a1208b52192100c97d25 SHA512 c26f2a40f0de6918e22c90682484cac1e08c03b764859596f4d05fb0df63eeb7c6a1e9415d70e7fe219cbe43ecbc2d50374741292c290852caaa626f32dae315
-EBUILD libsidplay-1.36.59-r2.ebuild 770 BLAKE2B ba5d15c00092847295463d75ea6c1e28e2642a5e067255e9e7517a63f84864c793a87431121c4b6d9f8c6cd9eeb2a7590e89a935d10a542302fb66d8155c18a9 SHA512 0ad5501296881267ef3ee2d4c8cacf18921da61b5c6a29111203b580044bb16c6b9ecf7a224945a52426b4bead42c6f475ee373d791ebf3a528660950ea42a56
+EBUILD libsidplay-1.36.59-r2.ebuild 769 BLAKE2B 958c67f849ad398c6f4ea6d685a0b33f924884859a32e199d6dff19d1fb4819403eb3e9455bfaa350864335bc12f51a4a71c748684bf80ff6c4f51dfefad947a SHA512 eb762f63d10c9e4c67b6a51523d8e36bce10a5ee837da7a6841536c9b249a371cb4b1488c9041dbddfa0d04d9adc6508276e8890f57b369eed73ccd3e1d0244e
 EBUILD libsidplay-2.1.1-r4.ebuild 1306 BLAKE2B 989a5d2d63dd582ecb11699327a959bc696ae62bb6600bbc7e5cc1fecf94fe45dfc752649a16b60b61a83e90fe5d18ba3378a9b610a4cafdc8adc6b8bb76d4ca SHA512 c6eda0b230c217b3dc300810f974cb12804f6dc2785243dad68993b2e2ea094c0cf329f7be70d8abf3af6f2d6d493b1b2d6404095382480ab1f9a38fa8b43478
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
index 823b92a87bc5..5ed3715ef487 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 DEPEND=""
 RDEPEND=""
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 8acf5905d27c..cccc4a3a035c 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -1,5 +1,5 @@
 AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
 DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa
-EBUILD openh264-1.7.0-r1.ebuild 2936 BLAKE2B fe173a63c90b15803277d70fe001ca64bbb9026fd82b535c627dff523c0c3d4c79f5adc178c9195991e806041fb9523b97a6bcf4006b18c89b8cc2062f51ff6f SHA512 6a19bae017a85bc1b9191ede3c94e60be2099e0de7534d01504a896bcb8a45c8d984126e1af6f440f271eecc1dd34b53b4bd75e783fd5f6db66630e3971cbebb
+EBUILD openh264-1.7.0-r1.ebuild 2935 BLAKE2B b8f3c8b49051b3116f48aa76aeb36a8429a316cdc04722755e274dd4a42fd8325b3b1fb4a8ee3157e91c5315ac7fe8c4b56d2c2a81ef7921ef7c0064b38dc1c0 SHA512 caace14ab8125d8a5178a783346f9bfe79011b24b2de91ff007bbf3336eb4c4d5b0f4d011d85937f4021e84d7f51e44551bed2264dc38ed0fb3e5e19d298433e
 MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
diff --git a/media-libs/openh264/openh264-1.7.0-r1.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild
index 45714df04ee9..99ef3ac52062 100644
--- a/media-libs/openh264/openh264-1.7.0-r1.ebuild
+++ b/media-libs/openh264/openh264-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="+plugin utils"
 
 RESTRICT="bindist"
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 14fd55d1e852..72750cb7d094 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,7 +1,9 @@
 AUX vigra-1.11.0-gcc-7.patch 550 BLAKE2B c3eda6330490a4fd83ae6c0cd19ca68a71437a2acf905447864dd853fee859bbddbeeb237fda084c89b65257a644033ccd0b3a0762ff03b1c79a4f084bf94702 SHA512 fcab28aea46fd2bcc9b227611d9b8881f1492a70042fab5b7209dd855c4bcb06575ac41489d9f78be1c70937e2f77c951f6c2a60d73d9f6a84c77581810ded1a
 AUX vigra-1.9.0-automagicness.patch 2470 BLAKE2B dbe9116f2864cba0a20d125ec494a08275b4da7798ff9a210a4384ff39c0fb4848638d544d4f68b50a8a9cac14a1157df87e621465ddbfb2db1bd6e59d1e105f SHA512 88374bc6e7c17e4528e4ba78c56c13cc680ace4befe738c910b1007644d068f73b6c60b959bf1f33cc243c38e35fce9aaf77e49a173366c3ec8182ace1443f44
 DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
+DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
 DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757
-EBUILD vigra-1.11.0.ebuild 3505 BLAKE2B c1c7ecc6e7844b6cd29b25e1668ab69775242415487490b5fddc5a0139738ddf637498bef9810269b77f8de8903083dcf949230e7438742ea2cffebd18681fec SHA512 80fc790c2284f9576905bb58b387483c2954183af071132efd37facd3d53666c4de7ba9d832434866cbffb8700f286cf1c17aec9663cca0b067fe1a57ba1d286
+EBUILD vigra-1.11.0.ebuild 3504 BLAKE2B b234c2c35e728818322358eb3bc1b22339a9e3ed2cb6853c724a2b80ec214627b953138e9a5ca7bc2e2e7b8d37835443ed80b86f7c892992f5774326ec83c7d0 SHA512 702c801b8b5eccc845db31a61637210e148d8ffbd27182252820b5fecabf9b068c5828f2e7519c3caf2089d909d03909e30786a30260a2a8919dd16ad01127c5
+EBUILD vigra-1.11.1.ebuild 3548 BLAKE2B 737ab017f04ad0630782ff60f0846457e611e66ccd8d1c71ebaf0e39d447919a6a1e57d64d58bb2a12990c97512e55616d6d0afa9cc2fd29db33650645972c8a SHA512 53270bb5f330a387d03fab354f8fdd52e61e565dcfdec2da08d7e08eda0308341dfc2ea18182e2eb221344b7ed77477fca973744bf98cd76ec5c87fbd53156fd
 EBUILD vigra-1.9.0.ebuild 2647 BLAKE2B 44d9d93f5f0d735b08e0bba27e455d3e3eaf6266d8e65a1ee10843db9667b0c39789f40f0e3226101ab075dbe683004e87b00df9496c3ea0ff8e2622d8e77861 SHA512 a1f995bca67859d072e666d16d7ddad87609dd857afde8fc2de4c56636cfbdc751b63acadd3ab06d230374da57edb49e9cc9f4bb896f6264005e54570fc96c0c
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 2a8cb7118127..7c3e44a5e1b5 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
 
 # runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
new file mode 100644
index 000000000000..6fa95e1699aa
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_P="${P}-src"
+MY_V="${PV//\./-}"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+
+inherit cmake-utils python-r1
+
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
+SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
+
+# runtime dependency on python:2.7 is required by the vigra-config script
+RDEPEND="
+	dev-lang/python:2.7
+	>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
+	fftw? ( sci-libs/fftw:3.0 )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+	tiff? ( media-libs/tiff:0= )
+	valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+	)
+	test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+	doc? ( hdf5 fftw )
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
+
+# Severely broken, also disabled in Fedora, bugs #390447, #653442
+RESTRICT="test"
+
+DOCS=( README.md )
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	einfo "Removing shipped docs and VCS files"
+	rm -rf doc || die
+	rm .git* .travis.yml || die
+
+	cmake-utils_src_prepare
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+}
+
+src_configure() {
+	vigra_configure() {
+		local libdir="$(get_libdir)"
+
+		local mycmakeargs=(
+			-DAUTOEXEC_TESTS=OFF
+			-DDOCDIR="${BUILD_DIR}/doc"
+			-DDOCINSTALL="share/doc/${P}"
+			-DLIBDIR_SUFFIX="${libdir/lib}"
+			-DUSE_DOC=$(usex doc ON OFF) # unused
+			-DUSE_FFTW3=$(usex fftw ON OFF) # unused
+			-DUSE_JPEG=$(usex jpeg ON OFF) # unused
+			-DUSE_MPI=$(usex mpi ON OFF) # unused
+			-DUSE_PNG=$(usex png ON OFF) # unused
+			-DUSE_TIFF=$(usex tiff ON OFF) # unused
+			-DWITH_HDF5=$(usex hdf5 ON OFF)
+			-DWITH_OPENEXR=$(usex openexr ON OFF)
+			-DWITH_VALGRIND=$(usex valgrind ON OFF)
+			-DWITH_VIGRANUMPY=$(usex python ON OFF)
+			-DBUILD_TESTING=$(usex test ON OFF) # unused
+			-DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
+			-DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
+		)
+		cmake-utils_src_configure
+	}
+
+	if use python; then
+		python_foreach_impl vigra_configure
+	else
+		# required for docdir
+		_cmake_check_build_dir init
+		vigra_configure
+	fi
+}
+
+src_compile() {
+	local VIGRA_BUILD_DIR
+	vigra_compile() {
+		cmake-utils_src_compile
+		VIGRA_BUILD_DIR="${BUILD_DIR}"
+	}
+	if use python; then
+		python_foreach_impl vigra_compile
+	else
+		vigra_compile
+	fi
+
+	if use doc; then
+		einfo "Generating Documentation"
+		# use build dir from last compile command
+		VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl cmake-utils_src_install
+		python_optimize
+	else
+		cmake-utils_src_install
+	fi
+}
+
+src_test() {
+	# perhaps disable tests (see #390447)
+	vigra_test() {
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+	}
+	if use python; then
+		python_foreach_impl vigra_test
+	else
+		vigra_test
+	fi
+}
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index feb0c2019a14..79b30b6a6b17 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -5,7 +5,7 @@ DIST x265_2.2.tar.gz 1203801 BLAKE2B 239b34c45b07c5bea83f0555d2d8f44322bd8fb3164
 DIST x265_2.6.tar.gz 1271976 BLAKE2B f649c47209af0f1cfff7ff736b9f43f20c9eaaf14e8428f6eff4fd9e3ce925de6e1ecde1be55b5d654321614fc245837d0bc603b72a92c41b92c729dc20f5cb6 SHA512 35c3716313e3dfd1555dd725b60f2b3b00a615d8b8d8267439722b52021d47e34eebf94b837b92a92d40c7ffab7b3198d6391365d62672b257c0a87d1db8a736
 DIST x265_2.7.tar.gz 1282742 BLAKE2B 5f7290a71009f1ba177b2a653c48b62d8067930e8e53e4f9dd149037d3cbc69acbcae9c5364d46e6cc127f7d70e2acaaed2abf3ef065ecae303088132f341757 SHA512 58582ff5c282a8ca6213a98495b95fa941f323fa454924e4751dde6d2a0e87a08d6e8d98012164a3d83523f2b004e7a1420b60b64719fe30f460dd10ec075094
 EBUILD x265-2.2.ebuild 5675 BLAKE2B 23cf92f51a8a8fed656a17cf0a59893931d42df5be17357a2873dd0da46bcf12ffd0b6c46d62ccd396566a7f53e8bdca5fbfbfbe72d4ff7d3a6454f1a4272cec SHA512 546d1f76b40c33047ad947c91c698111e8dabccf84562742b8c0142a86ac6148ea1b3efe238952d414f0f27ec24b8f159b76c1d6c53db811e84953ea6cf64ffc
-EBUILD x265-2.6.ebuild 5655 BLAKE2B 14c7e2883c62df6520eb12c151991d10a444276f97eae187fe7fcdd2e95600d05341e8032c1715b8c39179f9d327b4e94b5fa2347c7b6fb1f4dd0f9c5f2eac04 SHA512 39fe223958ab599a669283120a46e140cd57bc63bbd60f52b3d3d74f4a95b99875349282e10bf898efb97aa2df36d43f2d52a6e8f51a5f820eb2ff10f32d2c47
+EBUILD x265-2.6.ebuild 5654 BLAKE2B 6352a49f50d7773b7379be149e650b4721d939e484ed3216ed77c448c226af1e3a66b6da3be6b3b80983224abb78519cc506632728f95e5f01e9fa8374fb8fc4 SHA512 0e75425dc9d4cf7155029aab3f2b522b4556f9fb85df7e845a1a48b56cb302db72c1c3e3b69610eac925b9c3e7daa64982062194a654939632713d7a0fd24d04
 EBUILD x265-2.7.ebuild 5661 BLAKE2B d8c795c3923982eb5a13a290d409c822abd8421b0d1e058202b34204fe79d743c3eee3d4ae579533497595214a7a2de71646ee6e81aec8b4830a287e4c2c1ec9 SHA512 4bad0afbb56a8659ed7ee2d213c59f3c76ffd2a8bc192f083609a53d72e7818c70926293886c9b509e56a11f64b5dc375397bb4feba333355ccd831ba1ef1c46
 EBUILD x265-9999.ebuild 5661 BLAKE2B d8c795c3923982eb5a13a290d409c822abd8421b0d1e058202b34204fe79d743c3eee3d4ae579533497595214a7a2de71646ee6e81aec8b4830a287e4c2c1ec9 SHA512 4bad0afbb56a8659ed7ee2d213c59f3c76ffd2a8bc192f083609a53d72e7818c70926293886c9b509e56a11f64b5dc375397bb4feba333355ccd831ba1ef1c46
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-2.6.ebuild b/media-libs/x265/x265-2.6.ebuild
index 23eefb2d499e..9c3a49a4aea3 100644
--- a/media-libs/x265/x265-2.6.ebuild
+++ b/media-libs/x265/x265-2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index aae298564f08..60cd3a2c46e6 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -3,7 +3,7 @@ DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fc
 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
-EBUILD zimg-2.5.ebuild 817 BLAKE2B 12e093b0d9ead096626bf58f1973b0201f006b5e0c8d1d78ecbe9692a901126ebb46272f0e171fba2a5901a1d75fa0ff0e89d2c0d1702b27336c20d476dc654c SHA512 b54326754eb6589303a9e6157579cf4c49d3aa2b3d48527f065b5ccf487dc2337ba158103537d7a039aa391e2e33abe89e5394690cb6d58bde4c8e13a30dd040
+EBUILD zimg-2.5.ebuild 824 BLAKE2B 90ca6baceb71c7d2918f3e54a44978630c25cdbdcccc7965c6389fa92960cff631d45c3e2393203d6ed2f92b194a840e421ee69e763611c807f39864d1fdeb25 SHA512 29eea5cf1b3ac94b0b09933ac9bec0b0c2c2e6d646e4079891da7e284f822878701a2283b820be67d4bdbbfb94ab9375c889142b2c29c40914567c9226a64b93
 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
diff --git a/media-libs/zimg/zimg-2.5.ebuild b/media-libs/zimg/zimg-2.5.ebuild
index ac8793fcf58f..3debf52018e5 100644
--- a/media-libs/zimg/zimg-2.5.ebuild
+++ b/media-libs/zimg/zimg-2.5.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 ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-19 14:14:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-19 14:14:48 +0100
commit	5cfef3c94cd7e82136c69a0322f5ba21f7e64632 (patch)
tree	8f255dfacbacb657e3ac3654d01c1e11e651c066 /media-libs
parent	8aebb228036d5e2863b7eaa6e319ab41c1669269 (diff)