gentoo resync : 22.04.2018

31 files changed, 36 insertions, 34 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index bd7f7003f9bb..f54475248180 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index bbb78fa749b4..35078156d0ec 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -2,6 +2,6 @@ AUX asis-2016-gentoo.patch 1535 BLAKE2B 726f03a935c9cf26f5fc405ff6d3c18d01405d5b
 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
 DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae061dc6fc693ee8960cd9b4abf68cc398f6b6d7dba864399c8e007aee2a91789614b7d2bf146645a5d983f20c1ccbc64 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f
-EBUILD asis-2016.ebuild 1177 BLAKE2B a1c4bb2c791340e769211b4e372482ba49989937a9d62bd69683d93e2ed13c586d8c8af04217aec71c38b46ff9df3dead8c8a68e6a64f58e7978ac0972086e9c SHA512 ef330e39fec92fc19fde9751d62efb4c6c592b9a676b1dde9f2d05b1112385aff22abcddca435292667e8255a9846555487bc2ca4a41227557980343ef2b5b4e
-EBUILD asis-2017.ebuild 1068 BLAKE2B bd436d8ddd313d92ade00f2e857d7344d116ca2d3ca8adf90f65e1ab0354657152d9d1637772f2fb72af93dbcb879fdf6e3b361b6dde957461aaaa22b7c9cb53 SHA512 d39443bf46659b61431305f1c40cdac3e302d912b3bd6ddfb0ae8e9047605fb86c9cf80cb582fabeca45d2e5eadd09fe1442d3eca9dc147b4c0e6839f33e98ea
+EBUILD asis-2016.ebuild 1175 BLAKE2B c896467c59d095c44b4f7bc83df71be00c5f416e707f08e688cd6770e53767710c456b1fcb75efff4192c52767c6238431e48c207c7ca5e8d19893a19a7dbd2f SHA512 46f43724b8b648f3a5a7d921209a08c59d3a4bdae75b1b4966dfdab8bdfe14cbdde01c2d1cba5e1a91d739a39838931d7ae17e4be486f2e281521cb70023c995
+EBUILD asis-2017.ebuild 1066 BLAKE2B dcca612165bfaa48d636e34606fb4f03eac1cf6fa5651458af91a923317090e5101911af771b82756eb6b0baf0bd6258b0d0c1a212f050f8294eaa8c92b61395 SHA512 6e1c71b2cbefa467fe434dbad8b600244adf6cda2f7cd40ab8497d093e483684591bdf571e6ad03019b90bc40494b7c7ec0b96b2540dc3f23dd3af8a69daeeef
 MISC metadata.xml 691 BLAKE2B 404b4929f2d73b2d8feae8e71107211d82f1b264fade79e88752d3e8e31d9d4321163522cbdcf6223ee2f0f5e04680ad127d9b953e1c5afd6ee8b972458cd9b4 SHA512 ec079b9cfceb47d66966db417e9e6666ca56284413cd9aae3881a488837d9928560d499a4f33fe9b4143281d81dcbdf3a129543c9e7669d4a0da6386d644c1c6
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index 23b81ce68d6b..c83e81adbdf7 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gnat_2016 gnat_2017"
 
 DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
diff --git a/dev-ada/asis/asis-2017.ebuild b/dev-ada/asis/asis-2017.ebuild
index 80f51a94f66e..0f150265f63a 100644
--- a/dev-ada/asis/asis-2017.ebuild
+++ b/dev-ada/asis/asis-2017.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017"
 
 DEPEND="dev-ada/gnat_util[gnat_2017]
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index fc3338fea9de..ef8e69db3a48 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,4 +1,4 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
 DIST aunit-gpl-2017-src.tar.gz 638311 BLAKE2B aa551202677983451d1c8c9f248d85d58f6de442797ee5a3c14d418de1cd8e9a58a82ee7b8bb5b64da924265ef26c64b5d69e86f0103f0721b2c6e007896f6bb SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4
-EBUILD aunit-2017.ebuild 1041 BLAKE2B 483038d5456b72e3ed4cb2fba8f293f93ea90c5687adb35df1b65ba953c7fb2fd8adb2d7aaedfcd3f13aaaec92ff432ed5a991435fc4acccd441c3df87d2f230 SHA512 83f6995c15ae056f7e7343d8a8d73cdd7d9e8d42cc78338dcfc5c269d6a7badb5d2083265e353b1899cc32970de8eed03a79b41fd26c3c114b3d8a06ff00845c
+EBUILD aunit-2017.ebuild 1040 BLAKE2B d90758ca89ce116afcbb613e9496a8c71c736600ae69ee2d9505b9b6b922906ac37300449d406c4062340706ea4064e2198a4dc2c5a3de6339daeba00eb1ae8b SHA512 fbf380c4ede428883249f7661f515b1a91cdb0b828aba2be1a46be443d81134b242375aaf4e3f128fb5c1b41505149a229c16b1b7d5bc0bc627c51775aba0604
 MISC metadata.xml 935 BLAKE2B 5b05b2dd0e33d0d2d5b8876d3c0b0bfbc89678383b9a3c635decd8762340703a2f75a31e6408f901a9173f28469d8d32bbaf471de377abddc23c8a0c869c05f5 SHA512 e7afc9ef7b05532b2230943b0bec08045d3bb2c0ba875679de97ac4e7948bc4853054bf99e303e1a75da0ead1c592c45070175f62678329a4929ab49a3e6f72e
diff --git a/dev-ada/aunit/aunit-2017.ebuild b/dev-ada/aunit/aunit-2017.ebuild
index 611807392daf..b56e55701892 100644
--- a/dev-ada/aunit/aunit-2017.ebuild
+++ b/dev-ada/aunit/aunit-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 812644446a06..cbed62ef8443 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,4 +1,4 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
-EBUILD aws-2017.ebuild 1085 BLAKE2B 246b3f4f09c02670f199ef30d64c52db603dec585cc0004aa97d19707c30288bdb68337f35f261a995c7bb0dff631f9fbdcfac2459a9db689308f93001d08cfa SHA512 d977a0fb250d497c94eab8c421cbda6fd239fbd33de496f9e74809c968ed05627dfad17e03957ac9731436bb6a417d595def27706b4a24eaac40b62f2053250f
+EBUILD aws-2017.ebuild 1083 BLAKE2B 83cc71d74f7a173f693d1ceef8ebfc53a233aa3f989965c6b01e69bd1818a93bf321fa324573fcaa68f671b87dd82ba669b4d796d5cae660d2dbc574e0d4e003 SHA512 4a6f7bb017bb860670066b7b5fe3a1e9d10d32a802a391b3d2df52197ae1918ac38b8c942c5433644e87f28ceccdcb0615f9f91d2fe528e14e5357952ef183e8
 MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 616aa3196af8..77fbba8c7964 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index b3ecf22c7c63..7256f4e9cae4 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,6 +2,6 @@ AUX gnat_util-2016-gentoo.patch 3197 BLAKE2B e5a15c5becd1882fa7649c7b18d628dd38c
 AUX gnat_util-2017-gentoo.patch 2840 BLAKE2B 95e39f8c054cefb2ddc879e44b9e11e49fa91bb3e521440e25ca050e276d3ff067f0d407be29826f550d960cc729f3adabb7d81134906af39c1fb0ce668edec3 SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846
 DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
-EBUILD gnat_util-2016.ebuild 1479 BLAKE2B a0b3ba15210199008c068a530dba8492a457c43db33eb9ab02eab64b12f83a7fc3869325a3b18f3f83d75362452b70f4cf168f2c1eacdad0d1632da51522bec2 SHA512 a290ff99d8db422348daf979642fb3bc600c4584fb4dee4b277dcd1ee454027ae704c64cf099b74a732b01fa57897e3125246db6f99241c3ead53c360f025f42
-EBUILD gnat_util-2017.ebuild 1406 BLAKE2B 9956b599256e1dc5b9fc0e95e2b305490ff8bedc5d6c8083006f03a37b7c061638d628bdcffb93c5d2322a3c64b64ab15a68c5f8d89b9bd5fef66843edc32142 SHA512 49007a153ad6f53269d64272d5a3979c44bac8a61cfdbc2de974794fbd7d19ca9995e41060d429bd5d819e384633939debdefc812e2705bdd55a032968ed9f19
+EBUILD gnat_util-2016.ebuild 1477 BLAKE2B 2b9e5cc94fee078cf11c870198668ef563507bfbeecc8da8553967e2a261685fa8affa89a56ba85a9522c894c263040eacfce0790fb5e11a89b4a3c9a70cf683 SHA512 b314664a35c77809172a8ac8fb6d07e565d98877ce9847b082d5386aff279cd87527b199881e84795254e68cde6fcd06f69ace8a3dcb016bc614def523f60957
+EBUILD gnat_util-2017.ebuild 1404 BLAKE2B 7f66ffa00fd9cfc9d4af3e0bafc945582f720d134b9b56ac2939cd9e05423dd944103d1004b7b7bab93a499d40ae7922cd93084f531ab79f5bedd39407b8fac4 SHA512 4c056592777aeaab9f908ee39c6d1f27be12900b73626db628225b4ca6575c3821d51239f75ee15f931dc41a1c55ccef4a772c58a3c96022a4fdd196fcf57c6c
 MISC metadata.xml 1089 BLAKE2B 7c47328868c0760d57201e434899bd832918e6bc68810dabedb061fd4ee2fb16c9908987fc5d90511ebf91f2901a7947ca626001ca242af0ff6f621cb9e03bf5 SHA512 ce4ba6a642deb1e60d84e01c32bba7478554afe4a9c71c32c7131034e82a0ba0c410891e2d1d7e31e33fe27125ba611dc20e716bb0f688658809f05769427ed7
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index f3c2f3a22261..e9a5d9effb9d 100644
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2016.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index 83d2288565aa..28c0e6ebb868 100644
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0"
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index bb769a6bedc5..8e04e0877ac6 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf
 AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
 DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2016.ebuild 3056 BLAKE2B adddbf442f3a3d810304ff12b3d28e75c41ac8cae465168cf658ff1f7f3997d04f1f38381b4cdb1a9a70e799ea7737abf8ada88e9617e79b784e029840cf5e14 SHA512 c107404ff7d4ccb9ea8c034927882288ff35233278f88d760dbf9c2cbb6b1b0ec7b75d63565b162de67aa76dcac899526e7eefa06bb60a7f3d4c07085cc3c8f7
-EBUILD gnatcoll-2017.ebuild 3184 BLAKE2B 4bb17329961af0afda0d1d66650ca85a350be0353670752cf3a94e9863661584455135c591d8a0dcd6faf5e20d60c731ca13c38b2acb468650160362cc403c60 SHA512 d11f55d8fde417a6a22cbc08008452d56898625bc7b10867ba14559aee85d5977551b65d50dfaf03a1e865d6f70b667645d9efa7cbc287099d519d9fdafb28fe
+EBUILD gnatcoll-2016.ebuild 3054 BLAKE2B 7a0bbdff620eba5c2fa4d5741bc16af0e0a041350480740f6c3f3950f853f62ccf1373c11c98d21a290fbcb6b767713fbcb360ec8f59cdb634d1b791f8644284 SHA512 0d86e9b77320282b2c3044bda968465abc1157e114c113ae891776aa0f480c62158f2d7ad94cee2b77b570a4c89440d5b7863c18403886b9b509d88d80652f25
+EBUILD gnatcoll-2017.ebuild 3182 BLAKE2B 232707259e63fed9456d8e0556d6a83fc9a865f4838b484ab7abf63e6f1d2c3787f3851d31336492f9a365fc69023b735c03ea1031e8bd73b22017d1d3deb27f SHA512 befa784e50a609921169fd9f7073fe0098eee30bc2a8ac37e19ff3b355926d2dbc6cea626d14af4513490ec421deb90b35a902ae5f1b3089f7135d743434f0b9
 MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 3865a18e258c..7f73bf715c62 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline
 	+shared sqlite static-libs syslog tools"
 
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 14dc21490465..7340f0455856 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
 	+shared sqlite static-libs syslog tools"
 
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 3d85849dbeb5..336e45aad790 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,4 +1,4 @@
 AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
 DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897
-EBUILD gnatmem-2017.ebuild 854 BLAKE2B 1da9bb4c31ab2c32e1aec324628325e8523c35337e7aa91da0d1c356c4d30d8255c094993deca31ecfd986f963a84912fe5d603363c7681511a0b2e545a9bbf5 SHA512 20ee07c58f5a0bcdc5b6240fe9d6abe47c407d5990f8eb372002b1c2e3c1843b00142f2b925ee99eb69eb000d400fcf965b6c69a210e23094519ecbd8abbf4eb
+EBUILD gnatmem-2017.ebuild 852 BLAKE2B 9c08a8678c1af06e6e1388d17a3d0a740fbd06301bfb9313c832989d71198b6cce7d54051de0c8c92b0bca779a8b96ba030b5eed6bfddf8990230ea91de13eb5 SHA512 fe4ef12c20bcc2e1a17d9b8d5b507a16ec818d636c2de732b1467828f32de133132430422e7519892f95027397c65dd3f2ed959fafa0ff5fe6d661b9851f47f2
 MISC metadata.xml 1138 BLAKE2B 867c1ccc45c510480cc4e93b62534182248cfe2e7aad4e5e8e3c5fef153590c2a9832687a5614786b115145d477ddc74a38008566266fa44e9e5e0a4769332d1 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b
diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild
index a19ddc42b38e..e7d409d86e59 100644
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND=""
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 813c88a4514a..7320d56206f9 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -2,5 +2,5 @@ AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea3
 AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD gprbuild-2017.ebuild 2020 BLAKE2B 2aee2029f19ef0862e4f5d9c496f8b06472a563b8a94b773ae0970e2a5232d18cf6525141a48724a4602077cdf5b9a57ac28730346af8f11b0bb357cc62ff535 SHA512 15727a9c4057bd882bec046e01561b6aaff4d686e964558be4d8511e0bbef647a8faf293ddacc7b14880a87550c595f41e1c5e6ebff6830d82fcb70b35669b6e
+EBUILD gprbuild-2017.ebuild 2019 BLAKE2B f90f05d9e8272399cf3b231631f58df984cdb4d2d3cec2591cb14e1736d218befe14b2b3d1f02ee287f0e6b588b70f3a2ab0d05d0d5404c78645b233b3bcc46b SHA512 6735d6e22ee72d60e7300fc3cd99e7065d3203feddc3a296352bedbecd3f780eba8f776c07bf859404acf24b731387caf44208641b6ec5e8a35ce4b42dc2ce60
 MISC metadata.xml 989 BLAKE2B 5272fa5dfd9ff7de586ce34d17fb928c63c4f674a64abd241e6e74c13772e96a29b28111bc2ca4241ac0c153bfbd2d9930b448237eb33954b0075fab0a6e3739 SHA512 20942ef749ddf04b54263b1a867bbcca05d90152fb556b521919585554455cd7e5ee9b69b6a8221730517d43cf3758b3737bfbe7e923aaab7c93ac3d6b32632d
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild
index 155150160591..a8b5614d4232 100644
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 		-> xmlada-gpl-${PV}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017"
 
 DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 9a35192ec2e9..8fcef2079d62 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,5 +1,5 @@
 AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
-EBUILD gps-2017.ebuild 1787 BLAKE2B 52263fa67bf9d363adbbaa6f2b3c0617514e80069961244513c86356337be7cd9207ec3d85d0a5b89c57f2ee78696ba886403d41a999ff70ea457ba03e145727 SHA512 f97eca6931b6b9639045f65f18a9b1528974cb636607917a66b048853e47b32fcc05f9b63aad8b5c2484b6c3f24743268ca480743a5297a11c7ec07a3a739ce1
+EBUILD gps-2017.ebuild 1946 BLAKE2B 8f1619962738e8d1fe5a60baa3b63bc0318441b95234c0a667d12ad88040a62635b8b46ec94f3598e583dd33a3d88b2bb1f3dcbb191a1c3007eb9efc007144b8 SHA512 67c410fb567b5b82fce282803f5b6292b0b8b221a4f554eab11dd097229e88d614716ee212bf83695721e254892666b1231073d8616da3f2584f3e187fecfc5d
 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
index c33f7a002f7c..6156e0dde66c 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 autotools
+inherit python-single-r1 autotools desktop
 
 MYP=${PN}-gpl-${PV}-src
 
@@ -63,6 +63,7 @@ src_configure() {
 }
 
 src_compile() {
+	ADAFLAGS+=" -fno-strict-aliasing"
 	emake GPRBUILD_FLAGS="-v ${MAKEOPTS} \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
@@ -74,4 +75,5 @@ src_install() {
 		insinto /usr/share/doc
 		doins -r "${WORKDIR}"/gnat-gpl-2017-x86_64-linux-bin/share/doc/gnat
 	fi
+	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
 }
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index f088c311bbc6..ae45c139515d 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,4 +1,4 @@
 AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
-EBUILD gtkada-2017.ebuild 1335 BLAKE2B e2ce77d9ab6b4a11b672b6337c54b2c9749bdee3ac70c56de3b8c2edc62a27015a4e0905b40f39fe99d5aa51b9e5597ff921a79aaecd185bcd3bed8674ed9be5 SHA512 ff5f0237648e8981299ca2b7e998b6a80203cd6326a34a0d24ec6a61f77e67f83d8036d3ff2cb00a247b79b444997c116f84e5f02d08d57c92cbd5aca70da224
+EBUILD gtkada-2017.ebuild 1333 BLAKE2B a010ed72e62dc6eecd7d84595b00174e4f5967a850d6c24e4c6283ad11a968ab46051a646e9f9f37a2aa1735fdbca417f612c85f586b3777c53ddab42c689bd2 SHA512 41db23dbb72e53b3956585cd33ab2a4e9e32c19de079e6ec5907e44b1a7d1166a132465871ba314f90297c5b0f07b9533890f2cdcda3a56621484a476b9ab01b
 MISC metadata.xml 704 BLAKE2B 3dd587570234d4bca6f818611011ff14c2a009d1078dba153bbe9fb1071b3962201ddde374176d4492f7066e978366a1ca1dd030b36c000b7f71281c4b407cac SHA512 3139597952f51ad23e7bdc4dfb49aec1b040016e60d1cb83319388146a503b4ca59a16c800548b32ef41987e631d06103360925c598c8cee2805bd84623e9b52
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 14fad28f455b..967c1a26d68f 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 01b131f9e3c0..ea36acfa6bbf 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,4 +1,4 @@
 AUX langkit-2017-gentoo.patch 2378 BLAKE2B 0fedd0d2f7c2ab7cf75114c32baa7a753aca0bfb1cef9bfc3dbb9a70027b75bb177fcb298ce1d1d35262162a6f10d907ea1f6e5a7ceb4be93dddae3cba6a0d69 SHA512 5a277b01d55f7fb373b5016adf8b7f9514ab1d56fa0faf51eeff5ffd7cccc9c3bbafb2e0747e7122560ea60d38728361851c1a6850016ad6d43f33041ef8f0e1
 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
-EBUILD langkit-2017.ebuild 926 BLAKE2B 6c697c42a17e6c128f2897491eb3dc7c912e51a5c9b9ca0466eaa5bc71c02f26b269d3bb0c1c17b97c44da299bb50ba76f454135abbe378bd0e0171874dde83c SHA512 1097f33040a28ae2cffb39969f39e32705e9de89b295bb661e68ef2b6dfffe04e687bb3aea3f3f3c0aa2461208090b59b7dc85b6b3ba85f992b78b56fcc3204f
+EBUILD langkit-2017.ebuild 924 BLAKE2B 4fde947ea5db44e0e806162a7283bacd4d105d58bd20fcbb68952df7690e5f86c4dd6d998845a977f09808455bdbb29c572649e78addfb41bfe3fb9306ec283c SHA512 3430bc646265ccacc3178ba3f459613e3b0a0f4493b4238a97598158a4dbf7aa81ac5a60e40da380f86a075ce8119fe28770a438273133cef4ca3caa1626348d
 MISC metadata.xml 748 BLAKE2B 29a7b386b6d8d1b2f2bc8fc16739c28129b7886c8cdae6784d54bfaadea87502a5338ed6113f536e7c5701cefb42d5912f6189dccb55ddd704445ae65f5c4176 SHA512 8a3183336e00f01eeb51a5b7d06833599b408801b71713575d83131d39b82c8c74fda8ce133b352dc356135721ef19ca488ef17723172579cd1507d4c1d7c809
diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild
index 01cac92bcd44..df6770a0d6bc 100644
--- a/dev-ada/langkit/langkit-2017.ebuild
+++ b/dev-ada/langkit/langkit-2017.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index f72e4e1cf6f3..35a28942a712 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,4 +1,4 @@
 AUX libadalang-2017-gentoo.patch 521 BLAKE2B 0493204f7a71f9f906017b69b988260add9744888559034e066dd0e33114aaad3c1f69cca23ca59b2c0b2d3503469772a91d6c278595ad8dbda5cf7fb063f8db SHA512 88613409e2ba5aa4e33ae01bdab3ac5298a363732372a33334a85781d1b29d045c7e1207650a1f9a819acad671c5dbfc1d3940a2eda9bf923456dadebb6c9af0
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
-EBUILD libadalang-2017.ebuild 1098 BLAKE2B 9708c27f4c3657fb6fff43d9e4f05b810bd980beb00561b4be1ff59008aef57b3941fa037ed2f60f983ce1dc65f18d23dab254bbfc95ceed4c46e82bdcb6ded6 SHA512 f85ac6a9295c9f5b0b57ec5ef6cda8aa44c0b9256d57daf26d8f5401a7e5f4ed28741e6237eef0dd72c88a066e9a2abdae81233018eb90be33dfe918be7cd412
+EBUILD libadalang-2017.ebuild 1096 BLAKE2B f0ee4b436c3a7c0288e9360ecf392e7f8b2ae9592f4e3e1a2c3cd50f1979849c52bc52835e8b331ed14c7beaa28ca1f794d3d1bed189935644910505b2c70efa SHA512 802a402622df6d21390aa497342ad4b2fd9b8ba18f7cb52a5377909eedb8e47085f9f3df35d16763904cfaf3dd51413c8526d25a04bd0e1bf26477b6d86ec09c
 MISC metadata.xml 692 BLAKE2B e95060511ad72cee837cc1bc5c131d87f137b25928022ac81049c2da9659d23828a229a001339ed83cddde4663dbf6acea2870c2cf802019aee56e620f7cdf83 SHA512 024b1a9f34cbdda3c49d1452ebe0928c1da6eecdc144447db03ba1f9df81d8abe5f27d4898487a1171e2820675d7dfd1ac05074b58869b1601a7042041050505
diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild
index 39c4eae6b6f9..2d97d6c5e909 100644
--- a/dev-ada/libadalang/libadalang-2017.ebuild
+++ b/dev-ada/libadalang/libadalang-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-python/pyyaml
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 2aea15671c21..24f94089c290 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -2,6 +2,6 @@ AUX libgpr-2016-gentoo.patch 2822 BLAKE2B 759977ffe76fefc27c1aecdfe8a8647c78c8c3
 AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c075929fec2207fb654ab191bb6a8995e0c2576c218c59b90b1eb90d330ea7837d032427b9b9495bdd5e98709363070 SHA512 51b82725f94488c06e9a9aece82b9a3df78f7a763ed6ae6055335c0eae802207a698e186fb321261b4c45539c2fba076d08605dd5fc64508d71928210fe80f0c
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-EBUILD libgpr-2016.ebuild 1245 BLAKE2B 2908668e4016bdf12bcf89217bc2ffc84c469e1d170a672a525e217dffb510ce61c716b8752beca0f8acdf83e40d44ab2dd0fa9277365f5baa001bf739836194 SHA512 23c2413bf7fa52030a03f035143769cf2b47ef3156cb9ee4de931fc880d0784018175fc35e31857f3359e1e91f66f7fe38dacc9d47ef23f05ecd1b4948b4ca16
-EBUILD libgpr-2017.ebuild 1390 BLAKE2B 21d4b3cd9e8ae749b615915f10d02fa8ab4afe1c204732c4ee685685138259a8eaf3fb6210d5402899fc0c7022cdf569b146d1cd55ce20659e0fc49f156698f0 SHA512 ee1880e7152ef76c89116e75f6f5e36480f5003ec24f7d006786bd4e14ca607a31634ebad75edf2d96dff146df7060f99c013fed9cf208f31d0c31cdf21fe0ee
+EBUILD libgpr-2016.ebuild 1243 BLAKE2B 68a8d2acd9a75c49cdbfc8828bc004ca4f1a586914302f108fdb655672ea229d965c3d00f08b041c6dc32316627d90a0d9fb1ca9c9126cf9f5fbd51e07043831 SHA512 389b16cbf67e40ef924f50492ac81cecb54eddf25342a435d16cebaf7b3b1be74e86b7ed2539a2c4cbb288f301ed6877998f8c50d5788fb7d075143f9f917349
+EBUILD libgpr-2017.ebuild 1388 BLAKE2B 97c790d84d22f76209bdc4f47a834a190e5faa8f6a3b179bf0d67ef91077e9c98b6a522903ee232a0444dd73a9fb6b8862f2a98155241657193c0175ef03ec93 SHA512 0430a17c2e7250b209cbe9508229a4dc59ff9f3b1f51f2c13de8a6484703946e59ae7380169c0e892b45aa78a5275b987075cf0903ab9e59068e30fab59945ac
 MISC metadata.xml 1107 BLAKE2B dbe4a515d1655167dcef70cd183765b53f31468a439b560194a762bb62370869895569d516ac4eba2cc3ce20696177c448bc1cab41239fa095923ab04fd8a60b SHA512 269d4eac542602f975615593fa979f853c01d4bfaa4c0dd418d3ce3a790c2409897b59ccb25c6266d15bad8b7c0f9674be316731869c49d0b24e10144b350562
diff --git a/dev-ada/libgpr/libgpr-2016.ebuild b/dev-ada/libgpr/libgpr-2016.ebuild
index ffd55ec91705..39fb18af6899 100644
--- a/dev-ada/libgpr/libgpr-2016.ebuild
+++ b/dev-ada/libgpr/libgpr-2016.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
 		-> ${MYP}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=]"
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild
index ff7042a63161..f2ca1d510730 100644
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-2017.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
 		-> ${MYP}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]"
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index b1a5fc12532b..4a0f9b19fc07 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,4 +1,4 @@
 AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD xmlada-2017.ebuild 2121 BLAKE2B a1cc9e55f18a112e90572b51ba109c0c72e4799118eb9f41244373508adc0181f648345c1c5afe84cedb7fb6afbe1d49c4450c777b354f020aa49c00538d0c53 SHA512 56714aa44c0cb17377f40238bfe424911f7453c690f24dbac71ae68ccf304642d22d7e666525a60676613c4f581ebaa09dd64d0753d7e309725aefc0529b9404
+EBUILD xmlada-2017.ebuild 2120 BLAKE2B 075a4fc91c5a68063f01df6fbbadd51ba550cd4e1b6896b0ad4ab5345d920fbab354aa3dff9ad0c5609fa16a25173c7390cc03dce16cc59bf87c7c3335bcd17a SHA512 bb4e8f7623d06eec64d5677bb41ef69e2fe4dd503799c66da37a2d2a42f63ac125900a10c5f04c4ca1e9b19696c4112877ce233f009352f96b53fdb82eb4da7b
 MISC metadata.xml 1075 BLAKE2B f22c55f2e3e81e0284911b281ae3db216682681bada1b3fe2756bf1e3ef85ebf82dfbbfc302657da1914078c56197f179d9f2d0dfe74bd6e61206057543950d2 SHA512 8a290180597185d3f42ecbb09d4d18512a88ffccbc413e5346bf310ab340d927f90db35c574de1eebb87431c8892a04cf96d731a9ab20846a2343ada24e40797
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index e9add07c0f4d..b3ee623ff920 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	^^ ( gnat_2016 gnat_2017 )"