gentoo resync : 30.06.2018

33 files changed, 45 insertions, 514 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 4002795441b0..35f7f65b9eb3 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 48fd5faa7567..f4a40f457910 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -6,6 +6,6 @@ DIST gtksourceview-3.24.7.tar.xz 1390500 BLAKE2B fc8c6695ec94f8c0ff44fbf96fa3c1f
 DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4f3ae334f73a8b1dfa0b123067df24bd4f473e326347c99df7dc6c97adbdde8739cb301e45ca70324f6e8de2ce9e1ea973 SHA512 84a02278344f9fe3c1b8f2440c6179feaea53df93061c63023d92bcaa1ec7ff8e95e1f3a463c23d8487c74492469f3dc367bcca3975ef169bf03925ecee7f7ff
 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 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
 EBUILD gtksourceview-3.24.8.ebuild 1331 BLAKE2B 12e4d6f54651c159eb77b492aa771a39c837bf1fcab5412d9557f36dbf896ba519f785dc9a6a228ec314a50cbf888f022132abd58c13fcd041427016759d5afd SHA512 2a323abde1e2c2ca9eb3a6f008410db0222b36f05f8bc367f7d2ae9d088e5bb8c4f65e232ee659548d4dcc78cfd6e3f12fceeeed8369338bc40204978be12b0b
 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..51f9cbe9b683 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/libICE/Manifest b/x11-libs/libICE/Manifest
index 497b9fec776f..b4a55d9c6280 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,3 +1,3 @@
 DIST libICE-1.0.9.tar.bz2 384921 BLAKE2B 701122d9ef6bfa9077f63b35131dc4603964dbb0b7f58bd54ca49e25be24265142d39da4e1f7c72fdf4945dfb358f7b061acb848dfb0c1bcac5973c9fc728a26 SHA512 daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7
-EBUILD libICE-1.0.9-r2.ebuild 752 BLAKE2B 8809067dcda583d12dc859f70977bcabf46ac87fb066c19f99df2d77c2bcb5c0f788a8ac977ca8ab712560b7b4a20f75f07f23b4f88c7cb91c637ed3b18c9b50 SHA512 e6142a74dd12e6d5070a8eba4adb778b33c079d0828bc06d2a890ebb44750a1f71a08550a2c31c35fe83733b978ecb3acaaeef0b0061471b84fb4a474d61b269
+EBUILD libICE-1.0.9-r2.ebuild 751 BLAKE2B 71662feadd866b291028ab790f24d12d618a111cb53bd0ece906a02e5faaa7782082d454aaf5c3c9fec6662becdae81ba41f3ad48bbcbfff0466180c7a0f7ccc SHA512 66b8ce4de26274672a238607e50ff3a48a88fdb7bd30a32aef54b898fc2107a7c7052a1f51a61a869bd824f9c18e446ce2494a4b97f9606b075b2a02d1b4a3f2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libICE/libICE-1.0.9-r2.ebuild b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
index 6aa479cdf05e..15c12557b37c 100644
--- a/x11-libs/libICE/libICE-1.0.9-r2.ebuild
+++ b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 14cb4f249050..8e6e774dd9fe 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,3 @@
 DIST libSM-1.2.2.tar.bz2 348908 BLAKE2B f3d6d40bfb3058000fd13e9f5ed8daa6628ef197d737e9186e66a517d4c0d4238fa65d0f922b9e6b2839a6f37344c64a560b126911679315cb3824c814d474c7 SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca
-EBUILD libSM-1.2.2-r2.ebuild 1728 BLAKE2B 3543de30f0c07a81724f3d26dc0324ed223abf5fe877c5d69a269ff1dcf1c918e54b1a8929d8f094dde607fda7283a831c010d76fe0e66ba7818cc94a32a44bd SHA512 92e4b5c8f5eda145ced9970af7f529d87bcfe1193dd4cecf0670cef79d9afe223473de8320caa1a112f9ec048ebb9d9461edcd8115f732acb6de6c7b5fb5cca9
+EBUILD libSM-1.2.2-r2.ebuild 1727 BLAKE2B aedb5888d95275e61aa2179d1291ad1ba9ca6cbbfa9a2f0b23c06e84f14cc3bfbb667d885b8e39018cd5e3d5c785dfec0560a641ab1bb8cf14d4e478adf49d9c SHA512 ec911af5a1f26857a851068eaace41cd51c131c8a649dd140f7c3661f229b808a59f14616aad776ac63f16f1797baa3a404f457811476f0068fd085b15bdd6f7
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.2-r2.ebuild b/x11-libs/libSM/libSM-1.2.2-r2.ebuild
index bd0fd69552dd..e77426b2a5fa 100644
--- a/x11-libs/libSM/libSM-1.2.2-r2.ebuild
+++ b/x11-libs/libSM/libSM-1.2.2-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Session Management library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index c8b82b3533a8..a31c8d6d0d85 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.2.tar.bz2 290437 BLAKE2B 051218bdfc249d7dcf3d53b3d6e7136b0215b3b445254aba27515ab4813da6b086d09d7be97e35d3f33ece78ecbc003911e671564f492e47d240e1613de5cda5 SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f
-EBUILD libXScrnSaver-1.2.2-r2.ebuild 524 BLAKE2B 7805fc2630257cd0f58b000e6ae9f7d9d664c91b4af6260b757f638fcec34b7de197767f848c6d977ed76d4e0baa30b7d233ee6ae7b3ba9302211ea27e80e7cc SHA512 4f6b5db5a88c3fcfc056b6302f6e9ac97ab3453641107879645fe01d8ce7f9f4fe30eff45455c6d91b1305dc2059fe4fbfbdab9480d6f3794423d53f84c1347e
+EBUILD libXScrnSaver-1.2.2-r2.ebuild 523 BLAKE2B 03c0175b3041459c0d0ae6d050d8ea627b882aada8c0aca08a21f3a0bc3cf632b8127fed0caa553b6a6c05d8a1dfa5e715f8b32a584c15db24e2761ebdf69317 SHA512 a197a8c6ca879a84127120c5851e24ae2b2404548d4fd279d79e308dca01c578dd3a885325c80ca5efee983596437f73c398be180bf700cac6196d3da825e7e3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
index c4535430c85a..76e0d3b4a933 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
index a900b00815e2..5c2b7e24bc7a 100644
--- a/x11-libs/libXfixes/Manifest
+++ b/x11-libs/libXfixes/Manifest
@@ -1,3 +1,3 @@
 DIST libXfixes-5.0.3.tar.bz2 294400 BLAKE2B b9a6ce65bef20c24cd75985d7518ab19d7874419d508f4ca6767fe804adfd0e3baebaab69aa9c201901192b8ff5067f5de8d10362ef5c9b6ec12363553389639 SHA512 72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10
-EBUILD libXfixes-5.0.3-r1.ebuild 528 BLAKE2B 9c4880fb26b2d4049036ac6de66bcaa5798956723c0ca78248d255bbeef9cf04170e1e36d7e01b224f45bdb9b33ec1fde382183edb152766790d9405744bb80c SHA512 62ffc537d2dbfd7f9aa82fb4a1a16b09a919daecd2e504a4ba976e37d69dca9b8e387c3bf87283f499a97d57cfd95d0f4f075ec78eb97f65d607bc686d7f673d
+EBUILD libXfixes-5.0.3-r1.ebuild 527 BLAKE2B 365489bd025929f9f5c3255ccd3b7b7f6daa6731ca0ce0e120892ccb5eee53d4c7470075077a828596df2aac783a38586805551e0486c0e799d02439e5980242 SHA512 3fb3cb5d8099ca834673465c1ee27de00f89e7a4906e19b23d7730af1567630b137c3b4eeda608ae3d656b30a588e1c7e659003852164804babd941aaf60fd6e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index d03439c03c58..a2aafad2172a 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 9ce4c9e7da6b..15f1f74f2a49 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,3 @@
 DIST libXft-2.3.2.tar.bz2 335495 BLAKE2B 9592e82449d3253fc71cb93866275bfbea37988ad7bf05c1d17de14038e48099cbc2569e329daba9354bab1d522dac03077d94e82f561e0747f08bbc08f6a737 SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398
-EBUILD libXft-2.3.2-r1.ebuild 756 BLAKE2B 6ac0edcc141d81fb42053a8a8d36d4227fcc7694a879b73e08da017aeb884168001f1afbe4e4c6ed96e536e31bc5d2076276008bb2759d171ba59a0d5540f946 SHA512 9f97213dd405abee75fd5412da7153e473518e2d3f839cb8b920ac5f5e2ef28f2cc24595ef160b56f181ea7fcdcb31c90aaf159ee6dd6bf6a17f1bc0b76dcf57
+EBUILD libXft-2.3.2-r1.ebuild 755 BLAKE2B 08b09a58e5c9a6572716d56c9c86b793d283ead5c21a5a6bfdee9bef66aa3d72bbbbbd5d4743e5f7af4fa2470823d37c82b028d3bfba2007e523d21d495c68da SHA512 1b22673a7b05432542edbef29909c98dcd32cd5a778514a31ab506b8b1f2e2746aed34dffa1a20a278ffa8d7d6d3f26acebe51fce78fef0df182cb77bd554cfd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.2-r1.ebuild b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
index 7a442c96feb4..8f58a4bd08e0 100644
--- a/x11-libs/libXft/libXft-2.3.2-r1.ebuild
+++ b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xft library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 95a841d573e3..b73088636bc5 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
 DIST libXinerama-1.1.3.tar.bz2 278026 BLAKE2B d44c693cee0dab38918fb4a00803430fa4bbbc985e2cd541187bdbb717a9e3d843254f76e098f415ce4ada575aa271ab7d3ca14c8b590dcc3fe31e615ee0db99 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c
-EBUILD libXinerama-1.1.3-r1.ebuild 538 BLAKE2B 49ddbe2db1c22bb44506b61d816af70b22ace8c537008de06e27dedca84e7d7bfc0df06963089268ffe7cd270275b0530c13bc168121b8a4ab25e62b3ca4bded SHA512 8879ae35313a40f791768d8c1a36089ba8b4ad8d493dc3b628faf147291d7c45815a8ae7530b9a8eb7c09f74ed8377af334ad92288ad3a2aacd24e4b5c197ddd
+EBUILD libXinerama-1.1.3-r1.ebuild 537 BLAKE2B 9f22abefb9b32ae9c3fe5adcf6ca60e6c7691bc71646b9845a398c3c1a1e099929cb53c6372f2cff047216e60e909507de064f5169c9efb494f89e3887d4ca47 SHA512 161b7cc85ba8ed0e606a7a0b4cddfb31ddb6b9276bb654b2222fd2d0f165ec070789afded54727d05932c9435ac59c2c83784ab6eac041cb7832b3b4bd94a63a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
index eaf067e1db43..efa7fb3a6619 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 00e9764bfd0a..d67efc1b52c2 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86dga-1.1.4.tar.bz2 280216 BLAKE2B e67a1e2fafc91cdce5b1d4f4ad2083080656f27fceaf167fcf6626c641f1dd7fa14ebe4f8508042ef0489e0fd689b05f6088487b9eda65995888158452898546 SHA512 58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2
-EBUILD libXxf86dga-1.1.4-r1.ebuild 501 BLAKE2B 54a5934fe8504771b22c2e480fd40e4ebb5a9559c430e6d220158bb7428077a2f80dd45160975c4a3bf7ae5427cf26a3743db8f2b0773e103436db0c21c35f9a SHA512 afa73757ebf8e3fdb694f1b919956f2cd93e5d5c4906a19897f8aae7f47b7bdb2cdbcd218584f3db524d2f76049b1a8f52d6ede9887febd12c8d735adaf3f539
+EBUILD libXxf86dga-1.1.4-r1.ebuild 500 BLAKE2B 21c0be8f011be2de53a59f3300757086e8f59089460091f0557203edac6c80a108249482d3ffb5f8c544cb116640fd58a7f5a6eb1d092bb9111f8bd43e00d16c SHA512 b5f69baa57f912ebe24a153cc74549fac5640fa919b0703a9e6780da11a7278d6ccfa6c1c3692c08f1c95e2e78702d90b92d3d62336221cbd428c252be349463
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
index 9aa79b39f350..435d1ae79aaf 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index afdf872154c7..eb11a69d6b1d 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,5 +1,5 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r2.ebuild 950 BLAKE2B bdefcf9dcf81200064201d7c963fc5e7faf8054963998535b40cb51154c280c142e347dae1ac0a0085355d53a19e638402023cad91876c395b1d3fb6ffc63e38 SHA512 556507266959e0c4ec26395056d86b56345cfaf2027979a89ec28830d58eea9408361c682a5e05cfe363cd6dae960b98be3b06847fc7b7a9a283cee3e1ccc99b
+EBUILD libast-0.7-r2.ebuild 949 BLAKE2B b7dd3edb036b951690c70983d33cf01ce2fb816acb2faef09bde94cdf3681d581d87d28dee24d4e12fc4d20bad54cfe1ea57029f9bafc4c1dd98adc126bcc4da SHA512 d067d1355f62d7a8a7fc601ac1a5bef185e23a0353e7f1a960f4cff0dea39c4772af1191681d63a2c530ade60f1d0719b69f380ee8a46742940387d7ee76862b
 EBUILD libast-0.7.ebuild 956 BLAKE2B 51ad500db03219e1860f4a20c73d283cf25632d9413660f26ef59ea71408ca2003d6b94bd21a2619fa36d70a1280443008b02479af241957e13f101d642e280f SHA512 119258ed0398b0a007795a0889a0d1f57b15dee7135db65703e722c03d58a2da85eaa155eaac2bd8f23c79ad5ec96653a0b802d986e9faa303e50becfe554c16
 EBUILD libast-9999.ebuild 1046 BLAKE2B 961ad3edf0693b6ae5339c82fa0a9410a34b050361f4d5f5d826fc1dffebbccccbc07fd89e9676a2e53246140bb17a2a1de70badaf9842c04a2b95ff624c7dea SHA512 831b2b42607f673510482a48f8a5eb4bbc3fad111945cc3f00a9e6dc578ef65f4dec03fbae504727e2cef4f841f1ba129c9d07a72238b0639be866d4799a4cfe
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r2.ebuild b/x11-libs/libast/libast-0.7-r2.ebuild
index c1751cb774ce..e357c168a6a4 100644
--- a/x11-libs/libast/libast-0.7-r2.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 79f6b510a201..d75110d5444c 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,7 +1,5 @@
-DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06c1686ac07aa08b587bfba761a834e698f033bdb79666ea6ddd6c1f672ce968897c7594e4467c5b6dee644877e SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.42.0.tar.xz 824984 BLAKE2B 2ea7b5d0d95c91b61ad8f841e75d7431f405ba1c1a01acef52364d3143c4e99f6ba66d03b52e7e94d4074edc7a116e4c9ffa16b7538851a82ec0b638c8f83f05 SHA512 32f621f7af65102ddf7f5ad949c1a9da9a559259255de42a6c0e7992b8692088f6701a4e11558c4243edc881cb8907defd6712f4c2bfca4bcadfe1cb5009b59f
-EBUILD pango-1.40.12-r1.ebuild 1675 BLAKE2B ebad2b225bf4182438ce05b45ba8d99dcf89b730c24408e96ad266144007ac9f26559d51d5a42d6c678acf37d24b93fa0707653bf114af614b2d4781a7980337 SHA512 03dd6d7d005e1f7753a630af3be6bc299dbff0832a6200c81b2b2a53e334aeb2ce1cc9ed8a622692c0b78cc60306851dfadf2b57511e1e30892340caf7c0524e
-EBUILD pango-1.40.14-r1.ebuild 1675 BLAKE2B afbf20e48ff6f0164ec598f17485becb136b51ae297c6e4daeaa38c43d63255627cb3c7293916cb7d6a959fed09c5a098f4112394d2d9a410d0f3ff81fb3c15a SHA512 b924bbde81ae8ae830bb049e96b40fc26fc1767e59c2a3dc96fb13828d55feded75198b324ef436e5c850342a36a1f2bd585001b99b9a10aec97df281f7dd925
+EBUILD pango-1.40.14-r1.ebuild 1673 BLAKE2B 8d4c72372d3f255c7009d8cd7c08f2349be8d27b296e284cd953658245330961112e922be2259548156c5fcb2093e73c23db56c4aaa4394f84e02cb1f501a5d1 SHA512 acd957d48ffb92997138360d3449e1759cb8b543d973b46fc2ce45659963bc7a6a7028d1a9ae4f4e2217e32292a382c15f2921c50b9aec6fa1ced5400eefdc8b
 EBUILD pango-1.42.0.ebuild 1731 BLAKE2B f9bb73c5885d5fa2852cdbc67116850fc3f783c0edc924ec34d60c6bfc5b6edfa2e67ca00e48270aed88d8744bbc55558ec3e9709d187accc80a9abc1d72cc15 SHA512 1947849d7c8bf0590964d50271c0356ce8ff07af4fd90eff5dbf90456e980607d43f3cfe3d36d7e774cef56d045f2150dff04de2998e79327df8ce102be1130f
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.12-r1.ebuild b/x11-libs/pango/pango-1.40.12-r1.ebuild
deleted file mode 100644
index fd8b2eb1f4ae..000000000000
--- a/x11-libs/pango/pango-1.40.12-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-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 ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.11.91:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( x11-base/xorg-proto )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/x11-libs/pango/pango-1.40.14-r1.ebuild b/x11-libs/pango/pango-1.40.14-r1.ebuild
index f9569a296132..11af940b9d31 100644
--- a/x11-libs/pango/pango-1.40.14-r1.ebuild
+++ b/x11-libs/pango/pango-1.40.14-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 602015012a05..c4dc2384484b 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,9 +1,5 @@
-AUX qwt-5.2.3-install_qt.patch 963 BLAKE2B 262d227c47490c9638e8837d2f75d59c84afda7ed10cfcaa5ec67638d220d23b6723ca915bfbebdf729cf1f078610c676f4f42a40cf4daa351754c7ab4c3a28c SHA512 e4bd767fd0942dbac0a585f4c6b588faa99f1f38d02fe8db6c3be181c7a7c6955abc874df916ed446dde537f6090ca81610ae49ba55766033bd8bd801808e8e9
 AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201
 AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
-DIST qwt-5.2.3.tar.bz2 1983725 BLAKE2B 24c9d5c9b660ec082266a02da59b89ec0f8f4eea085fa83a3d773a18e452f0be6845d9584d9ddb0e51aa9a2e4f7fe0980a236d36b6930abbbfa7f6b0f9d8e1a9 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49
 DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
-EBUILD qwt-5.2.3-r2.ebuild 2613 BLAKE2B fda982614ccab5f7b36cb731aaf3fe7788d5355407c91dec6d87e213f24b4d652cc03936af928f3d670a988c95f16f1b31e0d2a5bfd4f27f418428b6b90d1d8c SHA512 d1cde98eaebe87e74f0b40f4743d3ba0dd4a446c9998694083bd8514d125dc16cabef377c8a83a24301f51fe7013e3bd1171320a6aaeb6338eed5d0472f4356f
-EBUILD qwt-6.1.3-r1.ebuild 5225 BLAKE2B 051ef65837e20d1b1a6c648c9594929d066472815bbb94ec899f08ee587bc8a86b18eae80fc72187cca46f11838911f9bd48211418f5a869d2e0870ddfcce88b SHA512 7403be5bc87671de3f4cd4da98b4e099d392cbdf65e35d8806ac17ed04a2f40da7af332fc0192215320947155734092833be2b8d138bb2c1d8a9cf27dde060f8
-EBUILD qwt-6.1.3-r2.ebuild 3830 BLAKE2B 34d1fe20e36c4d992de66dcfe7622871f7d57b5baca0e772ffc6ab636b8a79ffca6a73188390b45a963b5546721722439284dbff7222c1a29d95aadf9ed404c8 SHA512 34a8c9681c93bf4c4207a6ecd18db1eed4a96d2b03e88f56e7d1b81f5e7060af518189093f8234c6f9b3fffee56e2720ad89d2284979ec069d3b8b11574d3888
+EBUILD qwt-6.1.3-r2.ebuild 3828 BLAKE2B 9f8166cfdac2931dd2f3d384ec0aba5c55f9e3bc90e291cf6184a7ae24f8ca49ed424fd1b57dd7acfce3cf5cc46b4ec4b893cf9af0387a1a4ad9c41768c8017a SHA512 6447a35b30b0703b5c85aa6836a4e4be5b70ffd7d2f83f0070385640b872b3ec5150e18d7c97b15b8720cebe0f3a7d36497a86f88b5a327ffdec4b338d879fdf
 MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
diff --git a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
deleted file mode 100644
index 48e9385811f8..000000000000
--- a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro
---- qwt-5.2.2/designer/designer.pro.install_qt	2011-08-01 04:28:22.000000000 -0500
-+++ qwt-5.2.2/designer/designer.pro	2012-08-14 11:11:22.569229749 -0500
-@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) {
-         else {
-             SUFFIX_STR = $${RELEASE_SUFFIX}
-         }
-+        LIBNAME         = qwt$${SUFFIX_STR}
-     }
- 
-     TEMPLATE        = lib
-@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) {
-     INCLUDEPATH    += $${QWT_ROOT}/src 
-     DEPENDPATH     += $${QWT_ROOT}/src 
- 
--    LIBNAME         = qwt$${SUFFIX_STR}
-     contains(CONFIG, QwtDll) {
-         win32 {
-             DEFINES += QT_DLL QWT_DLL
-@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) {
- 
-         # Qt 4
- 
--        TARGET    = qwt_designer_plugin$${SUFFIX_STR}
-+        TARGET    = qwt5_designer_plugin$${SUFFIX_STR}
-         CONFIG    += qt designer plugin 
- 
-         RCC_DIR   = resources
diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
deleted file mode 100644
index 73b753b76ec7..000000000000
--- a/x11-libs/qwt/qwt-5.2.3-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multibuild qt4-r2
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-macos"
-SLOT="5"
-IUSE="doc examples static-libs svg"
-
-DEPEND="
-	dev-qt/designer:4
-	dev-qt/qtgui:4
-	doc? ( !<media-libs/coin-3.1.3[doc] )
-	svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-DOCS="CHANGES README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-install_qt.patch
-	sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i ${PN}.prf || die
-
-	cat > qwtconfig.pri <<-EOF
-		target.path = "${EPREFIX}/usr/$(get_libdir)"
-		headers.path = "${EPREFIX}/usr/include/qwt5"
-		doc.path = "${EPREFIX}/usr/share/doc/${PF}"
-		CONFIG += qt warn_on thread release
-		CONFIG += QwtPlot QwtWidgets QwtDesigner
-		VERSION = ${PV}
-		QWT_VERSION = ${PV/_*}
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/share/qt4/mkspecs/features"
-	EOF
-	sed -i -e 's/headers doc/headers/' src/src.pro || die
-	use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
-
-	MULTIBUILD_VARIANTS=( )
-	use static-libs && MULTIBUILD_VARIANTS+=( static )
-	MULTIBUILD_VARIANTS+=( shared )
-
-	qt4-r2_src_prepare
-
-	preparation() {
-		cp -rf "${S}" "${BUILD_DIR}" || die
-		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
-			echo "CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
-	}
-
-	multibuild_foreach_variant preparation
-}
-
-src_configure() {
-	multibuild_parallel_foreach_variant run_in_build_dir eqmake4 ${PN}.pro
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
-}
-
-src_test() {
-	testing() {
-		cd examples || die
-		eqmake4 examples.pro
-		emake
-	}
-	multibuild_foreach_variant run_in_build_dir testing
-}
-
-src_install () {
-	multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		rm doc/man/*/*license* || die
-		rm -f doc/man/*/{_,deprecated}* || die
-		doman doc/man/*/*
-		doins -r doc/html
-	fi
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
-			LIBS        += -lqwt
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}5
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
deleted file mode 100644
index dc89fab7124c..000000000000
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multibuild qmake-utils
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4 and Qt5"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6/1.3"
-IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
-	opengl? ( virtual/opengl )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		designer? ( dev-qt/designer:4 )
-		opengl? ( dev-qt/qtopengl:4 )
-		svg? ( dev-qt/qtsvg:4 )
-	)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		designer? ( dev-qt/designer:5 )
-		opengl? ( dev-qt/qtopengl:5 )
-		svg? ( dev-qt/qtsvg:5 )
-	)
-"
-RDEPEND="${DEPEND}
-	!<x11-libs/qwt-5.2.3
-	!x11-libs/qwt:5[doc]
-	doc? ( !<media-libs/coin-3.1.3[doc] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( CHANGES-6.1 README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
-	"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
-)
-
-src_prepare() {
-	cat > qwtconfig.pri <<-EOF
-		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
-		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
-		VERSION = ${PV/_*}
-		QWT_VERSION = ${PV/_*}
-	EOF
-
-	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
-	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
-	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
-	cat > qwtbuild.pri <<-EOF
-		QWT_CONFIG += qt warn_on thread release no_keywords
-	EOF
-
-	MULTIBUILD_VARIANTS=( )
-
-	if use qt4; then
-		use static-libs && MULTIBUILD_VARIANTS+=( qt4-static )
-		MULTIBUILD_VARIANTS+=( qt4-shared )
-	fi
-
-	if use qt5; then
-		use static-libs && MULTIBUILD_VARIANTS+=( qt5-static )
-		MULTIBUILD_VARIANTS+=( qt5-shared )
-	fi
-
-	multibuild_copy_sources
-
-	preparation() {
-		if [[ ${MULTIBUILD_VARIANT} == *-shared ]]; then
-			echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
-		fi
-
-		case "${MULTIBUILD_VARIANT}" in
-			qt4-*)
-				cat >> qwtconfig.pri <<-EOF
-					QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt4_get_plugindir)/designer"
-					QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt4_get_mkspecsdir)/features"
-				EOF
-				sed \
-					-e 's/target doc/target/' \
-					-e "/^TARGET/s:(qwt):(qwt6-qt4):g" \
-					-e "/^TARGET/s:qwt):qwt6-qt4):g" \
-					-i src/src.pro || die
-
-				sed \
-					-e '/qwtAddLibrary/s:(qwt):(qwt6-qt4):g' \
-					-e '/qwtAddLibrary/s:qwt):qwt6-qt4):g' \
-					-i qwt.prf designer/designer.pro examples/examples.pri \
-					textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-
-			;;
-			qt5-*)
-				cat >> qwtconfig.pri <<-EOF
-					QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
-					QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
-				EOF
-				sed \
-					-e 's/target doc/target/' \
-					-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
-					-e "/^TARGET/s:qwt):qwt6-qt5):g" \
-					-i src/src.pro || die
-
-				sed \
-					-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
-					-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
-					-i qwt.prf designer/designer.pro examples/examples.pri \
-					textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-			;;
-		esac
-		default
-	}
-
-	multibuild_foreach_variant run_in_build_dir preparation
-}
-
-src_configure() {
-	configuration() {
-		case "${MULTIBUILD_VARIANT}" in
-			qt4-*)
-				eqmake4
-				;;
-			qt5-*)
-				eqmake5
-				;;
-		esac
-	}
-	multibuild_foreach_variant run_in_build_dir configuration
-}
-
-src_compile() {
-	multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
-	testing() {
-		cd examples || die
-		case "${MULTIBUILD_VARIANT}" in
-			qt4-*)
-				eqmake4 examples.pro
-				;;
-			qt5-*)
-				eqmake5 examples.pro
-				;;
-		esac
-		emake
-	}
-	multibuild_foreach_variant run_in_build_dir testing
-}
-
-src_install () {
-	rm -f doc/man/*/{_,deprecated}* || die
-
-	multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
-
-	if use qt4; then
-		mv "${ED}"/usr/$(get_libdir)/pkgconfig/qwt6{-qt4,}.pc || die
-	fi
-
-	if use mathml; then
-		sed \
-			-e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
-			-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
-	fi
-
-	if use doc; then
-		HTML_DOCS=( doc/html/. )
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-
-	einstalldocs
-
-	mkdir -p "${ED}"/usr/share/man/ || die
-	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
-		rmdir "${ED}"/usr/share/doc/${PF}/man || die
-
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-			LIBS        += -lqwt6
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}6
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index 67e6b47a6949..e651d6ffdcd0 100644
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
 
 LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 SLOT="6/1.3"
 IUSE="designer doc examples mathml opengl static-libs svg"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 4ad5561a7833..66b59b9cea37 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -4,11 +4,9 @@ AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f2041519
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.36.5.tar.xz 1017504 BLAKE2B a7a94b389660f9bbf7aa8033e4a5e2cc96c39458e43960ad2ce785f2fbe1597c7156d090aab220e909ae31f8731d0d961686dce08aef0f270581c01de4bf19b0 SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6
-DIST vte-0.46.2.tar.xz 989756 BLAKE2B 5b62ca5425604301f748a214610e2e6e2431f9ad9d21b0867e8d8e34910f1b6c4b77029b57b8255dbd04c6e960aaa2583a2ec670f4683b2331290f22ea957454 SHA512 abcf94752094314b01eb14156e894bedb24f959d4faf84bb070b34eb2745f01d029859ef959ddf1475776605a1721e4d011ae7ad57fc4937d8bfcbecc8b0cf61
 DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 EBUILD vte-0.28.2-r208.ebuild 2973 BLAKE2B 7ee8e830fd6499df69012a9d69cfe21343f46c0c114e47bebba9de573443a60f0def0660e359660d672398c469e61d9804d53e02ebfd6396e28d2fbd361cc821 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560
 EBUILD vte-0.36.5.ebuild 1695 BLAKE2B 3d83e03aa9a8aea1e17db966f44f33e500a60a99c0d2e8fe9113f66ff3b30e8cc9800f5889b6b94140b096bffc8103bc105c6ed9556fa680558b98cdbe52dcb3 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba
-EBUILD vte-0.46.2.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
-EBUILD vte-0.48.4.ebuild 2323 BLAKE2B d8e99e063c974522d88bf81e59ab7e0eea61738f50454de56a74437a8bb1ba9f847665fde901430aeb075491f6d17ce094a0ecfbaf5c27f0e9fc05e458cdfa8d SHA512 eb1c8bb0e685ef86c0dfcd6e9178a9f3ec4aa6e58c152c1c97ce30f647fde93a670b7b0b47c9e6476915b21f4087b2bb47156a6cfed253c7d2fa73a1f50bd145
+EBUILD vte-0.48.4.ebuild 2322 BLAKE2B f75c437f63a047c2f2fa0e5689e3265e972266fe8be323af892c308e45caa6d1cae896c962b98e3aa46c92c5b678a4c821c9be2bf59d668a77c6dc2c9958d704 SHA512 1e4885f624e79ef81252f54151012ac3942bdbac7f37fdbc8136d48cf4a29d4f63ff1927703d0ac32e2ce675187fd7651ce7e47f205d2e6df09fb3914a7ceae7
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.46.2.ebuild b/x11-libs/vte/vte-0.46.2.ebuild
deleted file mode 100644
index a9cad9a2bd1b..000000000000
--- a/x11-libs/vte/vte-0.46.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.24"
-
-inherit eutils gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.91"
-IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libpcre2-10.21
-	>=x11-libs/gtk+-3.8:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-
-	crypt?  ( >=net-libs/gnutls-3.2.7 )
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${RDEPEND}
-	!x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-
-	# build fails because of -Werror with gcc-5.x
-	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Python bindings are via gobject-introspection
-	# Ex: from gi.repository import Vte
-	gnome2_src_configure \
-		--disable-test-application \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_with crypt gnutls) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 88361a8c8e80..4a57aac7e9b7 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
index e890f1bc3de2..dcd3535345c6 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -1,3 +1,4 @@
+AUX xpa-2.1.18-include.patch 249 BLAKE2B 9ddd35eefbcf2c2e538c78dd71047cd31ec384b9d4c394c0bb15a24e20baeed5d65c392fa430364d5ddd24b599d760869cfd45a1e72726b2434e60b5bb00056f SHA512 341980f141b4587e9ab6825976c302ec3d831cdd761fc52be13fec9736045532b7ff10dc9969d7cd2dbe631ba2e5d35dcfbfca5700c13e6a678df1c27ff7a540
 AUX xpa-2.1.18-makefile.patch 3382 BLAKE2B fda26e82e3179838cc79d97e469b85a576e9b43419de58238950ddbd10c34294cb84fe70f29d2a5bb7387d7c6677abf4f9a5504a47f48aae2bfa73cac7abcb96 SHA512 f13a64cd033fdd7a9bd087ad4edceb222f89b3d363cefaca38a710d08a9117754be95e5b1aea0bfcb145e31b232ab6600cd8a70aea98da3c6fe4ad5b6f9fb392
 AUX xpa-2.1.8-makefile.patch 2594 BLAKE2B 51fb3835820aaf3aea51b04e88fc357e727e425fe6029b9f8a7d9fd10647d9491a18fe9f6115e20557e4fbc23e88a99c2d7c7f2b5e7d644383bc4801eeb50032 SHA512 e36e57ffb8ea86c3f646c4cdd7d3e8e304b6fe48f810cc4081a1dde2a367acfb70846160fef75cf020222002961963126e4c8b5a19f7d5cb5796cbee7429ec5e
 DIST xpa-2.1.15.tar.gz 861859 BLAKE2B 4ca3dd5dbfe6c5a39c1ed73db287d3fb4fe0e0eb1ec61086a7990f4a902a2a98e187e9ef34e1025861ed98fbce3d8ec644bd2d171f5698e82c435f91eda8aacc SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8
@@ -5,5 +6,5 @@ DIST xpa-2.1.17.tar.gz 900465 BLAKE2B 0f61b40ef9944497286afe7f0f3a5c54d9db5d8e35
 DIST xpa-2.1.18.tar.gz 900579 BLAKE2B bce33b30235e17309979e6e91d6508286403b476ee890c437985a434145992c442b1b3fd923da2658bb7d0dd6656ffa93bc20d2e8ff8bedb7438b9cbfa48e6a1 SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19
 EBUILD xpa-2.1.15.ebuild 1269 BLAKE2B b50966b3d10313517aa7af00e140f3fd8e777b69833279293b2a48556603485e4515c45295f62e576e551e6464f0cc79ea2594a59060ff9760cfa84505f65638 SHA512 d7c83f117056e0331d9d27ad76fbff444a56e83a44ac52633fe4b6aeda56814169d133a3f6a19a48856fa8298835402ab745b5962bf8a6df3db1ecb2f72933e2
 EBUILD xpa-2.1.17.ebuild 1260 BLAKE2B 6a0c3ce42fe22a27caade92bea604599de17a473142b75779f327e41768c925a6abfc0748cd6fa7741bad4ae4bfa33336c4e4530dbd8352795b9966ab62666b2 SHA512 782df296c3dfb3b9b2c827af44f6096c3c3b55048297c1299410ad3b0eb4c2c8be0bf3e26aaa39eb3c8f1ee98ca531c591153b4afa1c30588f39134544d2b605
-EBUILD xpa-2.1.18.ebuild 1174 BLAKE2B b9ecd524c0b26a1af1d6a7ad5a46693cdf47bee653585a123c52d68a2ece5fba6524c60af6ab3125940c14e60094875015e5377a7d538d8e38a443b168c36a25 SHA512 984e00cccaaa108ad212f5c4589cc3f6075f89633c824fa3146838c70a661fdd467511a7d10ac9a19e9d780f1f4d1084b3d323c632a7925ad5cfe3a9a2264da5
+EBUILD xpa-2.1.18.ebuild 1225 BLAKE2B ccbc1d3166154003117d5160dd5e26f1f8b738afbc52e67d400f253d42934b0b4aea622301310129415f6cba816e9b7e2bd9b6e940de134ae291697fced694c2 SHA512 be6b018dc73cde503f02cbf6b7e790a0d52ced075651554877ce1731e08d5de2d1743fa2006543ec78b161be0b0d776fccc13624dc2cafdeccc196244755f5de
 MISC metadata.xml 1072 BLAKE2B 41e28666089a2ea7fb726abcbd92cacee49dce705d193be11e172bf90072429a8d97059682ca5d8d40fc8ad36431e07ad5c2421f6c3d77b6d7861ce3e58e7875 SHA512 64769fd2b90a2dcdcc2de9cc97afae34fc4af8b3a2c7d62c80c17b2491e7a06cf26bcb99e28098e2dc199884f388f08ad1587a63da3c3c9edbfa1dcd1bea94f7
diff --git a/x11-libs/xpa/files/xpa-2.1.18-include.patch b/x11-libs/xpa/files/xpa-2.1.18-include.patch
new file mode 100644
index 000000000000..f020e1815bec
--- /dev/null
+++ b/x11-libs/xpa/files/xpa-2.1.18-include.patch
@@ -0,0 +1,14 @@
+diff --git a/tcl.c b/tcl.c
+index 1dbdad4..acc8d45 100644
+--- a/tcl.c
++++ b/tcl.c
+@@ -2,6 +2,9 @@
+  *	Copyright (c) 1999-2003 Smithsonian Astrophysical Observatory
+  */
+ 
++//declares uintptr_t
++#include<stdint.h>
++
+ #include <xpap.h>
+ 
+ #if HAVE_TCL
diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild
index 45e6b4b73df2..7a48a43e10e7 100644
--- a/x11-libs/xpa/xpa-2.1.18.ebuild
+++ b/x11-libs/xpa/xpa-2.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,10 @@ RDEPEND="
 	x11-libs/libXt:0"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.1.18-makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.18-makefile.patch
+	"${FILESDIR}"/${PN}-2.1.18-include.patch #637346
+)
 
 src_prepare() {
 	default