gentoo resync : 13.05.2018

17 files changed, 169 insertions, 14 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6a1fd66977cf..d72e17763233 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest
index e0a6828fe462..4b88dc4b4b9c 100644
--- a/x11-libs/libXres/Manifest
+++ b/x11-libs/libXres/Manifest
@@ -1,5 +1,5 @@
 DIST libXres-1.0.7.tar.bz2 282925 BLAKE2B fe453dfdddba0a07ed2bc086782e8e714d148adcc0316c35329cc1538fd1be53c286ed1aae136095e5b6f2fc57a0b74c06eb49a74375d6444bcbba96e16ab7e5 SHA512 796a79ab694317910442cb10a936711df9dde95764eef11efb8dedc85114977e56409de2f640553f1ad492325df178b8cfbeaeec3f03bf084638c555e44292e0
 DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172
 EBUILD libXres-1.0.7.ebuild 546 BLAKE2B 87f33f90cfb623d0fe605520684093e946c60c27c1be5ef59759b8b1a4c05a16165a4771dc4b4c409dadebb74d7101d41cb71036dca124ed06613160d93cb487 SHA512 5d2df1ef0e9dd10f057a4481c85edb007e940cbd3a63738ccbe2d9795a1fc3b1092767a814bccf25bfbdc6c08793c72a14ca78f226db5c0e31edc682111db489
-EBUILD libXres-1.2.0.ebuild 548 BLAKE2B 2e598cbdc750adb6a1ff3b795d3e0d42ec45868efe2428af2caae4fbbb7a4bc4df074b4aae326ddcd2cfa0090591dfadf0605908deb2f305f0835a8cf34c99ae SHA512 0bfd09a2b5663db9ed2259ad50c9d3eb841455e045b24624c3aa05438479b9f11a2f7e4e9d2073a4793c33d02ad38aa52138bc06afe5e67455f2335776af74e0
+EBUILD libXres-1.2.0.ebuild 547 BLAKE2B ba64d7fa05e7edb166882bbe32a7133fdaf5e40131c09fdcb3279dcaf56b6dee05a7715fddba9daa2c2d36f2bcf3baeb4bb0741caa3e40dd05555933b3358eec SHA512 2a04ab27823d6416aec900fe2ce26c9a3470bdbc5068304831bccc8d42c4615601d89467d77ae0417b8298a4d91a90b0ace4486bebd2aa19189c42cb3437c24a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXres/libXres-1.2.0.ebuild b/x11-libs/libXres/libXres-1.2.0.ebuild
index 129135e7c8a2..effb120a95e8 100644
--- a/x11-libs/libXres/libXres-1.2.0.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/lib/libXRes.git"
 DESCRIPTION="X.Org XRes 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 ~x64-solaris ~x86-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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 2fddc162af5f..0f17dc641a8d 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -2,7 +2,7 @@ DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38
 DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
 DIST libdrm-2.4.92.tar.bz2 821789 BLAKE2B 6cb2b98e43eae6a04c333693c20710e6693d218cce3ac255d935093a83e318fe5aeae3ea0a56e6ccfb615a4f917f83cdcc11bcb5fa8bc3f41c2b57a046919dcb SHA512 9b75584d8957d298125884d490b74c0a641725d17088ba47f3dc2ec9d06519d8387eb464c024ee11712b31b17fb84e1a9a52bd4ebc7c316beb7d2f8711dc9eb2
 EBUILD libdrm-2.4.89.ebuild 1969 BLAKE2B 5b8a863b9dde55ce11e28d3830e50e88623b7789094e46e828ce06e7d056516abba2f5d48365b03cbb816fd12426e0c0e974e97c5d37455ce58dc29bb2cb4105 SHA512 437fbd5cd1c7d550891d36034722a80d27a0af030b050d4dcf614f21fc0043a526b036fec1784d8b11330cca995d688af16d9e2fc03fc5e790eda9c0e2110f67
-EBUILD libdrm-2.4.91.ebuild 2151 BLAKE2B b11486de240babc420ace91a42c6d787d192865dd5b003fe6e91cb3972b6e9c941cd4a14a95999b41e070e96a8910fb674b99e74d667c86bf34b29d3adc47ae1 SHA512 51f1b85a128b15a5ee7b595b60db96bfddfecb7a4af207a134ac39ff35e456e0d3a99b9dd5bedc29ba955c0f232402bd018429425141df3587edd475de900d08
+EBUILD libdrm-2.4.91.ebuild 2150 BLAKE2B e833da26fbcfd7f0d1fd1d572e0ac313c2be1b3a6b37a6b12cbd7e79fd3429c64c71f5fbaddfcf63e344bf67e96494e7eb217793b63db55b4798a0e451ce8bd2 SHA512 ca3f6a076a8476878e95cb2258c965591059b2a1874823a0dad94294aa81b4dff553a502ec54565eafa53615ccaf9c885698e265e4b13b1fda10ecb8dbed4acf
 EBUILD libdrm-2.4.92.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
 EBUILD libdrm-9999.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.91.ebuild b/x11-libs/libdrm/libdrm-2.4.91.ebuild
index 327a502c7c7c..b6d7fc95366c 100644
--- a/x11-libs/libdrm/libdrm-2.4.91.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.91.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 73613d58ad5b..d15cf3e1d746 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -3,5 +3,5 @@ DIST libpciaccess-0.13.5.tar.bz2 381729 BLAKE2B f62a8820493782657c8dcaba32900f0f
 DIST libpciaccess-0.14.tar.bz2 361375 BLAKE2B 05af836e52c7a8e19537a5c246f2dbbfee0a8c078ed0d6c45de6d1cc5f07b70d91b9409846b175da74f31b0e2536e38ffcb65983d79d40a54abc878b679d845d SHA512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b
 EBUILD libpciaccess-0.13.4.ebuild 868 BLAKE2B d9f2e456e788f05c26eec95030f2092f47a1afa4ab5b4f945e25edb6459cdaf5831b376b6eb7f6368391555cd9e9ccfb1ecd8c88bfee8ddab77221d397d102fe SHA512 5fe17935dab18929a01fe41991496751f64a0a8ab87bd95b077cf794158b189272c6745c222be9f0c01e5c6dbbe5cc911d9bb7100e84f1608702dcaf27138d22
 EBUILD libpciaccess-0.13.5.ebuild 877 BLAKE2B 6f3b6ef03c0eecdf5e62b0e13a328eeb3f4e0e86bbe92fa436de03ef3df8d843fc86d2ce2e458b6ca0fe18818b74dba607cab9ed130118b8bda47947d641d9f5 SHA512 79805b3c23a399936dbf77d49408a2966e27d650168451dc9c5bec940e276f6eafa73617a19406cbc24f1c625eeb72078fea9a95715fb103c58f90634c379009
-EBUILD libpciaccess-0.14.ebuild 870 BLAKE2B 84a187664e079a8e12c4e062ea88766c3da3afd4ed54ffe795875ec6e3edb8aad39064da32a1bc53ef53520361245351d0ee573cb67ff9691d23975834ca285a SHA512 f88a355de1a6fcc3f0e8e46ac87dd4e4681aade73fb6e30d731c1d31f416cb3957c66396bee2a8c8394e84943299547276b06acf84528350d666c5b21a50753b
+EBUILD libpciaccess-0.14.ebuild 869 BLAKE2B b23828ad6bcd938423724158bc99f383800c71fb4b6277f121cbcbf8486e6e949dd11de87e46f0d05612a5188aa4d353fc6c18a2f58b7b6841b6abe6fa184e65 SHA512 81522aa7b82e9db17b6225d32f297eb147a2bedae269608284e6c320d0ce5facf362af9fab34f5e5594bdaafb4b5ee10d52f9291e1d4f8eb8c6e90c7244eea72
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
index 0a79e0227662..9f0ffaf2fe62 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index cc71ef0bc377..1aeeb7b9dae9 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -3,5 +3,5 @@ AUX libxcb-1.12-fix-inconsistent-use-tabs-space.patch 2515 BLAKE2B 74b2969e976ce
 DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896
 DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
 EBUILD libxcb-1.12-r2.ebuild 1788 BLAKE2B 005e197d4ab0a47f500f7391b19edaa6992af4f3c42151d40b32a90e55bf520e58f77238fc84abc18bf746797f546519931b46af4263e4727e54b6fd96f72f08 SHA512 d95d60568dccb221be4786eb55c0b35cfce848d6091e8102f382f986af8d1c51a20c57ddc15da29c26fd4f53d661f01dea00475d56a4f697961132908acbbec7
-EBUILD libxcb-1.13.ebuild 1482 BLAKE2B bb391a7fed96fdf98cf2828182d9a93fd1d7b9da89361bd081a9d9ef47f808ad65f13bec710e071d040cf87ded88d0e043fc64cb038857f4d6309dbf24533c54 SHA512 c5a81cc8c4864431fdcb68f69a41a1069b7c90956edff12807adba93610288197a4fcf7170250b4b1756600f263ec807eaf4b7396354c668ea20f074004c28bb
+EBUILD libxcb-1.13.ebuild 1481 BLAKE2B 3252cfff6300ed6abc082487041c06f68ac21ed823b6d947ef26c4c5f0fabdc2367ce02b5e62be27da292a57b82f009a372b70dcdffe41d5c04c67c1eb1238c0 SHA512 0fd3f22b0176bfef908718a37254bff6054145cd163b1a0137884623c62ae8945fbfad192008c9ac2d59d2e5c4652dc2657ddcb8b787f0409bcce3ac681eda88
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
index d61b77d87cec..1cf7f6bf9b02 100644
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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="doc selinux test xkb"
 SLOT="0/1.12"
 
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 82b6f56791f1..f7fde99123bd 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -5,5 +5,5 @@ DIST libxkbcommon-0.8.0.tar.xz 643456 BLAKE2B 37f8e8ccff63354dc37ec26091a7da28f5
 EBUILD libxkbcommon-0.6.0.ebuild 951 BLAKE2B 37edc93a4af4e6f76d0e94e478cee9633ff0c945f7ad8dd5d15ff8d41231f9d6b820e4e001cdd9fd2f2cc0da444281b9637fd0778e6971b5907351f63ffeadcc SHA512 de65aee937a33286f600d70aa94d75b312c3ef54f1234054b26414db5699927108d20ed1b43fd1f4a4e6bb1fa165ca0d568da18b1aee840c40d1a19b25f548ca
 EBUILD libxkbcommon-0.7.1.ebuild 986 BLAKE2B b5fbcb23d89770c2c138623d3e8b57bdc57bfad1de2b63c547fea5b8bf1e43f2759d5d8fcec336873321d87321eb1f5e30bd2ac525ea74b8b04db8c80609f9b5 SHA512 cd5d6383fd37932afc59a79c8018da07e81e706906f384f79bf5bf0603a1c921073add913433fd216c046bacbb7cf4be90991f322d5408aa2513aa59f5564506
 EBUILD libxkbcommon-0.7.2.ebuild 995 BLAKE2B 277162985edb0258a290a6cdc0f3efb7a70f3ab7933cf414ccac08eed25c7b1863502405a5ddf1f55b1a0c37caffbb75d86d5b3cb5e984ae240a5c324c819b89 SHA512 b6fcbfe5723191ebf1390b63b21c49142f952b138e703c5715f693670a8eb8039f5808135ef7ee57d7b84f038d6d12be4c47d758f4aa91e079b37abd56c6f543
-EBUILD libxkbcommon-0.8.0.ebuild 1013 BLAKE2B 086a73f88f328b9c131ba461e72b8a446984741a8a2460566e4386ec355010519f14200797174f1b0f06f2e7210f0817203c8dbac647d64970c6b3a46261ce51 SHA512 154baa7b436af1e5780f649c7e320ca1fa57fa727a889a72808e87cc6b7abfa6c8029b7ffb1ec9473b1ee9123b34e42974c9e780cf974b751cbb7c4746cdaa08
+EBUILD libxkbcommon-0.8.0.ebuild 1011 BLAKE2B bb05354d87b9ac68e56aeb8f3edc8e17267b986985ff49e8738db983eb80e25e5a9bdf28abc366e0a1b1898aebda475e11669e643060ddf0e53a91c0c85aa293 SHA512 bd44580472b1e0fa538d2b95c02c702014c0bfa493277da337f8b981a58c31a9ce6a8a373b2f76b2e715d8601a8c1946f447aded62feb6ea94b31f58e45df127
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
index 501befc861d9..7f5d18b68f41 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
@@ -17,7 +17,7 @@ inherit xorg-2 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 0dd523532645..49f1f4fbd700 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,4 +1,4 @@
 DIST libxkbfile-1.0.9.tar.bz2 348009 BLAKE2B 2b4f398c7ef35ae6fcae8491733669408db98a27c2351514ea1cd0332a34cd995a34d18013c0ed2a70977935ee1dec527f744bd3a01530e6eefcf715752be9e1 SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1
-EBUILD libxkbfile-1.0.9-r1.ebuild 541 BLAKE2B dd765269ffb07ceeccf7c185f5794cfbe2339ba934e512068ce9c210a4ca0170305d870e90909f06925ddbd0515ace4aab4209b5e2093e5b4c0420cc7e4551e5 SHA512 8fc2d376528bc03f62f3a4cb3ec50163924e5ea03f05e266c589f22c1da31946cb0458e1e6683a67641e84e418d49ef1bb12218849fb8efa7275ba2725ecbd45
+EBUILD libxkbfile-1.0.9-r1.ebuild 540 BLAKE2B ed6bfd34655030deef6138d1096d46608a7720f087bde1d5bd3395b5a572f77887f92d7a6d6c510acc86638af3676eedf83bd030335a369dd6af0226189ab0a9 SHA512 53a44e414a40c3f08ac2fbbca67c1129365a5a744d2b8db04093c9f2a947279b8108ae978590a4a826cea041f13a8b48149fac579fcadb2e36e2c760b988ce80
 EBUILD libxkbfile-1.0.9.ebuild 481 BLAKE2B 6d1d85f609322d52bd2c2d8e863d312565f7a44ac43b52b980804e5f1f01dafed3852e97170299444dc675996aea787376aeb81e9c1374e0a22b5937029412fb SHA512 699f1c1b354f820c126118385a8f5322b8d3609f36b3ee4f51d3bb74de85e2e0e64c1bd9f8e71e60bef08685b7011f0f4fd1199797f014f00b9c78883319a323
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
index a2370925c8f8..04384a61af93 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xkbfile 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-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 3340f39ee626..03fbaaf409af 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -3,5 +3,5 @@ DIST libxshmfence-1.2.tar.bz2 267170 BLAKE2B 16e253a9f8e567cab048f8b54838929f8e7
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
 EBUILD libxshmfence-1.1.ebuild 464 BLAKE2B 0688f6dc0549ce92f64ff70181e7f810c79c22a09fe669bbc5224e2cbc8d030b80375ad227b74c8c44b3b35ea9d47f14c0265792e563bb5a99ba3a89baa73ccb SHA512 d4bb938b7975702ea7d979c93c27a34e6e6181c445325b4a750322ef181e3b564f4ba9e08cb797a475bfbb29bb4fd47735c0cd6f8fa299f57b73c1b43134453b
 EBUILD libxshmfence-1.2.ebuild 466 BLAKE2B 26bdef08333387bc8f9a4ad2f358129307e644b34f370de616b6c07e72cf1ae883b428eff2743b7029905a5acf786d61eba8db42c9063b880aed52226806d5d8 SHA512 4003a74a9b05c1813cd078eec0a25c56b6efdc5bc43721a8ae9fa1570a6c9de31ce027d2a8b5615b99c03dc55a9e0dc38eb95212bcd4f2563eecc6b901dbfdb7
-EBUILD libxshmfence-1.3.ebuild 468 BLAKE2B 8f958d3ec9c3d18c118955e29a2be2def91304cca7c1d30d5cec437d70a806c089aa632c6d0a5c1a4ce08f19f0e7ec6ff3c2640cc1b03f977eefcfa6e490bf2b SHA512 8bac60b024485d44ea85b132755d0c0c59638c1ebe34ab7ca04129227e50f855fa27db38f163d1f2eb39bc6778aadecb25f56140a79059a0817d8ae0a92881d2
+EBUILD libxshmfence-1.3.ebuild 467 BLAKE2B a24b9281d272ab63a9dfecfdbc60ad730d22a9f14e422136f9e942e6c06cc471e4f77aa9bffe13c7a7fab45eaf0b70cc8b765bb4d397b12c5285500d70fcee12 SHA512 d0a18a03a0cfc712924d16b1a884be9d4ca9bbd44671d17f2873bfb8fbb091987e31e585ea99b8bbd22cb1dd06253c0e3a2acc7ba0ff8584c0898b14bb6bc6a4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
index 7126dbe2b0c7..956711331662 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index d3a0ec405c29..532f916c7f0e 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -5,4 +5,5 @@ DIST qwt-5.2.3.tar.bz2 1983725 BLAKE2B 24c9d5c9b660ec082266a02da59b89ec0f8f4eea0
 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 5238 BLAKE2B 50bd0fb81fa5b38ff57b0ea19d22ac35a492b6dcbf2fd0c9801c6dc2e54527454cbe7ae82c9c0f5bc9875c68b44ea8af9a975adcd0ddd39b3b067b2ccc3190ee SHA512 1ae81490e6f49e58fa03df9c06e1105f41d2a243632dd83390a525c090a4c58d84bd60614f1e3c35b293d3bd272f8c2443cbfe908a6a2e5cea153560955a2c88
+EBUILD qwt-6.1.3-r2.ebuild 3832 BLAKE2B cae78c7d35232ccbf0ab27114e1125dd8a26d546153f0681b2f00760d9104395fa48383d8b1c9266a44c857856289c4cf62555646e0d94e3b5865df15ec90d2e SHA512 297ecf27893b693a770ab77a15977d4c0e74eafffd31de339d51e221245f3f30fdfa07457363c8e8de2bfa9f1494e6e1fbb23dee60940e654438874cf261296c
 MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
new file mode 100644
index 000000000000..2159276a453a
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -0,0 +1,154 @@
+# 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 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 static-libs svg"
+
+DEPEND="
+	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
+		virtual/opengl
+	)
+	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
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+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_copy_sources
+
+	preparation() {
+		if [[ ${MULTIBUILD_VARIANT} == shared ]]; then
+			echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+		fi
+
+		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
+
+		default
+	}
+
+	multibuild_foreach_variant run_in_build_dir preparation
+}
+
+src_configure() {
+	multibuild_foreach_variant run_in_build_dir eqmake5
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir default
+}
+
+src_test() {
+	testing() {
+		cd examples || die
+		eqmake5 examples.pro
+		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 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
+}