gentoo resync : 19.11.2017

13 files changed, 96 insertions, 168 deletions

diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 940012be38bd..3a689e619bc0 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,7 +1,9 @@
 AUX lcms-2.8-CVE-2016-10165.patch 772 SHA256 7930bcdbfd6b12230fc7736c538259663da6a80f94e02c0a6c5d24906435c5fc SHA512 f7c53161564bad8fdf7cadff8b5ddec38f9acfd3f21a9569a9da43135529a4e6d504e4e9a2d8674ccf2e0fac33ecda09020ddc7c422e825047c17389c7abbc17 WHIRLPOOL 1d75ead0d972fb63105bc5f64dafaca7f1e0664c99f9b3e688f415f41604f7c6802d7ff79c47d2d085fc299390b40b0110656519c4d9c333545084d4adac4008
 DIST lcms2-2.8.tar.gz 6687005 SHA256 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22 SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f WHIRLPOOL 57c6518fa758ee69da55faeb6810ede6463a3c6b2c70e0d2ccfa789fe09cd8192fdeda04aab9800c7af3b11fea25cb08db8b914a195b48f47f3270025ce8b9b3
+DIST lcms2-2.9.tar.gz 10953949 SHA256 d4ad6f8718f7f9dc8b2a3276c9f237aa3f5eccdcf98b86dedc4262d8a1e7f009 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b WHIRLPOOL 1eac52a026386b7bf8aa3fac66b485c622bd8f659c1351d5dde4acfd1fd0d6a64489b43464e203a84062b7a88a39a4ea41149c6102710016127ab10d36bc3db5
 EBUILD lcms-2.8-r1.ebuild 1421 SHA256 97e7085de1873fc64d699bc3e79fbfd2684d9bc49df21e47f5c71e2b2429792a SHA512 d57cbe1fcf49f860ea0b29a5c0e2a8de9381bba3f45fc863e547c463e7b6f223b77b2c87b45d853a48d188bb324e39f6e46370b42850f5a24ed6dab50a7ef0bd WHIRLPOOL 38909c5dd7bd43cf53ecd013008950910a672763bf0f06a58803dea7ab6ee81a8ca0046823742e3180939dc67890614193504ac249b2b7ee714362026e647bf4
 EBUILD lcms-2.8-r2.ebuild 1278 SHA256 585de4f89ad686d026a4e8d27476ac0652f47633fbbb2ea1bbafe443b4c3ff3a SHA512 eb3245f0bec48411922562b688677a5f64e9187b5a05c578582966ef671efe1c263dff14d45b894d235885398559da875ff25cf87d27a56ed559128ed706a15c WHIRLPOOL 3e01ed5f1dcd0ee7c5b3322694b0c3e8ed704aef50fa79e89bf57df5a4be9feb1c78ab77f83478a8342c262f3915c89a8295007ee5c54722bb8e1bc99500f2b6
+EBUILD lcms-2.9.ebuild 1225 SHA256 c0e38aefd15fe50b6b849363492c10b5171901cd4544f1358d69c819614af6fd SHA512 1ad660283e5dfa532cf71b36b1f33c1cf8465bd5739534414df23d85aa724789453353787572aea88daa773cd6e6a6bdad8874f6e4346c7d897ed7dd947cad2f WHIRLPOOL 21c76ec5d58e8f20349613d6782e696800a76ea4f2be81fe7c9aa8eb2eeeecb0436f687eb1b2fc438ecd16c6a9cce8cc4d9d321d77cd9f3a1509d1756573143d
 MISC ChangeLog 2713 SHA256 9494581fec240107f6ff405f1012e0c8752d763deacffb3755399ad58ccd5cf6 SHA512 a01e22d2f7d81bc24da9588fb822ef77bb3b0deaf040272ef8e7e995340c0c12303e9cfe715f93b666bee398e6bed28449a120a2418aa2c2a7c6616682eb2a68 WHIRLPOOL 450805688be07e3ffaffede192b810f0fe4937ab8643139ba21bbd64324886d5aa15f2c41096ef0234b65b405f929f6a8fffd8792d6aafe858415bdb913ed2fc
 MISC ChangeLog-2015 24486 SHA256 503b862894e9944e0d92a2acb686c434ae88d0ea194fac394c4b9cbb7cc558df SHA512 5fa2b476f3689e58f3cd8ae9249b84eb9e018a9e44308122beb8940f7808bd6065d26172bb7acd94878d7190777eeeaa284e05cd60d01b0d3f4f2f6d196d6b2a WHIRLPOOL f0104eab39e7e7664715859bbab130a4a13dcb356744a822f295f421434631bd8e6a32caffae506d431408743e00dd5b17a7089e5d5945b41e8be4f7a2871d91
 MISC metadata.xml 333 SHA256 973fc54521af3c0fc589fecbdbca3cce0f43f72d8bb3ccfe963ad127bd9e7284 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e WHIRLPOOL 7ec90a30e6f86f3a9770b51870d251fe1c91806153dab66fefa070eae38df50a82b040f85f54a3f2eaf9080bf449f9dac28232edc04bb089b2e98d56dc357b2e
diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
new file mode 100644
index 000000000000..c74830ba65eb
--- /dev/null
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs test +threads tiff"
+
+RDEPEND="
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/lcms2-${PV}"
+
+src_prepare() {
+	default
+	elibtoolize  # for Prefix/Solaris
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_enable static-libs static)
+		$(use_with threads)
+		$(use_with tiff)
+		--without-zlib
+	)
+	ECONF_SOURCE="${S}" \
+	econf ${myeconfargs[@]}
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if use doc; then
+		docinto pdf
+		dodoc doc/*.pdf
+	fi
+}
diff --git a/media-libs/libpostproc/Manifest b/media-libs/libpostproc/Manifest
index e4bc57d0763e..c487f0b44119 100644
--- a/media-libs/libpostproc/Manifest
+++ b/media-libs/libpostproc/Manifest
@@ -1,7 +1,8 @@
+AUX libpostproc-10.20140517-support-MMXEXT.patch 976 SHA256 0974258077de990c4776655c79b5a4038b24fdca68e2596d2faa3d9b5e7582b5 SHA512 18e7c377e4d67f43e39307670a10f23795df441173456c6f57098f259a78ebc93e43ef884cc7b518275d3886e4bd8ccb2d952855c41f5857ceccd5c289ce0177 WHIRLPOOL ba196eca92ce43c0cade73dd294d6ba881ece8ba28f02e30face2642c2cd86c8e0ba5209b8ce583ee1e7b0892f859258f82b290dd3e8f80f1df8fdaabe5decbc
 DIST libpostproc-0.8.0.20121125.tar.xz 65376 SHA256 0af39e91375f76cf8980aea2517666e5d69a113e41d5fdc56aa6ad1b33dee1a6 SHA512 7f1451dbe822d143793c12bb7c18fd9eeb98b5347bbfc54172f0aceb2f18cf31b2c0c888c33a9ce2e9f519b4bbb0a900b729188ce83cda9ad5499a8f6ea2d62a WHIRLPOOL 6e879842dfaf78018ca9a3ee93b5e2b950a72e672fc5dc47381f37593a83f886dccb4416fc30e6cdedf0d3fecbf534942f6664de5890d323362cf228106d8311
 DIST libpostproc-10.20140517.tar.xz 65556 SHA256 e47984fd5c60d56cc57d7e58de92eec9e8fd401e333d4a0841ccfbfb107103ca SHA512 0d6dca077c99ac569d892bc92cd08c6bf3e3a5e30e623ced20227b5bd1bd1aa3ecd150bfc900659accd77b997eb64b4d6f0538f9b6161d190ef6c69dcaf47893 WHIRLPOOL ca305b7ae67d61ecca1b359524c81d7219906078feb55087521454a4ceb8dc8235e20fff3a9b9a21e23d55650179639cc3796084942334930d232df3d21f8e14
 EBUILD libpostproc-0.8.0.20121125.ebuild 2343 SHA256 d3fe18910d47acbbdedd2c757a7719f01f3953b3ba33d2eb28fd8b3004c6bbb6 SHA512 400b8b08f434277871c12766fde06195c60f902542075342ecd804f7453da925e454a7f5181f3c625aae21254952a72e42df9fa2e686a6d767a90dfe68c8808c WHIRLPOOL b3d836eb16737737bb30d3bd713d718764d4477342735536f8e96ee565ab1e9c6fa1562fa4a403ccb02ca24e47e559bf4c56d7ae0b2006d83d9827efd8132fad
-EBUILD libpostproc-10.20140517-r1.ebuild 2444 SHA256 19f7e3c906fe7b8b55a73c86a5ee5fe8a21878ee90ea619654a5bdfda7138c4b SHA512 1e2c3be42b72d2d359c013dd2083c9f94a7511a817f55cab7f01e018588ec409f2e1adb06f2bf1723de56ad4ce2ad2891c022c6e2a4f083d42c389835d896e29 WHIRLPOOL 69194ac983cbfa8381efbd0d042468c26f7d301b35944147ec87fc827d5706e33ec4e6821d41d3b3cb0c751c84d64d055018f3bd0fb9bbbe81859633818ae46e
+EBUILD libpostproc-10.20140517-r1.ebuild 2511 SHA256 07fbb585ce2b5da47ea8ff355078fa3d2e1ebe773bf7fbcdfc734faa7d5bb515 SHA512 c53f9e7696ea21815bc63b1059d7938b592b3bd39fcffb56c7928596760b77a627b4a3797901a61841bfa3d1a7d251d3c6c7be1b9055a3f8d8ec26542a573228 WHIRLPOOL afe07e8d063ddf6c72cac79cb4e930b2921ea9a6d62844ba0041f489f4d00ba98fef63c985c77deeac6726f2cc5d2f7396006d2621513bb0ee2e7ae788727de3
 EBUILD libpostproc-10.20140517.ebuild 2347 SHA256 c405ab553a54a673279969c609220c5296cc2fdcaf653b7daa2ba820f64558db SHA512 050ec04cbe3de045d075d3f68fcc3ff997f0c3a83335492897d70f053d45ef0f198883d8550d1eefa0ac6ac363f155233d0eec935fa150a929529b4cade084dc WHIRLPOOL 68c565b6ba88c48ca881b020c469bb4c606c348fb04c03972041135ea6a0a1ac10e583e24c333627be5e6e9d7bd78c4bc78ca206cb13f1da3646a54d4f1252b8
 EBUILD libpostproc-9999.ebuild 2446 SHA256 c6b4edf34b00b7c360e5b1183292aed3412df13b58cf3a63ae494f93f972b61d SHA512 4a03a103992a9b43db78f486fa34dd4cddf76ea9baee54358c14fcdfee4fc3b3b83146fcb3fa5d5803541027fbac239f8bbd752a7a6a33b6ae70ec13533f35b2 WHIRLPOOL d7fcbedff77a2e4ce38c7e7aeedfe5bd76dae0aa16cb0872b06bc1e43d0a17417a45c13a928d58b57ec88ff0166f371ee1d0034c58d3424f4f791a9adec6a1cf
 MISC ChangeLog 2800 SHA256 cfa919abead7966fd81a5133d894ee77529c8f8b100225fc8aa0a6936ce90d9b SHA512 258db8d471c1e8f550355aa56ef8730207ab008f1f39b7db4fcd1d12df1ca7eb0806ae5f4c41594500bb342f2b305fff45ba2a4b15bdcb4cd21a274fcc725126 WHIRLPOOL f6495e2e1250049a2584c636b38d94995487921f75663c72e2c934a10c1b1c1b1cf3476649a81edf68f7f582242169a60339a95e8656f6484cb6909060c2030c
diff --git a/media-libs/libpostproc/files/libpostproc-10.20140517-support-MMXEXT.patch b/media-libs/libpostproc/files/libpostproc-10.20140517-support-MMXEXT.patch
new file mode 100644
index 000000000000..8f7d5adc0baf
--- /dev/null
+++ b/media-libs/libpostproc/files/libpostproc-10.20140517-support-MMXEXT.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/621172
+Upstream commit: https://github.com/lu-zero/postproc/pull/1/commits/d0c9ca711ef69889ebd0e44da90dccc722fe663e
+
+From d0c9ca711ef69889ebd0e44da90dccc722fe663e Mon Sep 17 00:00:00 2001
+From: Peter-Levine <plevine457@gmail.com>
+Date: Tue, 24 Oct 2017 19:24:10 -0400
+Subject: [PATCH] Use AV_CPU_FLAG_MMXEXT
+
+Use AV_CPU_FLAG_MMXEXT instead of AV_CPU_FLAG_MMX2.
+---
+ libpostproc/postprocess.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
+index 63b6822..951d1f0 100644
+--- a/libpostproc/postprocess.c
++++ b/libpostproc/postprocess.c
+@@ -961,7 +961,7 @@ static int get_cpu_caps(int cpuCaps)
+ 
+         if (caps & AV_CPU_FLAG_MMX)
+             cpuCaps |= PP_CPU_CAPS_MMX;
+-        if (caps & AV_CPU_FLAG_MMX2)
++        if (caps & AV_CPU_FLAG_MMXEXT)
+             cpuCaps |= PP_CPU_CAPS_MMX2;
+         if (caps & AV_CPU_FLAG_3DNOW)
+             cpuCaps |= PP_CPU_CAPS_3DNOW;
diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
index def8f1fe3e3c..1a23881842a4 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
@@ -43,6 +43,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-support-MMXEXT.patch
+}
+
 multilib_src_configure() {
 	local myconf=( ${EXTRA_LIBPOSTPROC_CONF} )
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index c429fc112156..9db0c1d6a26d 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,10 +1,6 @@
 AUX libsfml-2.2-no-docs.patch 432 SHA256 7e31edbe092460b564c04882af42a6e7173dc01f5a21ba1ac9fe0c6b31892b59 SHA512 86c05d82af21ed440e313119d5296097c498030c9aca8f6516a2a47c4913d578064dab9bd1476735b84f00eacf009b21de378e41d1e59615c1098dfeb786b807 WHIRLPOOL 0d2320ea49558e2270603ba13c39d56bb0a50d8a9da4ed0d087b6ef5d485b8fab775ab38648cf07970160fff18602dc2c47f25941972a751b3e300aae17ca02a
-DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83
-DIST libsfml-2.4.1.tar.gz 24573418 SHA256 f9d1191b02e2df1cbe296601eee20bdf56d98fb69d49fde27c6ca789eb57398e SHA512 50b2bdd914faccb9e44409f7a3b20909efef034be15e298c34710eafc52b36494272e4f5f9c882516fa1312c2e2ff3ebff0dd5246f193724ea6bc5be9ef8530f WHIRLPOOL 2528c1906c085f9b574414476f3f5ec5a85bc358c57dc47b91fe4c8a5398a771893825a6ad1671f8fb144a6f13634bfa5f186a2b34b58e1e405eac25677b71ca
 DIST libsfml-2.4.2.tar.gz 24576150 SHA256 cf268fb487e4048c85e5b2f53d62596854762c98cba1c1b61ccd91f78253ef4b SHA512 8acfdf320939c953a9a3413398f82d02d68a56a337f1366c2677c14ce032baa8ba059113ac3c91bb6e6fc22eef119369a265be7ef6894526e6a97a01f37e1972 WHIRLPOOL 6ea18fae58ab90235158abffc1492eccbdd8f8173a6c5ea3a55b447a47d75ecc53a4615996fff16f9e826e417a7d0028cf9366aed6913aec5fbc5d9c592054de
-EBUILD libsfml-2.3.2-r1.ebuild 1445 SHA256 90dfb8fd1771900fd54849a80a88bda15def4296750229588819b5648c9d155b SHA512 17fd32d0bfe2cd4e4a1c6d835a15b9551dfcc867d43923457f4388802d4eab818c2aed2a99c8183dde507532f6da47ae6e062859677569e1a0c23a57c2a46862 WHIRLPOOL 203684b942931bf37eeb20748662f57c739217f8b22c067a541e4e4b2364c09363a48ea8ef81a3061f4ad1c0ade5a978587247e7f3832d6226ad0f4c8424b607
-EBUILD libsfml-2.4.1.ebuild 1485 SHA256 7042f4dbb4db273ea43b43a474bc2cdc0375124f19602f9a5bdfe1df3ee22ff5 SHA512 a9085fb18cd0f8e6b96068a0b402cac838246b30b7850bc91ded4edfb6ec94daee75c67a706ff39f342c2b6b1ff2a24c1a7ceb381cc990c1342254560d83826e WHIRLPOOL 397398f60a796667267d2a5eb252cef538e09c83173d3e0ab1515feda28cf21d76cbb72fe051e9a472b672379f8951339b53a20570f53246c132a4ffda6453c0
-EBUILD libsfml-2.4.2.ebuild 1489 SHA256 3704a0883042d6c36fb41a235c7bb180c6764984c65d2e2dc1d2d178d971bcfc SHA512 86ce3db45ab46bc886fc1ac888746f08c1c1db05ef8a69d5f9a11f77a8ff9a114b921aeaac409db990c3ee6e2c4832dce70bd1dc5835a148b30cd766c33319bf WHIRLPOOL 14e3a38421b7135bd58b541f12729f09255f2e274d81e5ddd3db9f869bff3a786070196d2507372f6f41cde0ffeec7cc22608f29bc87bb3449124ea1656af689
+EBUILD libsfml-2.4.2.ebuild 1488 SHA256 c553c443317d2643cb7a38b4ecc87aa491915273bb9b6e5b5713e50b8074279d SHA512 250f27afd60470dc9667a504da415621a63cb9f71c23ec64557c7407f683871681e5e98b023984425ebca57b61583a405281cbbc343dae1210e33b02051c75ea WHIRLPOOL db2c540667b47c2575c7abd106f2801380cc2a590292a93b5f3e6b7ddd5b0c60e789bd7fcb09a31c5b42064d4ee510273a675d4fb6019488ea70333b9daf32c6
 MISC ChangeLog 4688 SHA256 5dfe3f7a8cd794c3821da216582fee277ebf5bbebdabd9594c2c38368efc46ee SHA512 64a0589b8e8c839e1a7ef6562fa754207008e5bbce9effe1f193d2277b523848128a8e6d1e56f5d07d05188d290f082376a6dd85b6b8953255d44baa643c0392 WHIRLPOOL 1869c0ad431c2ee5694fb1603a0af383bdce9313557fa6229d9e5528342772f69e7e5e333b583cc6cf6b227a59fdf93468663ffeb8180528883e3d945ef946ff
 MISC ChangeLog-2015 3190 SHA256 0965333a651fad50fad3ea065db1e28310b9ba047cc20a795ebdbb73afcf8f2e SHA512 cc1260188ec705124f5cb941b0f5d97f8a17a2ab3703b42ca14c8d513a413f5b9760839912c5314539c6412e05f3aa763540df6cb7f37e68d184706287217cb6 WHIRLPOOL 4a5388bd46f88b2ee6ba441ceaac80e09622d37148036cf9a87ca9a5d8d7766513aee78d36e74a8dc9db391073d3489ebcf246576dd5eb14b4c8a6d19defec5a
 MISC metadata.xml 732 SHA256 f883cb17a205bee93220040a2bfb7ffde8dddaddac7331744317c841fd41fdd9 SHA512 3d709fc7d52858ca5ce62ecc8f7aee20b4812be0b735d6eb66c2d4b5cd48bea5017d3b56dce3735688bdd0abb11ce485c58a5c7d4b7973307cf9877036caa8b2 WHIRLPOOL 0413c6b22a359df2f315f4113bcde335e067ebb22ec2a223479ff9a3d5239e3fc7cabb1bbf80c52ca3b62152b6c14469e2e23010f1102a7f347c27fe28fc0d5d
diff --git a/media-libs/libsfml/libsfml-2.3.2-r1.ebuild b/media-libs/libsfml/libsfml-2.3.2-r1.ebuild
deleted file mode 100644
index ab1db567cd3c..000000000000
--- a/media-libs/libsfml/libsfml-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/mesa
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libudev:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/xcb-util-image"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS="changelog.txt readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use doc SFML_BUILD_DOC)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-		find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.4.1.ebuild b/media-libs/libsfml/libsfml-2.4.1.ebuild
deleted file mode 100644
index 01bb090a4a65..000000000000
--- a/media-libs/libsfml/libsfml-2.4.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils versionator
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="https://www.sfml-dev.org/ https://github.com/SFML/SFML"
-SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
-	media-libs/libpng:0=
-	media-libs/mesa
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libudev:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/xcb-util-image"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS="changelog.txt readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
-
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSFML_BUILD_DOC=$(usex doc)
-		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/cmake/Modules
-	doins cmake/Modules/FindSFML.cmake
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-		find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
-	fi
-}
diff --git a/media-libs/libsfml/libsfml-2.4.2.ebuild b/media-libs/libsfml/libsfml-2.4.2.ebuild
index b27433df7bd9..cced9bb41bee 100644
--- a/media-libs/libsfml/libsfml-2.4.2.ebuild
+++ b/media-libs/libsfml/libsfml-2.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples"
 
 RDEPEND="
diff --git a/media-libs/libsub/Manifest b/media-libs/libsub/Manifest
index 66ccfdbefbf2..8570c4d2fbf3 100644
--- a/media-libs/libsub/Manifest
+++ b/media-libs/libsub/Manifest
@@ -6,7 +6,6 @@ AUX libsub-9999-iostream.patch 2097 SHA256 cb5d5876db50c320fe414811ca491545dd251
 AUX libsub-9999-libcxml-9999.patch 433 SHA256 0281b8131826a26f6b57d483e38ab074c96ae863fdd2bb81836512f0299b9fcb SHA512 e24858f1cc1a46e744fcdbc3b06c775a2e04521676d000d138bc05f625e48f4b66c5a81f5cf071a4dffef0265a2df1d94cd782ad8f4ff04b2358c0aaa5389d5b WHIRLPOOL 8b282866dc0249f040f88dbfd56d72c43217022a6d58489480f7228b44716aecae978b84e4bac636fc0fa3a409619723b96eb69f87f12d39b95c0a84ffe79fab
 AUX libsub-9999-no-ldconfig.patch 196 SHA256 652355af3ca61860a83d02bea1139a66141a3ac6aa76b231cc9bf7151f5447ed SHA512 543f8f5d0ef6e855fc43eafd594d8bf1259abc23a878108a7ec28353a05430ec05b1e05627b7a2f0a7993512bb4867066d2ca533a48950683c022d3283b0a62f WHIRLPOOL 2ac1a0edeec82987efd65c9b87327289268dc088a239518284da983e689a42a17618c714bcf9d263dcc38a34ad40a010ce344bacd1288f1c134cee398b18cafb
 AUX libsub-9999-respect-cxxflags.patch 418 SHA256 d5f4a72d12062734c31ae8ed86fbbc99b6f373893e10634f51811d24bf6182f1 SHA512 1a0d6cff7c3d8bb04d4f71f7c05b1f74cd7f7b3cfed98aff1b2f5ba9b484b7a5040f26849a93eaa5d0de35dfbb22ad8d34e3038e4e3204bf2dcbcb07cd640179 WHIRLPOOL 5eb6020452ff55defda1ccc8acbaef453b542da7f74ad3dd87ea8acf59cdd545289facb866d69b2d25595c512c13ba5d78c1bcddbf218a34946294d305ac5949
-AUX libsub-9999-test-boost.patch_ 740 SHA256 d581e83e08e78c8a93e611b31c66d1366ee745222954543f011e4f2d3c2f707c SHA512 41e848f3a1f4a891352a405b1e63f2df6b1affda813bb64c64befe86478e3056158ca578f29e9476b1043bfb44778e632de9668e1905b40eba1c9d4f2764ea2a WHIRLPOOL 1378da5bb683f45cee73d88c33376f63650eded3865d1a21a50fc356bcc181995cd4d34e16d297747119704ea951d9615f06b06642a5d127fc8a1d0100f04a88
 DIST libsub-1.1.13.tar.bz2 178168 SHA256 3ec6e40e3f45fc67b61e0746cb509c1e251fc22c639785deeba0b8459f657af2 SHA512 85785ce69e52ce8d5746a9cf15178a9e98d13f63a4c899d13ff5df40ab871fd8ddbea0261b7e01ab9220973c0f9b6f0faeefe94c7f0755eaf43ae2674c367ea6 WHIRLPOOL cfdbad5596870b0b266037a329c3baab207e86451c9413b4612831bc699e9690920448279b268837a6f1d31ce26e73965ade49fa58bb762e2e51c26248e87ed7
 DIST libsub-1.2.4.tar.bz2 179025 SHA256 0c37a37d5445598bba2088006b1542155d1a7528a62fd95cd094acbc44eb5d61 SHA512 c7e5f73b5e46322434c5ad3235c374311e30df0e4d794645a716867e696683883b1576fb206e85db6aebe649c9e59299abac86a513c9ac93bd5ebefec826a63e WHIRLPOOL c954910e43252aba9d9dfa060493f41a3ac605d6f1b8e8cda4f110cea56937db30599b93345e593ee676828b317f73734b29a1aa7ba291f25252042f044faf13
 EBUILD libsub-1.1.13.ebuild 1045 SHA256 af33f2cbbde6b461f57b1d95009f80199290113413671accc2747f1b41478ad6 SHA512 81167be1b26e4180385954640511f9eafdf7bfb0f55d28d50a47384c981486609f06598f79d48ec60957bc1627150a5a23309ce596c8e869b2994bfd1054d2b5 WHIRLPOOL ee20c970ad6a6557df2009863b50ce954d5a64b93e556536c73844d22484e9c81740b23ceb47e64c859eb64f4a75e812bb1511c39f1f09e9e49d95ac9de02c53
diff --git a/media-libs/libsub/files/libsub-9999-test-boost.patch_ b/media-libs/libsub/files/libsub-9999-test-boost.patch_
deleted file mode 100644
index eacc5ea65ca6..000000000000
--- a/media-libs/libsub/files/libsub-9999-test-boost.patch_
+++ /dev/null
@@ -1,15 +0,0 @@
---- libsub-9999/test/wscript
-+++ libsub-9999/test/wscript
-@@ -6,10 +6,11 @@
-     conf.check_cxx(fragment="""
-                             #define BOOST_TEST_MODULE Config test\n
-     			    #include <boost/test/unit_test.hpp>\n
-+    			    #include <boost/filesystem.hpp>\n
-                             int main() {}
-                             """,
-                             msg='Checking for boost unit testing library',
--                            lib='boost_unit_test_framework%s' % boost_lib_suffix,
-+                            lib='boost_unit_test_framework%s boost_filesystem%s' % (boost_lib_suffix, boost_lib_suffix),
-                             uselib_store='BOOST_TEST')
- 
-     conf.env.prepend_value('LINKFLAGS', '-Lsrc')
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 4755acaf12b1..d043f4d1f055 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,7 +1,7 @@
 AUX portmidi-217-cmake.patch 13124 SHA256 ac124aff85997f82556a29a752a1953c9501b6c70689559d3f29bda4ef35cd1e SHA512 36392c6e5e9f21d8791866f22345569346e4827bbb3525c119f2a28d8ec1d055988a360c2f53323f1d12f8294896656044c5890cabedd7fb6c2f730f5d72e4cb WHIRLPOOL 5c84d8862c97a2d91e66c7005896f8097ffb32b6af9091cf9558e8556c2f2f8ed2ae0e8f449709cd10cae84acfd4cf4ca8a9ae433d7188d6f926334eb56621b3
 AUX portmidi-217-python.patch 764 SHA256 d9456d71f35792ecaffbf1251f4a92704be579fd411b10041b7d2e2bdd9f2f19 SHA512 5f5e582d1769c995038d1b073eb603e313f1a49b5d7cb832de9f2aef003dfcf34bcd848337dc180ee23bf87ad631887584d339474c45e57b6a78d179c929ec43 WHIRLPOOL 4285b9fce71f004ad3666b8a8fc4d86b1d1a5bdfef2087ae158569d22e55e7598937da2362d0a993a3902876f832a7b6addaf973df589b9f01dd779ce57c0fdb
 DIST portmidi-src-217.zip 1030830 SHA256 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b WHIRLPOOL ee970e9944ca0dad82f46285dda2e9c22fe03092719441be40fcc77a57d8c9a6fd7a2f232d29f80ebea041d23981ec61cf883bcc79e3b900173a5456d5510434
-EBUILD portmidi-217-r1.ebuild 3050 SHA256 bb40ccb2b4d6c122e36359a526cebb1b3b672ed99b29dfd1996583289378d10d SHA512 6f8d16d74663a985c2b83117ff92dfa375af922adf0b57691f076041e68a2f6459eb734eab04bb783aa62ee1dadd183e2dc16ce9ca4e90e25d67ed75143d011b WHIRLPOOL 8b786bf4b0517d9bfe52600f2d7d72e195207621bbfb6571e1df72b174a092549ec5116287106583fda75946de82338b51f6cc4b21d2f5fdef114b553afece70
+EBUILD portmidi-217-r1.ebuild 3074 SHA256 790c0f58cfc77b964faf9c340bffdb74fa69ae7fce89ff233527aa35944c8ed3 SHA512 5e3e7b6e015bf04e69daf640c1b223201ea8e8d0aacea9b8e301aae082ef04d4394620342611f3b60afe0084114d158e9c89390bea74677cc81dd8e317feea67 WHIRLPOOL f24699465272a2c3eda806c28978f3732810c094366080bde2e27a56b98b774f880400b9fee90f29155731d4be54e84f8407827024b8489e41ebdd9cb3e39582
 MISC ChangeLog 2553 SHA256 24c1b25291d3becda9a5a8fb5333283043dcc4b3262a3c75a490e8c681ae92c2 SHA512 55bba75234f004c8e73f998f6976683dd924fbb49b5ec599714bce1476377ca40190f71bb61cbd0ad78bcfdcc99cbf5e180de60c5123802869dfdbcda712701f WHIRLPOOL 3c988943225dfc25835586b24ab1c6e13e3dd34568128b14b74380bd877d34ab05083b4a3e3b8836c3eb684797e4f50aae817cb460ca0e755b35aacd9ebbcd68
 MISC ChangeLog-2015 929 SHA256 16dcf5d53c32dc453abf94256418a01dabcb009c72179f2858e7a6cedcef8cb9 SHA512 4066c9be16dff4e77a8f4775b539ec0c41547565dedcdfeadc8d8da2efa2af25ddf2d62b8e6af325ec3aecb3f57b2af7586e18596170df08b140964de309528a WHIRLPOOL 5ceb3c7070846c4ea9170b04840af23fd06062cfeb74ed03e8df917c0fabe8bc80063d306b6c34822990e789c0c21be365ad88ebc0ce20034573688695b92f84
 MISC metadata.xml 436 SHA256 b194763469de4834f254c9854e16878e772d6cfdd554f01c0019fc6dd506d886 SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc WHIRLPOOL 4e109da7d5e4bd7bc7e0a319f48f023728b69d3dfdc53e8f67bc6ce5c29dc7ebb05b044aeebc6b097dcc881b37ac1c4662729c3844e3d58fa53bf4876885dcb4
diff --git a/media-libs/portmidi/portmidi-217-r1.ebuild b/media-libs/portmidi/portmidi-217-r1.ebuild
index 1542a98315c7..b08b58ff44cc 100644
--- a/media-libs/portmidi/portmidi-217-r1.ebuild
+++ b/media-libs/portmidi/portmidi-217-r1.ebuild
@@ -37,17 +37,21 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S=${WORKDIR}/${PN}
 
+PATCHES=(
+	# fix parallel make failures, fix java support, and allow optional
+	# components like test programs and static libs to be skipped
+	"${FILESDIR}"/${P}-cmake.patch
+
+	# add include directories and remove references to missing files
+	"${FILESDIR}"/${P}-python.patch
+)
+
 pkg_setup() {
 	use java && java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
-	# fix parallel make failures, fix java support, and allow optional
-	# components like test programs and static libs to be skipped
-	epatch "${FILESDIR}"/${P}-cmake.patch
-
-	# add include directories and remove references to missing files
-	epatch "${FILESDIR}"/${P}-python.patch
+	cmake-utils_src_prepare
 
 	# install wrapper for pmdefaults
 	if use java ; then