Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

26 files changed, 25 insertions, 25 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index fed8bfa3d029..af728ec3d417 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index ed598eb8ea3d..ae48b16346d1 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -1,18 +1,18 @@
-AUX 2.5-r3/0001-Fix-non-terminating-loop-conditions-when-len-1.patch 3538 BLAKE2B 42aa5c5c99921e53db1ec44da360e04c1e433421b4be37f5669bc5b3bab78f23fcec84763f4af4d77bb19d3b81c74fa8bff46548c1f17a06aae2620084ca7a6d SHA512 6fa06ff3b97efde6d83ee3bb7a2cea81ed5e095f284f2517a65d182b591a629ce09b3eaeefc9ff80d093d6245a802fd76a261b812a357a16085c8062738caf4d
-AUX 2.5-r3/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch 1290 BLAKE2B 6d79c5d51a693b6bb6985a890bcf8ca6bc45600552cd68edf49062e649d0503ef702a9f7b45fd8bcbbf3a4f3731edd26e109b1f671e69fa9cdaa30ccb3e2b4a2 SHA512 40369584513c2bb86d89670b78c3d7489af5ff6a7c837faea0b52a8ed224bd458deb7bb47027c72557d9a849abb8ae1d8f3cd0dfb6bb0e13128954eb5558bc6d
-AUX 2.5-r3/0003-Get-coordinates-from-previous-vertex-if-last-command.patch 833 BLAKE2B 0c376d62b533649655790c41a8faac5486c170b0c3b55639711187a4fb3da290d0e296133b1229939a2f23c67a91a49bf2d3f084d875f5684a7744ac70e82a34 SHA512 fa9ae4f9e3169da8d60939e2d53c04833e4d955535b72067b95d4a1c74ac543bd67596d2da2c587abaeb4ce2ac905ec2bbd2c808dc8c90b0826486390e937e64
-AUX 2.5-r3/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch 4590 BLAKE2B b540f786883a741ea77a441acf71e0304ea0c05331a8ff528bfa801627bfeb2e37d039ead0a5411c3abf1e66eabf9fd9319c9a6cf73a207604c25d06305a2e35 SHA512 72b82c8729e16afa11ea11e47c44dee3962b95e655c8129c2c9a9caa176ad88a85d5cb356b5092dfc4432d1d52f9678f28abdbe5c0a7a011b0df53581258d758
-AUX 2.5-r3/0005-Remove-VC-6-workaround.patch 1949 BLAKE2B 8230a414657ee7ad9575043e21ed894725e09e702514472f59300d85e43de52f129cde6d1632c05206c627babd401d5a00b8c9ea3988b57168ea41a0bd5d31c8 SHA512 36ad8f23396df65c3f040fef40447fde4e9a00a578f5599ea44e441626d1ce2bb2023d0dd1a6cda513624d9bf34d2cbef4bcf37cd2d97e5f66b3d9eea51e7c67
-AUX 2.5-r3/0006-Implement-grain-merge-blending-mode-GIMP.patch 3031 BLAKE2B 565edfd1c74d187e4c974cd43801bd5136dd5e0d0aa87ea76a662bbdf3b6cc95a688ad1fb7e1a9725968f4ce1481a877d6c292c44f626b893f2b782a79857aa8 SHA512 9e0df7f67f1c6f91f9b257cc568117773f0534253743f7a8bdb79765503b02bec4575be28f61f03dcfe715de182b94e76ff27f7f9c7d8d29927b30500dad5947
-AUX 2.5-r3/0007-Implement-grain-extract-blending-mode-GIMP.patch 2920 BLAKE2B e3fe254677ddd7bec746ac826103a8a24355a38ad02d43788da01ce81cf0fee528cef7f94b47b47310c1b7d04078b26829206c7d6db1c9f4f77f5c1915fddd23 SHA512 40044f1cb0b684c6d57454264d3af084c61195fee4be4d1a966f32c3940051536f17b99b47f02f4b4f1f47c571be6989fded986e5f66d3918415a8907274da44
-AUX 2.5-r3/0008-Declare-multiplication-and-division-operators-as-con.patch 1259 BLAKE2B 4e786eccd2b0ac644c64c98f2912fec7276656daf7a4c80016c03699ca0e57d621b0f95653ea201ad9755e170c1433c93450cc5b971abde31bab6f2460a4d524 SHA512 f816897fce1367fc44e3c95f3463de7b582d9895e4b5a910366a96c6c18befdd6ed5aea3b03c75382b345f1739028f27e19ce4c0367aacaf34c737d8a2887781
-AUX 2.5-r3/0009-Add-a-static-identity-transformation.patch 1184 BLAKE2B 0ea506ede9a1ef803ca716bdb207c879ad6b1a122ae7f2af6d6d08908a6eaa54823260ea22b89a5a7dbf242210e235385987e9c2b12e2e0ef7943b6fcc188c27 SHA512 0f86f4af17338a4ddbd24a788ad46481050cb308a50cd28b6fd15a26434fd8b844656498391f5546a953ae5eefd29fadc4e62ef493971c02386bcf3ca9d92e7e
-AUX 2.5-r3/0010-Add-renderer_scanline_aa_alpha.patch 7326 BLAKE2B 7450f0df6db953a48d9287f71c2054c109ec029c08dd6f8bb3681896dc1e7bf73ba3e875947934927db7a0063abdc57bc8670700cc0d12efd91c1d56882d4b66 SHA512 7b0a1d9d9c7995e0c103df3ac1b68924b693066ee416aba79999acf93f7534729597cfe89e2d5668fd40325cb462b68de8a9ad7478f7da54127a431ea51a9e46
-AUX 2.5-r3/0011-Avoid-division-by-zero-in-color-burn-mode.patch 2791 BLAKE2B 6f16eafcfdb633c4bf45897678c986a7348ac96e20341b183e45623178b9606c776ff117cd105bf448bd8702363f0ec0e3717f94b7a0226c052c16d41191f2cc SHA512 41ed5524289ba6d59686a284c6ff37f0f71c215306592b54d51439011a9ba9e040ad2758353b642156b0af7e4869ad504d0aa165d357d7c722f756ffd147c4d9
-AUX 2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch 1084 BLAKE2B 5f48f9327941ff6ca4558f7a252e8af5112de7c54db7ad00239a5f92eb0c894055569b47556f4b7819ab3b560dc28993375c73af10749161829ed5ad3e9f43a0 SHA512 495403338eeb106c561a917265fe99652691f9d7bae11132720bad0e64ae6cadf68e0495744db1c33ace9d2fc06a62c7e79b97699dda250388291d067993b5e4
-AUX 2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch 3534 BLAKE2B 5333d7e8cec192be5d4943ff50b893d74cb39338b19f928dd51578c8b1fd218c662227d6defa14c220305f759b5d3653f343ead9cdf247c3130c3f8b27490e19 SHA512 85eff63dabcc9f357933db7ffe9d9f87bd652de475859b80205e2661d6158842b6848caf52917c6401063f86a53f668a0ee311f31b17999474043943273304ca
-AUX 2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch 973 BLAKE2B 4ac032b962331a4e11282937759056e5a44b7edda936214484e97e553ccba55bc11f9db3eabe68cde47c18c45050dd437a5904347384945ee655ab04301a51b6 SHA512 4dcb65e3e1561e43d7a1250529830f23b8d0a928a927dde60fe7cfe8fe89c69e535ef6e79a884311ede4396530f9e4c2de3e6188ed7ce860b74a55d580400c5b
-AUX 2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch 662 BLAKE2B 41933541711439e285516aaadc675899614f75ee030eea32aff54fd8559a54f27968e2f02cfb4e89e421d61524f6f992ce38da0cfdc2d6b438d91a44fdfa2f0c SHA512 f67185083382823d1e00bee5065943be467b4ad2b5b155efe4cdb472142276e9215545bce62bacbeefc2f69142463726fbcbcfee82ac4b6db72d9fe645a29777
+AUX 2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch 3538 BLAKE2B 42aa5c5c99921e53db1ec44da360e04c1e433421b4be37f5669bc5b3bab78f23fcec84763f4af4d77bb19d3b81c74fa8bff46548c1f17a06aae2620084ca7a6d SHA512 6fa06ff3b97efde6d83ee3bb7a2cea81ed5e095f284f2517a65d182b591a629ce09b3eaeefc9ff80d093d6245a802fd76a261b812a357a16085c8062738caf4d
+AUX 2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch 1290 BLAKE2B 6d79c5d51a693b6bb6985a890bcf8ca6bc45600552cd68edf49062e649d0503ef702a9f7b45fd8bcbbf3a4f3731edd26e109b1f671e69fa9cdaa30ccb3e2b4a2 SHA512 40369584513c2bb86d89670b78c3d7489af5ff6a7c837faea0b52a8ed224bd458deb7bb47027c72557d9a849abb8ae1d8f3cd0dfb6bb0e13128954eb5558bc6d
+AUX 2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch 833 BLAKE2B 0c376d62b533649655790c41a8faac5486c170b0c3b55639711187a4fb3da290d0e296133b1229939a2f23c67a91a49bf2d3f084d875f5684a7744ac70e82a34 SHA512 fa9ae4f9e3169da8d60939e2d53c04833e4d955535b72067b95d4a1c74ac543bd67596d2da2c587abaeb4ce2ac905ec2bbd2c808dc8c90b0826486390e937e64
+AUX 2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch 4590 BLAKE2B b540f786883a741ea77a441acf71e0304ea0c05331a8ff528bfa801627bfeb2e37d039ead0a5411c3abf1e66eabf9fd9319c9a6cf73a207604c25d06305a2e35 SHA512 72b82c8729e16afa11ea11e47c44dee3962b95e655c8129c2c9a9caa176ad88a85d5cb356b5092dfc4432d1d52f9678f28abdbe5c0a7a011b0df53581258d758
+AUX 2.5/0005-Remove-VC-6-workaround.patch 1949 BLAKE2B 8230a414657ee7ad9575043e21ed894725e09e702514472f59300d85e43de52f129cde6d1632c05206c627babd401d5a00b8c9ea3988b57168ea41a0bd5d31c8 SHA512 36ad8f23396df65c3f040fef40447fde4e9a00a578f5599ea44e441626d1ce2bb2023d0dd1a6cda513624d9bf34d2cbef4bcf37cd2d97e5f66b3d9eea51e7c67
+AUX 2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch 3031 BLAKE2B 565edfd1c74d187e4c974cd43801bd5136dd5e0d0aa87ea76a662bbdf3b6cc95a688ad1fb7e1a9725968f4ce1481a877d6c292c44f626b893f2b782a79857aa8 SHA512 9e0df7f67f1c6f91f9b257cc568117773f0534253743f7a8bdb79765503b02bec4575be28f61f03dcfe715de182b94e76ff27f7f9c7d8d29927b30500dad5947
+AUX 2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch 2920 BLAKE2B e3fe254677ddd7bec746ac826103a8a24355a38ad02d43788da01ce81cf0fee528cef7f94b47b47310c1b7d04078b26829206c7d6db1c9f4f77f5c1915fddd23 SHA512 40044f1cb0b684c6d57454264d3af084c61195fee4be4d1a966f32c3940051536f17b99b47f02f4b4f1f47c571be6989fded986e5f66d3918415a8907274da44
+AUX 2.5/0008-Declare-multiplication-and-division-operators-as-con.patch 1259 BLAKE2B 4e786eccd2b0ac644c64c98f2912fec7276656daf7a4c80016c03699ca0e57d621b0f95653ea201ad9755e170c1433c93450cc5b971abde31bab6f2460a4d524 SHA512 f816897fce1367fc44e3c95f3463de7b582d9895e4b5a910366a96c6c18befdd6ed5aea3b03c75382b345f1739028f27e19ce4c0367aacaf34c737d8a2887781
+AUX 2.5/0009-Add-a-static-identity-transformation.patch 1184 BLAKE2B 0ea506ede9a1ef803ca716bdb207c879ad6b1a122ae7f2af6d6d08908a6eaa54823260ea22b89a5a7dbf242210e235385987e9c2b12e2e0ef7943b6fcc188c27 SHA512 0f86f4af17338a4ddbd24a788ad46481050cb308a50cd28b6fd15a26434fd8b844656498391f5546a953ae5eefd29fadc4e62ef493971c02386bcf3ca9d92e7e
+AUX 2.5/0010-Add-renderer_scanline_aa_alpha.patch 7326 BLAKE2B 7450f0df6db953a48d9287f71c2054c109ec029c08dd6f8bb3681896dc1e7bf73ba3e875947934927db7a0063abdc57bc8670700cc0d12efd91c1d56882d4b66 SHA512 7b0a1d9d9c7995e0c103df3ac1b68924b693066ee416aba79999acf93f7534729597cfe89e2d5668fd40325cb462b68de8a9ad7478f7da54127a431ea51a9e46
+AUX 2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch 2791 BLAKE2B 6f16eafcfdb633c4bf45897678c986a7348ac96e20341b183e45623178b9606c776ff117cd105bf448bd8702363f0ec0e3717f94b7a0226c052c16d41191f2cc SHA512 41ed5524289ba6d59686a284c6ff37f0f71c215306592b54d51439011a9ba9e040ad2758353b642156b0af7e4869ad504d0aa165d357d7c722f756ffd147c4d9
+AUX 2.5/0012-Avoid-pixel-artifacts-when-compositing.patch 1084 BLAKE2B 5f48f9327941ff6ca4558f7a252e8af5112de7c54db7ad00239a5f92eb0c894055569b47556f4b7819ab3b560dc28993375c73af10749161829ed5ad3e9f43a0 SHA512 495403338eeb106c561a917265fe99652691f9d7bae11132720bad0e64ae6cadf68e0495744db1c33ace9d2fc06a62c7e79b97699dda250388291d067993b5e4
+AUX 2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch 3534 BLAKE2B 5333d7e8cec192be5d4943ff50b893d74cb39338b19f928dd51578c8b1fd218c662227d6defa14c220305f759b5d3653f343ead9cdf247c3130c3f8b27490e19 SHA512 85eff63dabcc9f357933db7ffe9d9f87bd652de475859b80205e2661d6158842b6848caf52917c6401063f86a53f668a0ee311f31b17999474043943273304ca
+AUX 2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch 973 BLAKE2B 4ac032b962331a4e11282937759056e5a44b7edda936214484e97e553ccba55bc11f9db3eabe68cde47c18c45050dd437a5904347384945ee655ab04301a51b6 SHA512 4dcb65e3e1561e43d7a1250529830f23b8d0a928a927dde60fe7cfe8fe89c69e535ef6e79a884311ede4396530f9e4c2de3e6188ed7ce860b74a55d580400c5b
+AUX 2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch 662 BLAKE2B 41933541711439e285516aaadc675899614f75ee030eea32aff54fd8559a54f27968e2f02cfb4e89e421d61524f6f992ce38da0cfdc2d6b438d91a44fdfa2f0c SHA512 f67185083382823d1e00bee5065943be467b4ad2b5b155efe4cdb472142276e9215545bce62bacbeefc2f69142463726fbcbcfee82ac4b6db72d9fe645a29777
 AUX 2.5/02_maintainer_mode.patch 590 BLAKE2B 61804fbb72b05975b1bf4470e466ae39eac18aaebb899426b41505cfba8030db3542dd900d5f866b6c32e2c743e89f009985871cf37500b9c43b28f0c9822404 SHA512 150640e2eaa1ef764071759b09f25adaf2653d9f97b8a938e47e1cc0d221d441054d460d48819995ebea7d311c97b480caf83f135c3da188733230405cc9bf9e
 AUX 2.5/04_no_rpath.patch 359 BLAKE2B c78f3555f371203c8355a2b8e6ac3c300b9757a1d74e14f3bfdbe58abc1332ed76f8486963b0b484a50ffd8fb48deea315a09b5cf7b44ac0156488a8b7fb251b SHA512 f44a98258cef2bdb1ed86a2614162d749f7d191ac3e7c642fe8055bdc757e65d8b7a26ad44ea3f7b760776b308dd9d07af3100826504c5547c8a111a3dbdbc8e
 AUX agg-2.4-depends.patch 2154 BLAKE2B ecea231011d0779bd3fa42f8364cd31ac9d2dc17f9de2aff98045abcde5e562b04ca5da295d35ac2aef8924eb65a4bbcd42b54ce8da4453383f5b0bcac2e85e3 SHA512 22b15f495c313417e05431516239bd04889d26b05c559b4905f0ad0aac3b8e4053a6bdc19e1c8e0c192f3b65c200cf5e3074db15011e01e4deaa4c13070418ef
@@ -22,5 +22,5 @@ AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
 EBUILD agg-2.5-r2.ebuild 1454 BLAKE2B 1d95a5d65345a7067479902e3cdf28798f8b19b43844b56e551b6f207efb78fca89000dffaaac465b7bb2d73e0c131010b274398525f7766f95909b77af5109d SHA512 5d7061a7fd9bc19a37e6a249fb1019ed1801f2e18efe796188a83f868e79f8d29e052088d853485aba1f82db6113087ae257a67abf13d3774f21d681fd915743
-EBUILD agg-2.5-r3.ebuild 1310 BLAKE2B b38e25771857f92a380258ede6e816595f69944f332c3b08d347b45cd0dd2f4bf82062159a945497f2dfead1de0d545794612e0cc3ad4ecd6e5ab22489cc207a SHA512 65b75c8ada4e082900e91790e64534412d0f771be45f4ea18a5aafe022ca1fd751a1b9fb1f752f88b769bcb15ab55fc030c7c0908b75ec2002dee8d44caeec7c
+EBUILD agg-2.5-r3.ebuild 1309 BLAKE2B c340f8f36959309a51dc51d24d5fbb85e998dae4e451723c4cedadddab238e3d8da5db503f04e4778fea4f6c1997f8660beb508760ed8e1f7907fde948e38af3 SHA512 30d7648d35753d574028f92a96399a964cf0c7e28bf48e26db136465b3a359e9bb77881d592250eed5b45d91b3432104807dc8fb96878f16f7811af4380d22de
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 0925c837a906..de2db3f9f25a 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-sdl-m4.patch
 	"${FILESDIR}"/${P}-sdl-automagic.patch
-	"${FILESDIR}"/${PVR}
+	"${FILESDIR}"/${PV}
 )
 
 src_prepare() {
diff --git a/x11-libs/agg/files/2.5-r3/0001-Fix-non-terminating-loop-conditions-when-len-1.patch b/x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
index eaf0467fb846..eaf0467fb846 100644
--- a/x11-libs/agg/files/2.5-r3/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
+++ b/x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
diff --git a/x11-libs/agg/files/2.5-r3/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch b/x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
index 4fe74341ed6b..4fe74341ed6b 100644
--- a/x11-libs/agg/files/2.5-r3/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
+++ b/x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
diff --git a/x11-libs/agg/files/2.5-r3/0003-Get-coordinates-from-previous-vertex-if-last-command.patch b/x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
index b12684d18d2d..b12684d18d2d 100644
--- a/x11-libs/agg/files/2.5-r3/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
+++ b/x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
diff --git a/x11-libs/agg/files/2.5-r3/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch b/x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
index 0cecaf794860..0cecaf794860 100644
--- a/x11-libs/agg/files/2.5-r3/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
+++ b/x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
diff --git a/x11-libs/agg/files/2.5-r3/0005-Remove-VC-6-workaround.patch b/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch
index f38f7c40d0dd..f38f7c40d0dd 100644
--- a/x11-libs/agg/files/2.5-r3/0005-Remove-VC-6-workaround.patch
+++ b/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch
diff --git a/x11-libs/agg/files/2.5-r3/0006-Implement-grain-merge-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch
index f1e465b4d3a8..f1e465b4d3a8 100644
--- a/x11-libs/agg/files/2.5-r3/0006-Implement-grain-merge-blending-mode-GIMP.patch
+++ b/x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch
diff --git a/x11-libs/agg/files/2.5-r3/0007-Implement-grain-extract-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch
index cafb36eb032d..cafb36eb032d 100644
--- a/x11-libs/agg/files/2.5-r3/0007-Implement-grain-extract-blending-mode-GIMP.patch
+++ b/x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch
diff --git a/x11-libs/agg/files/2.5-r3/0008-Declare-multiplication-and-division-operators-as-con.patch b/x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch
index 0ed92ee6cf98..0ed92ee6cf98 100644
--- a/x11-libs/agg/files/2.5-r3/0008-Declare-multiplication-and-division-operators-as-con.patch
+++ b/x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch
diff --git a/x11-libs/agg/files/2.5-r3/0009-Add-a-static-identity-transformation.patch b/x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch
index 01555cb3afdf..01555cb3afdf 100644
--- a/x11-libs/agg/files/2.5-r3/0009-Add-a-static-identity-transformation.patch
+++ b/x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch
diff --git a/x11-libs/agg/files/2.5-r3/0010-Add-renderer_scanline_aa_alpha.patch b/x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch
index b0be2583fcea..b0be2583fcea 100644
--- a/x11-libs/agg/files/2.5-r3/0010-Add-renderer_scanline_aa_alpha.patch
+++ b/x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch
diff --git a/x11-libs/agg/files/2.5-r3/0011-Avoid-division-by-zero-in-color-burn-mode.patch b/x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch
index 2a0d198fe917..2a0d198fe917 100644
--- a/x11-libs/agg/files/2.5-r3/0011-Avoid-division-by-zero-in-color-burn-mode.patch
+++ b/x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch
diff --git a/x11-libs/agg/files/2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch b/x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch
index b3e641e6f53e..b3e641e6f53e 100644
--- a/x11-libs/agg/files/2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch
+++ b/x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch
diff --git a/x11-libs/agg/files/2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch b/x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
index 9deb9047342d..9deb9047342d 100644
--- a/x11-libs/agg/files/2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
+++ b/x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
diff --git a/x11-libs/agg/files/2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch b/x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
index 547b0d21886a..547b0d21886a 100644
--- a/x11-libs/agg/files/2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
+++ b/x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
diff --git a/x11-libs/agg/files/2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch b/x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
index 6214bd62e3ab..6214bd62e3ab 100644
--- a/x11-libs/agg/files/2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
+++ b/x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 63fefb167eaa..da7a180268fe 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -4,5 +4,5 @@ DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 EBUILD gdk-pixbuf-2.36.11.ebuild 3884 BLAKE2B 8b406fc21b510a6f5fe4303f13a3c4cebc1948f491e6c3ac2648b0beed032b23437e76b96e4d18b4d1fab61c9763b85e95fb43307cb7e6b4e6ec77a3e5389bd7 SHA512 c0f6d46fec0dcb975a86dcac09e583d43126c845c59fe937a7c628f247a0b98ecee4c0e90ebafeeedb696758324824da4f42c3418531bb3c39b33732746c5469
-EBUILD gdk-pixbuf-2.36.12.ebuild 4072 BLAKE2B 7c32759ccdfd757f3c4fc570aa5cfcea278431d7d438a7a873853a6d3086c9a8446c6983449ac1853f1b262ce6c0db5a0757006130884ada825e75dd85d1ec0d SHA512 c8f93f30d3abbac2964425b4ee609c418501df8eb36f05a8c27abd6fcb0769e68a0fce7bc7aeee5251b757020c84a2d0b66814f71ea520c682d29140a7a4f9f8
+EBUILD gdk-pixbuf-2.36.12.ebuild 4073 BLAKE2B 694c75c4b678ff4de976635837ea7295c518a37ce3c5c0d7ee5e70aa268a696969a21d831cc6d42daf741c876c80dd9ccfb03b7eba1031c561a91ad3ef4ee099 SHA512 5013e9e8eddc8b49a9f8237390845a4fa153247d098b936beebc90caa8cd45189db9387993040fb4523257b4e3daca02381d8b654629fd539977c06c7494ae43
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 8b38831cc276..40eaaff31720 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 2ab32d8fb7e2..40bac4b7bbae 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -16,6 +16,6 @@ EBUILD gtk+-2.24.31-r1.ebuild 9847 BLAKE2B 8cbe3d26447c8ab931c65275248227ad64acc
 EBUILD gtk+-2.24.32.ebuild 10009 BLAKE2B 1644b14ebe2ef581138d7340705359dfdcde159a2c9419deeea4bec5aa493b181bc287cbe5eaa4020b1b1d7454dc867f16e5127f5ee97b60b326b33d8be83be1 SHA512 88a6c1e7b4101b9bdffa1a3ff2eb31d944ce9c175bbc5f9ab72172d73db182675ffc2f56a5d7f7a8e9dd792edfcfeaaf6de500abc1f819bb5cb1c2b8d495c681
 EBUILD gtk+-3.22.19.ebuild 6570 BLAKE2B 595194b0e88c2812b45d9399214eb7a436d7248572a4cb72bd742bc45e4a81e4b7e1aa8dd7eb548d410d3901bb9a439c98a12159125056084b08bcb10da11c33 SHA512 f94a69a2b44d3238211e63cf7f72e335d425b8d8d8577f963831eed39a893d558648bba9c3bae3c202c2d26278a7d124e61cc426ff4837d3c1933e9d70b99686
 EBUILD gtk+-3.22.26.ebuild 6752 BLAKE2B ad8b163360e8b06de6d14617f602c32280c624b0dcb524d3d8a5b1f130400ac2e99d664c1793c8360fd66438969f8d0b228f35d1a0e57ab1632fea6b8089583b SHA512 13acbfc400ba56edf340c159df6043c34fac8f316e565aa0dc594400a1438e8f8f2f814333d1c5d175ffc67180c8dcdeff6f958314f87841322cd7d4f0225c4d
-EBUILD gtk+-3.22.29.ebuild 6745 BLAKE2B 2bfa5e1527c0383bdcfeea71f6630fda658fc74ec4f345b0226c905ea78bee90d06f5eb8180db0e1484721500717cad853155668ba3e5bf9cbd524a669e42985 SHA512 d783eb50a899e9cbaf4b7363c46e3a660783107caf6b119c71ea727df3dfc690766d283e93d57e6747e1178a5dc9a34283d4d1b0456f4b0b1568fa9b631f7438
+EBUILD gtk+-3.22.29.ebuild 6746 BLAKE2B f6df4d4d3aca898c7fb2570327360159b54c49d2beb314f9d5ef73e490935d396a82e7c9e1e5dc77f4327c46f1a1d37827ffe0cffffbf47548cc22eb92ba1170 SHA512 e907096e857787f3bf0490efdfcd8ecb5f5bcc22ac9c514d09216d721314bf3f0cf5dbbb03291910fe1f0539692cce76f3255f282d4b7cb3c21df117d33c56d7
 EBUILD gtk+-3.22.30.ebuild 6753 BLAKE2B ecd00ab275bcf7e8a0a1cde84b156e7667fec065f64ee2ae13aef75604a1b64365a61c8aa67df8b7c6cd01579e941c51817ab521ff3968419fcba1c31e461a3f SHA512 2b7f25b0f4d9585ed592644695e0dba51415c7929ae1b1ddba4b9dedf4741f0e94a628210f2d73f07fe8d79c03e8ad975df2b7c889e1b47d493275d2497994bb
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.22.29.ebuild b/x11-libs/gtk+/gtk+-3.22.29.ebuild
index 41f1969b357f..4ace496e1e8a 100644
--- a/x11-libs/gtk+/gtk+-3.22.29.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.29.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index cd7f8df93ed0..845dc3f08600 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -5,5 +5,5 @@ DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57f
 DIST gtksourceview-3.24.7.tar.xz 1390500 BLAKE2B fc8c6695ec94f8c0ff44fbf96fa3c1f8e11d11c9959a8b873d25e420894208444f1f88624d49f7366486039f0e1590692e2b5b0164c08c1358a8ea8b0b4aeaa3 SHA512 d86ef2bea6ae24c128f65e314c82f58265a53309abff22630360b0f5a5f9b640e3fc31fdd58b06221efc28f41c95c0f92613edb8c0a2c8f5c6147d287310a9a2
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.24.6.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
-EBUILD gtksourceview-3.24.7.ebuild 1324 BLAKE2B c552e0d940c99210b5215733f352048be1ccfb151e4983c59fb32caf9c65d558048073911658194163da337fcdde3bcebfa17408eeb1e02cb7a365caabf1c977 SHA512 6ff72d0d692c45c18eb4d3d8ead62e12da77cfb5c063cabd9d70561f23d5c776aa2fe21ddaf2a6fa8ea940d2c359c84d7d03fad014e28b0712dc08935dc31d3d
+EBUILD gtksourceview-3.24.7.ebuild 1325 BLAKE2B afc915eb0c1f746f4d2bb3248939d631db9aad25201eb45d53cb5cbf01d20db55d5b1b34cbe63b1b837f2d86721e3179e2103ae10f7887f53f69800e0ffc59d8 SHA512 bc091a5f1baaab89dee969180ee14d4fd2cf4b2845cb99a8cf9d6d9b083e2847dafa2b9796d79d28a55a61efcbb1b499e3fc12370c7d0af32460dbd1ba90bb17
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
index b9429159e023..6657c3ed1294 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
index 8ce52b8233ad..c4a23fca020f 100644
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -14,5 +14,5 @@ AUX libgksu-2.0.7-libs.patch 3129 BLAKE2B 1ccd6e9fa0dc83c0853375e17c9df1e243b91f
 AUX libgksu-2.0.7-polinguas.patch 749 BLAKE2B 8b8b675686d23cdfc1b30e0cafcb653c4ae3485413f499172f77396f06b1a4dc7da0ec1b8657d0d7926fc6f674b8bd2b033cb809b2451bc7130e215e4a668fb9 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103
 DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573
 EBUILD libgksu-2.0.12-r3.ebuild 2029 BLAKE2B fc8def81a770dae2baf3b2def02f5e94aa741798adf2e4b0d4b202598729959e7af0f83df1a76a79038dc616e0c51ba403826fcb25e52aa2f88ce145ea9d94e3 SHA512 db47d0e8a0184976671ff1b616962ccaa5ca37b61b73d7a83bad2badd5f0799d2d3758edab8276e607018edab1708194516e0c4946f17866031afa6d43fdd089
-EBUILD libgksu-2.0.12-r4.ebuild 2074 BLAKE2B e7c6471f434ed493d0fce1ce5708878be4b7f08b29249b792f72ebad33c6de4564dc8f2d63bb798d23d6c4e948e28adba8dfeeb7671f1863ebd474a392f201d4 SHA512 cc86c6acc430e8eed40f8ebd2f87c5b49549df3d9cd0a69df402c0ff1d9c779636bfccb823e16776222e920c11cd9c2c6397c8474edcd7a6ec2e7e64640e3764
+EBUILD libgksu-2.0.12-r4.ebuild 2075 BLAKE2B ddf44e6175676c049c31cb74e0c653215301ce8b1b6434ac5a3bf67d996ea3d483ee3f2d484b0ea649c696cae68a17ca6dcc0f187b8667b6945630516adc1232 SHA512 0bf03f6d2716d9d9ecb3c89d5fa70356992afa9468cf20a2f134667973e2f2ce1ac4a6165b0db22d4d168cefc8f9d166d0910a0e86abd8b80c8a94a03be2fdc3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
index 2db92390db5d..9fda7eb99527 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="nls static-libs"
 
 COMMON_DEPEND="