23 files changed, 614 insertions, 82 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
new file mode 100644
index 000000000000..44175fe46323
--- /dev/null
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 8d5f342f4193..32703738236b 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,7 +1,7 @@
-AUX asis-2016-gentoo.patch 1535 SHA256 fd567a8968c1b07113cb2825118a08c26b5c2fe58a8ba9c0074765e2e92d4998 SHA512 7b78b1dc4824242c10f409ab4874c11f8dfcc977d31e1bd63e96915e3f8477efa737e35b6d3c1076f920155b89f51572528e1d309fcf450bdc3353ec32dd6bc2 WHIRLPOOL 57ba73f1908fbb882c87107d8663a04e151871d847d716711f740294b2335ad5d821e76463ce4afbccebf4dc088d47b559e923ed43d2dca2492b433dca24d17a
-AUX asis-2017-gentoo.patch 2030 SHA256 8c457f35942ebe3df8ae9304e9564b4856182a46be8853b33527502b9f674ff9 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9 WHIRLPOOL c235b2df12d9d6251a16cd7aa1a9d54545e634b04486db52513d0e18922b739b3baaa26836028ae752369f4785cc915bba954fd4f0ee67bf389422e553c93f3b
+AUX asis-2016-gentoo.patch 1535 BLAKE2B 726f03a935c9cf26f5fc405ff6d3c18d01405d5b6a61589a45d6cd8f1134646c9e8e57d496428d8e0c9ce613f1756d8bd027e16ab727d605db99ab4301f73da3 SHA512 7b78b1dc4824242c10f409ab4874c11f8dfcc977d31e1bd63e96915e3f8477efa737e35b6d3c1076f920155b89f51572528e1d309fcf450bdc3353ec32dd6bc2
+AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
 DIST asis-gpl-2016-src.tar.gz 5240554 SHA256 3e36e0835e291dafe6dd2246748ed12b449d33044c32209d3af012c83064c38e SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee WHIRLPOOL 12ded099fdf510be75d67795f990b0044ba701595c4a2c858c46cc5dc97d5c380bd9d51c654a18183a77f9cbc1a9bb7a5dea344da471e6a136154da9d7cb558d
 DIST asis-gpl-2017-src.tar.gz 5909758 SHA256 ca84ab53418930e79c54566b2377253d5d557e5a2d6e9d2be00aef0c1d921627 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f WHIRLPOOL 5c179e1b4682fee465e4ac3a32afcd97fd7e88f32488a1f9ad45dadfe14ed5bedd662bae0c8728e9e812adff1ff5d66814f9edc34420b6b81d6de4ec1468e73d
-EBUILD asis-2016.ebuild 994 SHA256 d245a19aa42bc87b92035965d11e41cfd886b5de51577d77a3ae9b7589395d5e SHA512 4210dd53f33676688f62bbfcd16f6acfeec959c1b0d334e445eb354dfd7a9e61002d6409af7ddd0ffd05733c27e5e58c409b84201a5f03caa021d49f28bb41ff WHIRLPOOL afba70cf219247b78d87276f81bfb54e7b9de238038cab4a6adb3a4edff4382e8aaab0a63911f869cee005c35b4c6416bdf7224f5aabe8606dfd90b33f295f27
-EBUILD asis-2017.ebuild 988 SHA256 7d6190644e4f283890e63697ca98b8a9d94f0807b8dab5a06c8013d8c88c6044 SHA512 c72f803b90378348042484400d256291237131b24087a28bda0bd53febfd1d16f02b918820b5b9839e5750718695f5f5eef049b28951c84fcbf9e7c614b8d2ae WHIRLPOOL 655524781e764189d73eb8ee5f03c078cb95ae5415d1aa62a95d868fe8faa94146570364ed26b7653756b3c74c50d9f014144711a66c8e49d1c3c8f3f8b105aa
-MISC metadata.xml 691 SHA256 efd60b58e5581b07b2751113284553bada94cfa7ef8115255b32e211531f5ddf SHA512 ec079b9cfceb47d66966db417e9e6666ca56284413cd9aae3881a488837d9928560d499a4f33fe9b4143281d81dcbdf3a129543c9e7669d4a0da6386d644c1c6 WHIRLPOOL 26694a935aa815603de061e44031742706d0658e0c4e4a57d7e96a0ad698fb1e8a8f13f00fe86cee6cab5b79242e458684ed5930d2347736669c3dd4e2c15c9c
+EBUILD asis-2016.ebuild 994 BLAKE2B bf0ac1acd64296e6ba7e5db3c8b344a9618344f899653dd8ed41bff041816ef87f6e6294e950f257575ba8859516a21164f66999c103faebf66707e8438a17a6 SHA512 4210dd53f33676688f62bbfcd16f6acfeec959c1b0d334e445eb354dfd7a9e61002d6409af7ddd0ffd05733c27e5e58c409b84201a5f03caa021d49f28bb41ff
+EBUILD asis-2017.ebuild 988 BLAKE2B ae4a18e7fec3bf931da7d03b62bbc4d63683fe67df33e1a61227f37ba8ea71572d4a18d124346b0ac7d6c4b0d42d0238ccc4ec75ad19ff2fc67adc2be2867982 SHA512 c72f803b90378348042484400d256291237131b24087a28bda0bd53febfd1d16f02b918820b5b9839e5750718695f5f5eef049b28951c84fcbf9e7c614b8d2ae
+MISC metadata.xml 691 BLAKE2B 404b4929f2d73b2d8feae8e71107211d82f1b264fade79e88752d3e8e31d9d4321163522cbdcf6223ee2f0f5e04680ad127d9b953e1c5afd6ee8b972458cd9b4 SHA512 ec079b9cfceb47d66966db417e9e6666ca56284413cd9aae3881a488837d9928560d499a4f33fe9b4143281d81dcbdf3a129543c9e7669d4a0da6386d644c1c6
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index f789e394ad04..da5c72e95205 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,7 +1,7 @@
-AUX aunit-2016-gentoo.patch 374 SHA256 22d44c42e9a6df441483a1cde87624b25971e2ce257d15fd068af7d9d6466381 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b WHIRLPOOL 43808668390fd8b87b2713f7ee84b2f5b1c8a8fda489a7eb77c9c3557af16dfe2629284a0aaa3de72711bfee31d0a91d5a4623452a1036995eab241ab70941cd
-AUX aunit-2017-gentoo.patch 374 SHA256 22d44c42e9a6df441483a1cde87624b25971e2ce257d15fd068af7d9d6466381 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b WHIRLPOOL 43808668390fd8b87b2713f7ee84b2f5b1c8a8fda489a7eb77c9c3557af16dfe2629284a0aaa3de72711bfee31d0a91d5a4623452a1036995eab241ab70941cd
+AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
+AUX aunit-2017-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
 DIST aunit-gpl-2016-src.tar.gz 393489 SHA256 ba1b86b853daef98190a7dfc9858aedcd4cc85219b310356c02348f32dcc77cf SHA512 94721f04ff721bbb572ede3fe7b8b61f9682ecaec8076eec3a0a27a41d9bab86248921671b7e63656f473f8d4ddb3a44ecdfb19f479073cf2ae378d62dc68190 WHIRLPOOL fae3579197384972872966b16022e0248d23d207a55af63c6e9daf94ba152a403fa2164a7d9b81fb3ba1214583f2b5506acd87708ffb16f7ef4c66d1f14a3e13
 DIST aunit-gpl-2017-src.tar.gz 638311 SHA256 c9a574d5a4a16648b1a9294b0d18deb571841b3bbd3ea3cd3ede4a6896faa0f7 SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4 WHIRLPOOL 4639eb970ca297121b28272d589d3d436c11496d33539a2e336f307888ca63ee96f4d386de870ee3dabeaee1d40e5535b7a78c834c0ab74af4d235f5aae1079c
-EBUILD aunit-2016.ebuild 1021 SHA256 a46e66697bb0350ea452320c5c9b425a18a7563cce7a75410ec47e6cb0e71fe2 SHA512 c930ef72a7242c8bb13db0028337983bc0f17bc48637566003dd04e3459520b1ab164eb0bcea661313dd0ad54a646d54d94179387a48dcecb3c8373ea7c057d9 WHIRLPOOL f488f18bd1c002517e47180b1f74f13b6511dd5ab2a33331044bad03624bdc56a350893f7c4aababa64713c6fbe69dd7e4d2e57755b63146120f72e0f811f735
-EBUILD aunit-2017.ebuild 987 SHA256 167dcf110e6b38d7d30df36b5935b9b86695c17167e7d233d8dbbe855b746d3a SHA512 a81c6a9c4e4a245afd74e9d34f75a8f0889ef660539dc9fe37be33c0b530c96b6d5dc7d1bb864cb88c88974dd4fa720274de918c9d1bd394a3d04d203f7ea0bd WHIRLPOOL b6d5ea2d56106ff16dfd6ef68935997f46f190bfc80d5b644e73154e5b69b91f9ce12a7412ce28f91eefff16b084b7bf9d297110604bdd7b112887cd2cc04fec
-MISC metadata.xml 936 SHA256 a0c5328d39150b15c06d031f3a6263f250a8c2a5b785b7a417da31f62dfcafe4 SHA512 663611206da2bf967532848d961a0f2ea04780cfb0c97d5f62c6693b4af83417b7fa32fa76d3520c1184f8d3239f0f88ed503e778444e901393c3c798b6848cd WHIRLPOOL 357adfaee2f77b03d81039783d71798a4048ab8f8297854912ab91b9faf6dd70f2a5985740018f540ff72579244dd5c062c8a431ff1b09b85184c421f9ed8048
+EBUILD aunit-2016.ebuild 1021 BLAKE2B 7ebfc42ee026e5954409f6c64d72ffbad4a71bcdfb297631a224c73c61675ffc6b20e49481d0e8419bbc867d1797472297ed503ee8b7f868463dbdc2f4924e29 SHA512 c930ef72a7242c8bb13db0028337983bc0f17bc48637566003dd04e3459520b1ab164eb0bcea661313dd0ad54a646d54d94179387a48dcecb3c8373ea7c057d9
+EBUILD aunit-2017.ebuild 987 BLAKE2B 6eac87739925912a24eecb82a84e768863f1c84af2b8cf71b9ff570dcebbb199a93920b14f51931b74131e1518040cbb724c264112524290889e6b1d7bcaf790 SHA512 a81c6a9c4e4a245afd74e9d34f75a8f0889ef660539dc9fe37be33c0b530c96b6d5dc7d1bb864cb88c88974dd4fa720274de918c9d1bd394a3d04d203f7ea0bd
+MISC metadata.xml 936 BLAKE2B 13170b9fadaa4684917e63c6b044418ee4638194886cafab38b2f3d60e1c9c80c10920c90e47a7371344c77654941c8925011fc46cc5e47ee97d05910c04ab54 SHA512 663611206da2bf967532848d961a0f2ea04780cfb0c97d5f62c6693b4af83417b7fa32fa76d3520c1184f8d3239f0f88ed503e778444e901393c3c798b6848cd
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 63e76bc63a06..0e3e17085b05 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,7 +1,7 @@
-AUX aws-2016-gentoo.patch 1510 SHA256 df5fa816a111175aabf77632daca0089b159d47b14278a0db2b1499cf5a0912b SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d WHIRLPOOL 0526ba4602560245ae6c1e3dc839101d5b27b6ab8c3d4871e33c4dc841101901917f251ee01c24300b79aa24e2ad746ea3f8a5608fe5c968ccef2de295156965
-AUX aws-2017-gentoo.patch 1510 SHA256 df5fa816a111175aabf77632daca0089b159d47b14278a0db2b1499cf5a0912b SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d WHIRLPOOL 0526ba4602560245ae6c1e3dc839101d5b27b6ab8c3d4871e33c4dc841101901917f251ee01c24300b79aa24e2ad746ea3f8a5608fe5c968ccef2de295156965
+AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
+AUX aws-2017-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
 DIST aws-gpl-2016-src.tar.gz 15054562 SHA256 310d7a79fba1cf622f6c8d53103226422c788126198911efef09e372d559db32 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b WHIRLPOOL 48428b840149064f96a1656074cfb2f308abdc546ece87d939ab2f95f05e668caafbe9969ab99770909739fe8a4013337cd1ea8b56a7ed06291114c5d812c62f
 DIST aws-gpl-2017-src.tar.gz 12298806 SHA256 f7b2720f31c21c46bf4bca79e0921a4e796e6a4108be1bada1775eb2ba7fd935 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 WHIRLPOOL 41081537d1d017bb19d665c6b134b54b56d4841a98f713a94367c6e57915185f8ed7fe983ef641d79ce0cece09211fbd34220df81953dfee393d70824c5728d0
-EBUILD aws-2016.ebuild 1062 SHA256 d5d67451d4d45faa012d8ee510c3696e407a0718352e88e4e4be7f238eccbfe3 SHA512 fe58623d1d1f86c84d9f79f9c2fd5a98b50637296b0898db633a74726628100a4b5fd6d12019f04718e8b26d1d8593a5ea41c2c1dc15fccf02b078b65e670d2b WHIRLPOOL e583137a45f960af64cca66cff134f44d0f1b7161587320c44b2c75f458d482fdc0a861e2766f003e6fd18ed47682fbfed51d828ae72007bce7f61a8adb43cd8
-EBUILD aws-2017.ebuild 1063 SHA256 c4565496cb859311d4493a7862d12097c1237a8b64b0a4c684e0d3202be71e42 SHA512 eaf0879a32e26dbc58abd5a8a36991a616a14222c3dd6f46661d72f5bed26ead08010a8071c868afd783ce41cc666583e8ceb2c0050e1d341cc7f5179274be7a WHIRLPOOL 9614693f548f7a30be9a65a5b6182391502907a37553819c33dfdc8b15469469b5b7a9ba6bc1a2536897519f54370a541289c4147bbb2948eeebee653c35d8d0
-MISC metadata.xml 842 SHA256 69b8eb5bef931f533a223288a7b68eb9d8667d2b9fd6727ccb3d9f562372631c SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4 WHIRLPOOL b41a890d8d1b12f918a7c46bb4b4edd126170ca2d0d04dd053b483f53fe41f411b920da6ed7553dde128abf60abcdd680ab66e0730b24ecb3ba80cdfbb6fbdd4
+EBUILD aws-2016.ebuild 1062 BLAKE2B 44b9e5049f4380992e3dc308b65d5456e755de8f3e51bbe5df32b715de672c222ea2e421791aac784037d3cbe1e67fb6a2ab3649c029dce78917a0bda730c324 SHA512 fe58623d1d1f86c84d9f79f9c2fd5a98b50637296b0898db633a74726628100a4b5fd6d12019f04718e8b26d1d8593a5ea41c2c1dc15fccf02b078b65e670d2b
+EBUILD aws-2017.ebuild 1063 BLAKE2B 8fa9794d13545a3c1e2c18b77824e1954fe64302bead932eb9ef501606e522a387dca281febf5bbf6364c557ed8c369680b55aa166889fd6161125b96aee622f SHA512 eaf0879a32e26dbc58abd5a8a36991a616a14222c3dd6f46661d72f5bed26ead08010a8071c868afd783ce41cc666583e8ceb2c0050e1d341cc7f5179274be7a
+MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index 3028bce2d91e..ef9b61b43ba8 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -1,7 +1,7 @@
-AUX gnat_util-2016-gentoo.patch 3197 SHA256 ec877b5d0e1a752ec24d7388781203469447e905a9d30f952b5ac8c3dae98f6e SHA512 599d3c2cb1d22513c9ef2200d100a80b55d2efe8d8bf7b541cfb845da2a40d1a8d24234208b92a3fcfeba305cb0157b01576d16129e3979e8869ab4b098bb9f7 WHIRLPOOL 6578cefe98a8a78d24fef87536e9097bed70b19a64f42fdd37bd6050a471ad02db4a07b502658bb53e54f46fd299af95f3413743e11378082888c58d99976263
-AUX gnat_util-2017-gentoo.patch 2840 SHA256 7ffe6b6539da328a659dc85ece5a5722dece27f5fd9b456db72be1616be27a0d SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846 WHIRLPOOL 51dabc47a2f98c0baaf87323e2d5140df02e944386521045d3dea0275582fe72f32ef0eb1fe23b99ce6e2014d42ca013e20af48ffb3f21092c49d05eefe65dce
+AUX gnat_util-2016-gentoo.patch 3197 BLAKE2B e5a15c5becd1882fa7649c7b18d628dd38c7c7c621e34152110b20b658464ca98fcdffaa9ee90224f7d828f7e935d090f47cb446ceb6f898fac76cac6ce19cf4 SHA512 599d3c2cb1d22513c9ef2200d100a80b55d2efe8d8bf7b541cfb845da2a40d1a8d24234208b92a3fcfeba305cb0157b01576d16129e3979e8869ab4b098bb9f7
+AUX gnat_util-2017-gentoo.patch 2840 BLAKE2B 95e39f8c054cefb2ddc879e44b9e11e49fa91bb3e521440e25ca050e276d3ff067f0d407be29826f550d960cc729f3adabb7d81134906af39c1fb0ce668edec3 SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846
 DIST gnat_util-gpl-2016-src.tar.gz 1126296 SHA256 8e76d7eb1cbae1d3040b9e4196ab07d6e0dd5d4eeb3f5e0fbeb267b1a3470af5 SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0 WHIRLPOOL c2218ba14f669aa2412be4e0a42b1ffb475c720e608e73bca3bbe42dcaefe2dc4410c4632e0e900a8c72ed92c3ec670bd35935783f43c1eb0eb2cdb7afc4f63e
 DIST gnat_util-gpl-2017-src.tar.gz 868496 SHA256 46910f4248ebbb6cae5e576cae766768d376fdbf459c55f7efca9ea10d4ea8ad SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a WHIRLPOOL 9db8569a56e5ca61ba9cc76276838bb82b07bd1cf9357540d2716136df85a85144eb4f93c2d8336a67b071cf07dfb7b3c0197a0010442b9d1b65471c057cd0b9
-EBUILD gnat_util-2016.ebuild 1307 SHA256 57d1b143a0b8f8d1f2043f760094619a159817bcf6a8576d92ba5eeaae520fea SHA512 14beff76e4dfa5322e86d26be022d0111db1bcace518752d33d19f06ac42085d462a24172a36d387f0060ddce4fb7f623d973ad925f781500696bba93eba8f5d WHIRLPOOL 8e01ff461cc8eff12d696548d8504362548a4c9920b77bf6c81e2ede04c74c0669e54c4da258a74b6a590096ae5a1ad7ec8d572c83b32f62aafb2765db5d1244
-EBUILD gnat_util-2017.ebuild 1301 SHA256 5d59ce0411e132ebb87b0322350046a42ee78aa05b90c7e1d0c12343f73c19fd SHA512 9e7da34419a6aa471ad45f7faea79bdb264d33ae0d7a2809777beaf897bb476f67f5f1c1679de9cb95895628cc46f874ff76b7c14bc7615c9b0368587878075b WHIRLPOOL 794ab6edaf2bccf17d0602b0fcbfe8c871c99d3af1d0047545f83e02535a4a5d746d6980ee098362b6b66376a7f38824d331c05b901993464250db0adf0f4892
-MISC metadata.xml 1149 SHA256 7caeeaad6896e163a48738d2968dcaab33d9d0c516851ccf83e130faedf2e597 SHA512 d433f228882662e5b896d0ade071d502cee9c260fad096fe2556a5e7c4eb9ce82287edfb0240f96716538160d5403db010712633248bd6c53097951bb899313c WHIRLPOOL cbd35e8cc60e27d4a155072dd2e2e24e12b17839cd65e0ef637d3b0fe7d9365bddbe52fe3c791730c56471bc1422459f172139d4802f7f05ca0885b7800a4ffb
+EBUILD gnat_util-2016.ebuild 1307 BLAKE2B 34468438553683353dc4cf42b4a7c9e36cc5c8d5d2e0baa50e479e9c9f4af22ecb4fee184c764fac7f1f12b5fe929412a41b22a4cc863958794e696f6d954f5c SHA512 14beff76e4dfa5322e86d26be022d0111db1bcace518752d33d19f06ac42085d462a24172a36d387f0060ddce4fb7f623d973ad925f781500696bba93eba8f5d
+EBUILD gnat_util-2017.ebuild 1301 BLAKE2B d55dbca57cd62dd3151df412304a92a54afbb8454a0ae3acc912044ec2dacf18bd8a275ecc68d17ca7d65bd629e0d2f89b96cf88a94401424d3acc0ed133940f SHA512 9e7da34419a6aa471ad45f7faea79bdb264d33ae0d7a2809777beaf897bb476f67f5f1c1679de9cb95895628cc46f874ff76b7c14bc7615c9b0368587878075b
+MISC metadata.xml 1149 BLAKE2B 4dbc973d0a669f2db9c2fee1aad40cd6eab81d453e1cf7805f98a220b8c2f8e91642b4a5e5474befed69357400a7ed70da703f4ce71ba5f3df706c248803fe31 SHA512 d433f228882662e5b896d0ade071d502cee9c260fad096fe2556a5e7c4eb9ce82287edfb0240f96716538160d5403db010712633248bd6c53097951bb899313c
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index b11552018ad0..e5b59f8e61c4 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1,7 +1,7 @@
-AUX gnatcoll-2016-gentoo.patch 14137 SHA256 3d23eaca78f1a5c0ea4d63572d8649264dec0de5a906cf708df8c5f53b0fceb8 SHA512 641da348023eedb141e555148056e591af09ef31954178c128a4627bff80777e3e274663bdc4ea712afc10cd902efb186a0bba9b03b7f67f6655944af83ff8d0 WHIRLPOOL 52d1c1c3ba809c06f804e1fd77b7c1c28b42e747530295d7f00885d70dff7d543c669901b1d45318ff3d6fbeb2609708a0378f9561b9615644ca69c3b9326107
-AUX gnatcoll-2017-gentoo.patch 9485 SHA256 78dd92e685a430b6e5e12e2a833c7d22fefde25804ca19c13d252d55b3686910 SHA512 76a18ca8fb8fb61c5bd5ef4626428ed29b493d86638a278f2ddf673bc27793cf4b3778faf892f530ab1ea67915362802660640309a315166854aac67e7c243b4 WHIRLPOOL 277667b15a019d7552e315d3485ff713b562a98c7818de3d930f9f2c469349301a9135a9a2c0b9e1b6d1676b781dd40666d057fd7f368aed8449212879d4aacb
-DIST gnatcoll-gpl-2016-src.tar.gz 5687584 SHA256 8cc7cc01db548447a78e3d6d35a35867514beb625009abbcd3be124c1e259b3b SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a WHIRLPOOL d37c12bb6242d92104e89b7c1d9a9cd94d802137ee32faa58687700a822db69e2739372376d12032228843c2a5356f8085d6072715b8bc1bda411039d20b55f5
-DIST gnatcoll-gpl-2017-src.tar.gz 5785988 SHA256 66168ee795a67dde3b8a8d0fe6663a776d1bdf50091e6cdd47f3837d89afd434 SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 WHIRLPOOL a0fbda792b282ecb184057efa98332f0b790c9412ba6fec541fbcb8c57cab48f64df6ff81017c283e599cda858d668f5f8fcf5b7bd771c23f34a84a6d16f4c79
-EBUILD gnatcoll-2016.ebuild 2959 SHA256 b5604dd3eec5a40186b48a7d82e6d1346e01d8ab7729ab1860d7911b283ef739 SHA512 2ef7e10aa95aa7a5496af2c758ebd8073e6a13713789b0420a39f5a0cb4a72bdd5ec1f7ff51e63d42ff283ea928796d6185a448801e7afad09ea21a13380f6c7 WHIRLPOOL 642bb23492ddfadc6f1b45fc879c2a9c6a34214889c5b8d29c8c8b59ac997eb26b5ff92d2a2c9bce6b9920f1e3f83750ea96fd5f9ae2f3db1e9da4fc57bbaa32
-EBUILD gnatcoll-2017.ebuild 3101 SHA256 df3479f391b8894e0e08f463bee318974ee2c8094814eaa42aa14e758ffd46d6 SHA512 b52ba1385ca6aaa11661c12934b2c92907d32bc905437199d1150c3878a200f1d7a36fb974ad45c0cfaba820122ed930ceb6d42fd1984d9db35dd9069a892e57 WHIRLPOOL d15dcb2c09ab7a7917caf2567a1aaf5f2a1f395f333fd2b4ca2e02e4f3c06955d56459974b713d987a3eb3c7c1aecdf84ae4b464dd23ca33fad605ec18a13ea4
-MISC metadata.xml 1473 SHA256 896d6ea1ef7786244d3388b9ef64e98ce4b3590fb5897b2b7e6efa0e16809060 SHA512 43c44b85940e585406e90e856f83af23a605d69c3e52af16b17e22eb49de170422a4981c366f19f7554c68a67d4633da117c19eceb8824fa33a7f8e21316ddaa WHIRLPOOL fff7e879571f1770164bf6a8764c5d359d5bcb1293267fa4a2a29089b989ba1e521c618e16cab5683e082f785d654fac6617237be76b523969868b6110fa8b6d
+AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf30c7665b416c0266ed59610886192b2931dde20b3ed605bdcfd5587125755acc229a1739ace97e1a6138a9a30710c SHA512 641da348023eedb141e555148056e591af09ef31954178c128a4627bff80777e3e274663bdc4ea712afc10cd902efb186a0bba9b03b7f67f6655944af83ff8d0
+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 2959 BLAKE2B 879163b9525d76c83e29bd6fb5077f9fc2bb296e9acd6a9390dee6da460be8ff821bfb617cbbb190590bf6a96db72d74aa523f012e4b990d252496753b63d09e SHA512 2ef7e10aa95aa7a5496af2c758ebd8073e6a13713789b0420a39f5a0cb4a72bdd5ec1f7ff51e63d42ff283ea928796d6185a448801e7afad09ea21a13380f6c7
+EBUILD gnatcoll-2017.ebuild 3056 BLAKE2B b1f3ea0230c59c1e568685cc5a3e24efffc9fd0854b95fcc97daf24fbafce1f7816bb633f28cc7222419aa8a97b804a175adea55cbf6018d0ac9ea4d03427abd SHA512 541c6bc787d5e68b017f74be394255e6c5a57bbd6fa2094b9a35e761e787ee3373e2d05e43888bc14690dfdc209add2d35be94ab46d68303d1b799de93f1e00f
+MISC metadata.xml 1473 BLAKE2B dbcae7c0fcf02880fec66bc055d318274499b05714b8065a792f5ff56bd2e4dacc59b77bf7d909495c58f9d667d6703fe8e7594b13993eb0808167ca8bc60d21 SHA512 43c44b85940e585406e90e856f83af23a605d69c3e52af16b17e22eb49de170422a4981c366f19f7554c68a67d4633da117c19eceb8824fa33a7f8e21316ddaa
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
index 2c3efd2c29f0..ecec0b784589 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -222,3 +222,26 @@
     end Compiler;
  
     package Linker is
+--- gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads.old	2017-11-25 14:50:06.919939453 +0100
++++ gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads	2017-11-25 14:50:38.932387204 +0100
+@@ -1917,7 +1917,8 @@
+       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
+       --  The list of source files in Predefined_Source_Path
+ 
+-      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
++      Default_Gnatls : GNAT.Strings.String_Access :=
++         new String'("@GNATLS@");
+       --  The default gnatls command to run.
+ 
+       Xrefs_Subdir : GNAT.Strings.String_Access;
+--- gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb.old	2017-11-25 14:52:47.282170250 +0100
++++ gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb	2017-11-25 14:52:57.691990254 +0100
+@@ -642,7 +642,7 @@
+       GNAT_Version : GNAT.Strings.String_Access;
+    begin
+       Env.Set_Path_From_Gnatls
+-        (Gnatls       => "gnatls",
++        (Gnatls       => "@GNATLS@",
+          GNAT_Version => GNAT_Version,
+          Errors       => Local_On_Error'Unrestricted_Access);
+       Free (GNAT_Version);
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 1be618293414..2064ea175d36 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -18,12 +18,11 @@ KEYWORDS="~amd64"
 IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
 	+shared sqlite static syslog tools"
 
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+RDEPEND="dev-lang/gnat-gpl:6.3.0
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?]
+		dev-ada/gtkada[gnat_2017,shared?,static?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -35,31 +34,31 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgresql? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		>=dev-ada/gprbuild-2017[gnat_2016=,gnat_2017=,shared?,static?]
+		>=dev-ada/gprbuild-2017[gnat_2017,shared?,static?]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2017]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	pygobject? ( gtk )
-	!gnat_2016 gnat_2017"
+	pygobject? ( gtk )"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
+	GCC_PV=6.3.0
 	default
 	mv configure.{in,ac} || die
+	sed -i \
+		-e "s:@GNATLS@:gnatls-${GCC_PV}:g" \
+		src/gnatcoll-projects.ads \
+		src/tools/gnatinspect.adb \
+		|| die
 	eautoreconf
 }
 
 src_configure() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
 	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 5d64fe414ef4..b6c7507ee6f6 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,7 +1,7 @@
-AUX gnatmem-2016-gentoo.patch 3139 SHA256 42fc3485cd7282945101d85f37cfbaabaa0387554c879c0c6f2dfa876bcd16b3 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e WHIRLPOOL cf71a1498b64c418d7385cf9f797de5ed5affeda9f65407a99a73283ce9b4f834c8afe32c7c1892d7a6356365913108a6e87f5d5aae5dc02119133599ec19101
-AUX gnatmem-2017-gentoo.patch 3139 SHA256 42fc3485cd7282945101d85f37cfbaabaa0387554c879c0c6f2dfa876bcd16b3 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e WHIRLPOOL cf71a1498b64c418d7385cf9f797de5ed5affeda9f65407a99a73283ce9b4f834c8afe32c7c1892d7a6356365913108a6e87f5d5aae5dc02119133599ec19101
+AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
+AUX gnatmem-2017-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
 DIST gnatmem-gpl-2016-src.tar.gz 80104 SHA256 bd39c7b18e4f52fdd029b999f7e1af52d01c975063c28ae1ef6875e4fc5e224f SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b WHIRLPOOL 8aee794c18efcbdbb50a4d58b9f247de30dea8d5b0a41034b1e20ad7786eefab5dfd14bf99994340a993d67989eab939ba78097d46933d841686d1bbc68fce0b
 DIST gnatmem-gpl-2017-src.tar.gz 80106 SHA256 11a27a66030b1a074875ccdaa0ffb06e86d687e1904ab0f5922e08bb488e5e7c SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 WHIRLPOOL 6599c8b77e89d7bc1f6b1eea459009aa2626173a7ebe47b65ead3ba76a109699ff8d0f27cfe1cea9fb0a8cb90cf9a897f70cf8af4647f21feec87b422e544c1b
-EBUILD gnatmem-2016.ebuild 798 SHA256 de4cf0d26fcd20f2594664ba9cfccb9d5311fef4d7659b7e93a5faac975b1195 SHA512 aa134d61620fac8b91ab2548f632ab35657c07cf73aa8a4cb93471a2907ea8efaa030f4a5e91b135d5df2ea922587bbc749488db52e08a543d4bc68a747d2e9e WHIRLPOOL 8af40f8a17495f68545896210db96bf9c6ee3bc680edf00cf8bc8e160707d51fc7e7000f2d3194f2d5f65db64cac520cae281ea6663b1562f4650b5988237a0f
-EBUILD gnatmem-2017.ebuild 798 SHA256 a791cc19d04062b5bfc424cd5e2a62bc1dd3d3804d40c5277a936e0466ec12dc SHA512 f1549b01ac1d8a23562e741cc2e1ac4034f49f60c72d247b6a9432d7903b442ad51f1a6bb72c35aa636820388b9c2696323fcd08ff48a92f941bd11906ee169c WHIRLPOOL dabfe74ee24119908b91e2a904f3ec97553eff03f22240df11aef97da37979365b30d7d39400934371e3a9183c6d9ffadce20549e8e536df6dead4aabf86b970
-MISC metadata.xml 1138 SHA256 506f95084c058ea226e7ecb151da5f3ccd7b653b26254004dc668e509c672550 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b WHIRLPOOL 3bd9c99a5e490585aabe20668a17b1689a7800d2ae1f49b148dd2688e3d854e8c80c90c83cf24ca0760cf18eb0bf32a1daa7a655cc5ef9e329166c4ce2155132
+EBUILD gnatmem-2016.ebuild 798 BLAKE2B 6ece7c705de8475e47a7b5e005ba94ec7c298ba77b51dd031a68aede5e82afa2a0e9db36e2a7806ca8737fea220436f5dd5bf1adfa906299f8d8d528453ef909 SHA512 aa134d61620fac8b91ab2548f632ab35657c07cf73aa8a4cb93471a2907ea8efaa030f4a5e91b135d5df2ea922587bbc749488db52e08a543d4bc68a747d2e9e
+EBUILD gnatmem-2017.ebuild 798 BLAKE2B be8f1beeac2846a2b16667fab975cc8ba8d267a22c7baeee234aaa40f27392c92f70ed60f2b3251f8ec977d7ffdd047cd4af7edcb483a4731498be03db6aac54 SHA512 f1549b01ac1d8a23562e741cc2e1ac4034f49f60c72d247b6a9432d7903b442ad51f1a6bb72c35aa636820388b9c2696323fcd08ff48a92f941bd11906ee169c
+MISC metadata.xml 1138 BLAKE2B 867c1ccc45c510480cc4e93b62534182248cfe2e7aad4e5e8e3c5fef153590c2a9832687a5614786b115145d477ddc74a38008566266fa44e9e5e0a4769332d1 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 8f6b8e9258d2..6e518fa6f03a 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,11 +1,11 @@
-AUX gprbuild-2016-gentoo.patch 9724 SHA256 cd4851e1947e5cdd3d998ec870d04c820c230a18338ba8a3fc99cae573f06f78 SHA512 9780407a7c28eff5901284309b079702fe76c27c9ef46e9140dfccd094df5488f4b9a5bdc0db9e3b4fc364d24217aab70fbf682f25ebcad9b4fa650e829afc05 WHIRLPOOL f2721e0d2d5778c5fe42da5212d1fbc305bcef17e85c30456f948509504efbeec72efd0a16e79dcbc3d23efa536ca4ef193f19d227ae24c755e96321b7e8f19f
-AUX gprbuild-2016.xml 4083 SHA256 6c7030e461260862e6de77dbfc9e3f9d8f951b0e8abb4dd31bda4119d47e3a4c SHA512 f6416039c980e7482f8fd45690a68cf190101ebf408bc253332d8a9557ede8d3da5af004fe7f6f2f416e74b6411232c2e17744d20e36cbe50a51d5b21b816b79 WHIRLPOOL f7994e95f9f4f7691026cb355c86eebd4db966de8f4738b42435f73f14c239653f11195c4d4f24eac8400936f7aebe7e1845fac2834fefea02327d5600996e7d
-AUX gprbuild-2017-gentoo.patch 2632 SHA256 0351873c535909794c8fbc25196756cd2b10e22feb3e5ebf0370c9ebab9c8497 SHA512 4c4ccc865e44b329d7565b8e282dd3c0c409040e8052a6494924699680a9174701143b68d9e134a4eb6de565bd3877b4aa8d51d77911b0cfb2872ec9633681cd WHIRLPOOL b02bfc3f12fb641aeeac774f0c1eb8046318b79c6248f468b70eec5126d994c1a92c33fb5dd07adf6df492f731dfab825f33de0bff48c1a37f1a9d4528cbeff3
-AUX gprbuild-2017.xml 3844 SHA256 fe319a46c96c1c15281e9d75a1e41048fe4ab798f8c4620b3663b6a8446d3d6e SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89 WHIRLPOOL fba1b030959fb1f8d18ea5ea05e982c26349fd972c01afb519421cbc1d562816ee0542e8d4525934e4866e362ca88fb11aa5d5c3c6d7948bb84169dc5bc38f26
+AUX gprbuild-2016-gentoo.patch 9724 BLAKE2B 6e37028cfd54bb69f8b28e7f12a1f8756c27231e91ea350badcd409a340febfe8eba982353f98b040fed0128c6c5d0625d6c0fae455714301afb5c2d36ebfa45 SHA512 9780407a7c28eff5901284309b079702fe76c27c9ef46e9140dfccd094df5488f4b9a5bdc0db9e3b4fc364d24217aab70fbf682f25ebcad9b4fa650e829afc05
+AUX gprbuild-2016.xml 4083 BLAKE2B 3380d4e12e4c85c318f971d57d6e4be550a49f18aff5c5254ec1105315e27280db6d388cdb5195f1f48244e9f67c0936c845971c20cfbd56d89c5baa4e0e4d2f SHA512 f6416039c980e7482f8fd45690a68cf190101ebf408bc253332d8a9557ede8d3da5af004fe7f6f2f416e74b6411232c2e17744d20e36cbe50a51d5b21b816b79
+AUX gprbuild-2017-gentoo.patch 2632 BLAKE2B bbc9edc85685bbb4eba6168b61f9a5d192a8a0c0e4626a832159d207b965cea7b9f80d9ecfa6635b7cb90c8ca23b3c429521b254ea3e802276321250b8ce2b2a SHA512 4c4ccc865e44b329d7565b8e282dd3c0c409040e8052a6494924699680a9174701143b68d9e134a4eb6de565bd3877b4aa8d51d77911b0cfb2872ec9633681cd
+AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256 d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e WHIRLPOOL 2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 SHA256 0d0a48b8744e4f7230a85008d8213b583459046395704e8ab8c5cabedbf7c616 SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 WHIRLPOOL 905b3a6d64a7f8a6970586b5d1c010badcc24c42e4b406ed7508e0470920b86d0992e80dc2326b10a314cb27519944f5199a7f0d75e72dae8fb096180c22a781
 DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7
 DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd
-EBUILD gprbuild-2016.ebuild 2506 SHA256 2d71f4bf08204d2350f92bc550e9fd89411ea133cab1cb36efc07a27f82b5ec1 SHA512 4334181f60b48a90f03795eccff460a658c1268a2d3576e0d68894adaf042f6f107d905cac4534958f837b5d60f46fc606aca1243b72a3c2b4491d9f95c44799 WHIRLPOOL 972c304f064a025bc8f347b2c3437da21e8dc51bac5c34878ff50cc7561260beb1db212273e7fac61eb67a53a6fb37bff405dbdcda0f27688806e866e599f45c
-EBUILD gprbuild-2017.ebuild 2993 SHA256 104f406b22eb36289f3168ffa21bbfe6f9569ea90a40c221154456aae3606f35 SHA512 6b31d85097144a6cfcb990ad4153ba090802c0c5cb31b52355c0efc2570bd7f425dcd9da5b5b583584d3995daeecbbacee0bf7f2ed3cd404d219d57013bbabf0 WHIRLPOOL 26eef355a8ba2e4dda92bcdc49e9f8c4701a21514171b8438471d483aa7696f65fe73422e44dd422ac6e98c24ef88775126350dcf7eabb663271b5975735cb96
-MISC metadata.xml 1157 SHA256 99e5595d4691fa5124ba42e93e8c8443396161d34854a27cc2943daf7bceb6d8 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580 WHIRLPOOL b785a432b02183ec7d8ad88675d41ab35147bee3b6fc5892800bce680d346e8335b877c3bdf037642da7e42ff0cee043450c6af33380d429255368ef6b1db390
+EBUILD gprbuild-2016.ebuild 2506 BLAKE2B 05d845e83a0987c47cd5a143317747df42b4337d4a03277bb4f2f40671ba63ecd88bc72a2cac58db9e9c2198c2df24630d07a2b381af3d5743571d919207b00a SHA512 4334181f60b48a90f03795eccff460a658c1268a2d3576e0d68894adaf042f6f107d905cac4534958f837b5d60f46fc606aca1243b72a3c2b4491d9f95c44799
+EBUILD gprbuild-2017.ebuild 2993 BLAKE2B 3f4b62bb614d66cd52ef6de4ec0427b8c541b8da76b20111fec8459524d3fae020d7fd3871f7759485aed437d12c6f170515ae27f4ce726f6de1477787fc1873 SHA512 6b31d85097144a6cfcb990ad4153ba090802c0c5cb31b52355c0efc2570bd7f425dcd9da5b5b583584d3995daeecbbacee0bf7f2ed3cd404d219d57013bbabf0
+MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
diff --git a/dev-ada/gps-bin/Manifest b/dev-ada/gps-bin/Manifest
index 30df2a9a83e9..08bf1b265e1d 100644
--- a/dev-ada/gps-bin/Manifest
+++ b/dev-ada/gps-bin/Manifest
@@ -1,3 +1,3 @@
-DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 SHA256 d083c01e054d0aeda7c67967306cfa5a8df12268664f9098a2d9b331aa24dfe7 SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075 WHIRLPOOL 7802a81533e5faad9c6913a2feae4e57fa4ce54ad7b561b23fbb64fdd9fa4bf3753e3c89e8d8fe15dce7a1294def8a5a4252f6aa66b4aef98d5669c2d08e0dd5
-EBUILD gps-bin-2016.ebuild 1833 SHA256 5a1dbbf2b5aaae1794a732562ee6bef9886c9b92c42e94851f03ac59ed409160 SHA512 4b5c41fa1755570920e91bb2224ce9007656f55b46df3b425dcefd8ffbebdab9ef0814a0214a6d9b197984b5649b30c8858ea69ca66e678cf588544090aeab17 WHIRLPOOL ebc506466f19597f212aa67a7f22f9ecee65a0d9426dcf1b61d3dc9c3eeaaada7739653aedacad2a52a58515b78255d385a4b3dfcc67edd8669a7e31f22a4a02
-MISC metadata.xml 1001 SHA256 75c363fd37ab0a74106e9bbbc284f8d291589736b8a843259965d1fcba9df329 SHA512 5dbed34739c5dd8d3900285af76acf0c0029ace65789be6e94ccee6f67514f8de1c21dfcb7a0ee2990bd9427f5360672367ca865d572363147cf8f586fa25499 WHIRLPOOL d2e359dbe47d55826148e2971a5794807c34cc75992451a23fe09543bf285eb381d00bc732f593f6775a4d4433c3308a6ebaf664b5fe7c6663c2c4aac60ab338
+DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
+EBUILD gps-bin-2016.ebuild 1502 BLAKE2B 9a916b04fdc22f26be3bf7c30daf74bbd9962a717a17268586d481bfe7927e84109a16e162cf24d54e7d39b3bc6e6bbe8417331d0ee22cb23218e28d6fb40199 SHA512 7b90c805cb4b9c66daf018d5bd075c29d9c0e48eb0542d798e1b0fe78e6e007e9571d63d3d4886eeb706ffb8e1a0a6018121913258489343582a298cd9dbd163
+MISC metadata.xml 1020 BLAKE2B 31b305e3aa3f0c87a449779685bc366e34b4c8f63989f5180feaa26df90322b276081b4bb2e10c23c3e7d139dc9b96e48c42ef7145646bcd1ef0ec6c106a06fb SHA512 b5c9fcae1f4d37762f6bb0457b245c60b3b96449f68b9fbd0f4c1d919174c18d3c2a82c26e1d0ca02177cbc2480125aac3ff47b61c2404571e85d0588ca9644e
diff --git a/dev-ada/gps-bin/gps-bin-2016.ebuild b/dev-ada/gps-bin/gps-bin-2016.ebuild
index 25fd9b696789..c8fcc1c78b71 100644
--- a/dev-ada/gps-bin/gps-bin-2016.ebuild
+++ b/dev-ada/gps-bin/gps-bin-2016.ebuild
@@ -17,10 +17,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-ada/gnatcoll[iconv,postgresql,projects,readline,sqlite]
-	dev-ada/gprbuild[shared]
-	dev-db/sqlite
-	dev-lang/gnat-gpl
+	dev-ada/gnatcoll[gnat_2016,iconv,postgresql,projects,readline,sqlite]
 	dev-libs/atk
 	dev-libs/glib
 	dev-libs/gobject-introspection
@@ -38,24 +35,16 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-pkg_setup() {
-	GCC=${ADA:-$(tc-getCC)}
-	GNATLS="${GCC/gcc/gnatls}"
-	GNAT="${GCC/gcc/gnat}"
-	GNATMAKE="${GCC/gcc/gnatmake}"
-	if [[ -z "$(type ${GNATLS} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set ADA=gcc-4.9.4 in make.conf"
-		die "ada compiler not available"
-	fi
-}
-
 src_compile() {
 	:
 }
 
 src_install() {
+	GCC_PV=4.9.4
+	GCC=gcc-${GCC_PV}
+	GNATLS=gnatls-${GCC_PV}
+	GNAT=gnatt-${GCC_PV}
+	GNATMAKE=gnatmake-${GCC_PV}
 	into /opt/${P}
 	dobin bin/gps_exe
 	dobin bin/gps_cli
diff --git a/dev-ada/gps-bin/metadata.xml b/dev-ada/gps-bin/metadata.xml
index ebe9a3559c56..5c70b5a1629a 100644
--- a/dev-ada/gps-bin/metadata.xml
+++ b/dev-ada/gps-bin/metadata.xml
@@ -6,8 +6,17 @@
 		<name>Tupone Alfredo</name>
 	</maintainer>
 	<longdescription lang="en">
-		 GPS, the GNAT Programming Studio, is a cutting-edge Free Software IDE that streamlines the interaction between developers and their software. With its intuitive interface, GPS is easy to use, simplifying source navigation and highlighting the fundamental ideas in the program.
+		GPS, the GNAT Programming Studio, is a cutting-edge Free Software IDE
+		that streamlines the interaction between developers and their software.
+		With its intuitive interface, GPS is easy to use, simplifying source
+		navigation and highlighting the fundamental ideas in the program.
 
-By displaying core application structures, such as call graphs, program entity graphs, and project dependencies, GPS facilitates the development of systems. GPS helps construct reliable code while providing the same interface and behavior across a variety of platforms. Designed by programmers for programmers, GPS is a new kind of IDE that offers the experience of designing software in a uniquely comfortable environment.
+		By displaying core application structures, such as call graphs, program
+		entity graphs, and project dependencies, GPS facilitates the
+		development of systems. GPS helps construct reliable code while
+		providing the same interface and behavior across a variety of
+		platforms. Designed by programmers for programmers, GPS is a new kind
+		of IDE that offers the experience of designing software in a uniquely
+		comfortable environment.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
new file mode 100644
index 000000000000..8fadaae1fe14
--- /dev/null
+++ b/dev-ada/gps/Manifest
@@ -0,0 +1,5 @@
+AUX gps-2017-gentoo.patch 11521 BLAKE2B d036d5b495cf3d08718347f5f2dba6c327cd97aec437b9b82df7808fc6de5ed24100cdfafec0a54bc162e64b17f9ffa868239582c69b57e218ae5efd5c8da4fa SHA512 950f9b27f50b18d30c29babcc212d52577b20ef17acae8ea4d5a1973b18ab6d01a2ba8d70b5693ea03ad0f50e06011aab6ee54f9399e1c58d61793f4f33794bd
+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 1629 BLAKE2B f03738019a930d22c4b7e23cc75b670de32a611a9c93fe770641df68461354a2ca8a4c9b34ba1cd7dc372527e2bda6e157fd7b02fe699d751d95edfb3827e74e SHA512 6b1a443e067c071c2116689e5f0f522d9ced9c4cb8de94a78129ef92593a1eb150ee3263e98841f496876139313b0b89159721b4be37a609eed0d89eadafa8b5
+MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch
new file mode 100644
index 000000000000..e6ff1453189d
--- /dev/null
+++ b/dev-ada/gps/files/gps-2017-gentoo.patch
@@ -0,0 +1,296 @@
+--- gps-9999/aclocal.m4.old	2017-05-13 21:59:20.129039064 +0200
++++ gps-9999/aclocal.m4	2017-05-13 22:02:12.637234659 +0200
+@@ -37,7 +37,7 @@
+   HAVE_GNAT_PROJECT_$1=yes
+ else
+   # Try with "gnatls", in case gprls was not available
+-  if AC_TRY_COMMAND([gnat ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
++  if AC_TRY_COMMAND([@GNAT@ ls -Pconftest.gpr system.ads > /dev/null 2>conftest.out])
+   then
+     HAVE_GNAT_PROJECT_$1=yes
+   else
+@@ -156,7 +156,7 @@
+ 
+ AC_DEFUN(AM_PATH_GNAT,
+ [
+-   AC_PATH_PROG(GNATMAKE, gnatmake, no)
++   AC_PATH_PROG(GNATMAKE, @GNATMAKE@, no)
+ 
+    if test x$GNATMAKE = xno ; then
+       AC_MSG_ERROR(I could not find gnatmake. See the file 'INSTALL' for more details.)
+@@ -279,7 +279,7 @@
+     AC_MSG_RESULT($GTK_PREFIX $GLIB_PREFIX $ATK_PREFIX $PANGO_PREFIX $CAIRO_PREFIX)
+   fi
+ 
+-  AC_PATH_PROG(GNATDRV, gnat, no)
++  AC_PATH_PROG(GNATDRV, @GNAT@, no)
+   min_gtk_version=ifelse([$1], ,2.0.0,$1)
+   AC_MSG_CHECKING(for GtkAda - version >= $min_gtk_version)
+   GTKADA_PRJ=`$GNATDRV ls -vP1 -Pgtkada 2>&1 | grep gtkada.gpr | grep Parsing | cut -d'"' -f2 | head -1`
+--- gps-gps-17.0/templates_parser/templates_parser.gpr.old	2017-05-18 21:34:42.892039427 +0200
++++ gps-gps-17.0/templates_parser/templates_parser.gpr	2017-05-18 21:35:16.661512990 +0200
+@@ -55,7 +55,7 @@
+ 
+    end Naming;
+ 
+-   Common_Options := ("-gnat05");
++   Common_Options := ("-gnat05", "-fPIC");
+    --  Common options used for the Debug and Release modes
+ 
+    Debug_Options :=
+--- gps-gps-17.0/shared.gpr.in.old	2017-05-18 21:35:56.475892075 +0200
++++ gps-gps-17.0/shared.gpr.in	2017-05-18 21:36:24.972447550 +0200
+@@ -24,7 +24,7 @@
+    end IDE;
+ 
+    package Compiler is
+-      Common := ("-g", "-gnat12");
++      Common := ("-g", "-gnat12", "-fPIC");
+       Optimize := ();
+ 
+       case OS is
+@@ -83,6 +83,7 @@
+          when "false" =>
+             null;
+       end case;
++      for Driver use External ("CC", "gcc");
+    end Linker;
+ 
+ end Shared;
+--- gps-gps-17.0/common/common_with_xmlada.gpr.in.old	2017-05-18 21:37:25.302506085 +0200
++++ gps-gps-17.0/common/common_with_xmlada.gpr.in	2017-05-18 21:37:58.472988222 +0200
+@@ -13,7 +13,7 @@
+       for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
+       for Switches ("C") use Shared.Compiler'Switches ("C");
+       for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
+-      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
++      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
+ 
+       No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
+ 
+--- gps-gps-17.0/common/common_no_xmlada.gpr.in.old	2017-05-18 21:37:31.406410812 +0200
++++ gps-gps-17.0/common/common_no_xmlada.gpr.in	2017-05-18 21:38:14.796733359 +0200
+@@ -12,7 +12,7 @@
+       for Switches ("Ada") use Shared.Compiler'Switches ("Ada");
+       for Switches ("C") use Shared.Compiler'Switches ("C");
+       for Switches ("test_htables.adb") use ("-g", "-O2", "-gnatwue");
+-      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg");
++      for Switches ("s-memory.adb") use ("-g", "-O2", "-gnatpg", "-fPIC");
+ 
+       No_Checks := ("-g", "-O2", "-gnat2012", "-gnatpn");
+ 
+--- gps-gps-17.0/widgets/widgets.gpr.old	2017-05-18 22:26:05.117847006 +0200
++++ gps-gps-17.0/widgets/widgets.gpr	2017-05-18 22:21:01.646368091 +0200
+@@ -12,6 +12,7 @@
+    package Compiler extends Shared.Compiler is
+       for Switches ("C") use
+         Shared.Compiler'Switches ("C") & GnatColl_Gtk.Gtk_Include;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package IDE renames Shared.IDE;
+--- gps-gps-17.0/cli/Makefile.old	2017-05-19 08:07:44.591042479 +0200
++++ gps-gps-17.0/cli/Makefile	2017-05-19 08:08:50.086991123 +0200
+@@ -1,8 +1,9 @@
+ GPRBUILD=gprbuild
+ GPRCLEAN=gprclean
++GPRBUILD_FLAGS=0
+ 
+ all default:
+-	$(GPRBUILD) -p -Pcli
++	$(GPRBUILD) $(GPRBUILD_FLAGS) -p -Pcli
+ 
+ clean:
+ 	$(GPRCLEAN) -q -r -Pcli
+--- gps-gps-17.0/gps/gps.gpr.old	2017-05-19 09:24:19.438123599 +0200
++++ gps-gps-17.0/gps/gps.gpr	2017-05-19 09:24:58.639492518 +0200
+@@ -75,7 +75,7 @@
+       end case;
+       for Switches ("Ada") use Linker'Switches ("Ada")
+          & Shared.Linker'Switches ("Ada");
+-
++      for Driver use External ("CC", "gcc");
+       --  for Switches ("Ada") use ("-lgmem");
+       --  for Switches ("Ada") use ("-pg");
+    end Linker;
+--- gps-gps-17.0/testsuite/Makefile.old	2017-05-19 11:08:48.966913663 +0200
++++ gps-gps-17.0/testsuite/Makefile	2017-05-19 11:06:17.245366714 +0200
+@@ -1,5 +1,6 @@
+ GPRBUILD=gprbuild
+ GPRCLEAN=gprclean
++GPRBUILD_FLAGS=
+ 
+ SYS := $(shell gcc -dumpmachine)
+ ifeq ($(OS),Windows_NT)
+@@ -14,7 +14,7 @@
+ endif
+ 
+ all default: package
+-	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
++	$(GPRBUILD) $(GPRBUILD_FLAGS) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
+ 
+ package:
+ 	mkdir -p share/doc
+--- gps-gps-17.0/testsuite/testsuite_drivers.gpr.old	2017-05-19 11:21:20.645705481 +0200
++++ gps-gps-17.0/testsuite/testsuite_drivers.gpr	2017-05-19 11:15:42.163206405 +0200
+@@ -10,6 +10,10 @@
+    for Object_Dir use "obj";
+    for Exec_Dir use "bin";
+ 
++   package Compiler is
++      for Switches ("Ada") use ("-fPIC");
++   end Compiler;
++
+    package Builder is
+       for Switches ("Ada") use ("-gnat12", "-ws", "-g", "-j0", "-m", "-gnaty");
+    end Builder;
+--- gps-gps-17.0/Makefile.in.old	2017-05-19 11:49:47.172018411 +0200
++++ gps-gps-17.0/Makefile.in	2017-05-19 11:50:24.653412280 +0200
+@@ -10,7 +10,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
+ GNATCOLL_INSTALL  = @GNATCOLL_INSTALL@
+-prefix          = @prefix@
++prefix          = $(DESTDIR)@prefix@
+ bindir          = $(prefix)/bin
+ sharedir        = $(prefix)/share
+ examplesdir     = $(prefix)/share/examples/gps
+--- gps-gps-17.0/docs/Makefile.in.old	2017-05-19 11:54:52.805076624 +0200
++++ gps-gps-17.0/docs/Makefile.in	2017-05-19 11:55:24.332566945 +0200
+@@ -1,4 +1,4 @@
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+ docdir = $(prefix)/share/doc/gps
+ sharedir = $(prefix)/share/gps
+ 
+--- gps-gpl-2017-src/share/support/core/gnat_help_menus.py.old	2017-11-23 21:41:11.897912345 +0100
++++ gps-gpl-2017-src/share/support/core/gnat_help_menus.py	2017-11-23 21:44:53.019038030 +0100
+@@ -25,7 +25,7 @@
+    # GPRbuild
+    'gprbuild': {"GPR Tools User's Guide":
+                 ('gprbuild/html/gprbuild_ug.html', 'GPR/')},
+-   'gnatls': {
++   '@GNATLS@': {
+        # Ada RMs
+        "Ada 2005 Reference Manual": ('gnat/html/arm05.html', 'Ada/'),
+        "Ada 2012 Reference Manual": ('gnat/html/arm12.html', 'Ada/'),
+@@ -86,8 +86,8 @@
+ 
+         for exec_name in _DOC_ENTRIES.keys():
+             executable = exec_name
+-            if exec_name == 'gnatls' and GPS.get_target():
+-                executable = '{}-gnatls'.format(GPS.get_target())
++            if exec_name == '@GNATLS@' and GPS.get_target():
++                executable = '{}-@GNATLS@'.format(GPS.get_target())
+             ex = os_utils.locate_exec_on_path(executable)
+             if ex:
+                 for descr, tup in _DOC_ENTRIES[exec_name].iteritems():
+--- gps-gpl-2017-src/share/support/core/toolchains.py.old	2017-11-23 21:46:11.969652447 +0100
++++ gps-gpl-2017-src/share/support/core/toolchains.py	2017-11-23 21:47:21.723427305 +0100
+@@ -16,11 +16,11 @@
+        nullified by using an empty value in the corresponding tag
+   -->
+   <toolchain_default>
+-    <gnat_driver>gnat</gnat_driver>
+-    <gnat_list>gnatls</gnat_list>
++    <gnat_driver>@GNAT@</gnat_driver>
++    <gnat_list>@GNATLS@</gnat_list>
+     <debugger>gdb</debugger>
+     <cpp_filt>c++filt</cpp_filt>
+-    <compiler lang="ada">gnatmake</compiler>
++    <compiler lang="ada">@GNATMAKE@</compiler>
+     <compiler lang="c">gcc</compiler>
+     <compiler lang="c++">g++</compiler>
+     <compiler lang="asm">gcc</compiler>
+--- gps-gpl-2017-src/share/support/core/projects.py.old	2017-11-23 21:49:13.477462632 +0100
++++ gps-gpl-2017-src/share/support/core/projects.py	2017-11-23 21:51:53.774640693 +0100
+@@ -143,7 +143,7 @@
+           <string />
+        </index>
+        <specialized_index value="Ada">
+-          <choice default="true" >gnatmake</choice>
++          <choice default="true" >@GNATMAKE@</choice>
+        </specialized_index>
+    </project_attribute>
+ 
+@@ -163,7 +163,7 @@
+        description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)."
+        hide_in="all"
+        label="Gnatls">
+-       <choice default="true" >gnatls</choice>
++       <choice default="true" >@GNATLS@</choice>
+        <string />
+    </project_attribute>
+ 
+@@ -175,7 +175,7 @@
+        description="The gnat driver used to run the various commands associated with the GNAT toolchain."
+        hide_in="all"
+        label="Gnat">
+-       <choice default="true" >gnat</choice>
++       <choice default="true" >@GNAT@</choice>
+        <string />
+    </project_attribute>
+ 
+--- gps-gpl-2017-src/cli/src/gps-cli_utils.adb.old	2017-11-23 22:00:22.716652753 +0100
++++ gps-gpl-2017-src/cli/src/gps-cli_utils.adb	2017-11-23 22:01:19.885640611 +0100
+@@ -166,7 +166,7 @@
+ 
+       --  Set GNAT version
+       Kernel.Registry.Environment.Set_Path_From_Gnatls
+-        ("gnatls", GNAT_Version);
++        ("@GNATLS@", GNAT_Version);
+    end Create_Kernel_Context;
+ 
+    ----------------------------
+--- gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb.old	2017-11-23 22:02:52.819994229 +0100
++++ gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb	2017-11-23 22:07:20.326248295 +0100
+@@ -309,12 +309,12 @@
+                else
+                   Set_Command
+                     (Tc, GNAT_Driver,
+-                     To_String (Full_Path) & "gnat",
++                     To_String (Full_Path) & "@GNAT@",
+                      From_Default,
+                      Is_Default_Path);
+                   Set_Command
+                     (Tc, GNAT_List,
+-                     To_String (Full_Path) & "gnatls",
++                     To_String (Full_Path) & "@GNATLS@",
+                      From_Default,
+                      Is_Default_Path);
+                   Set_Command
+@@ -728,10 +728,10 @@
+       begin
+          case Name is
+             when GNAT_List =>
+-               return "gnatls";
++               return "@GNATLS@";
+ 
+             when GNAT_Driver =>
+-               return "gnat";
++               return "@GNAT@";
+ 
+             when Debugger =>
+                return "gdb";
+@@ -2000,15 +2000,18 @@
+          Manager            => Toolchain_Manager (Manager),
+          Refs               => 0);
+ 
+-      Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True);
+-      Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True);
++      Set_Command (Native_Toolchain, GNAT_Driver, "@GNAT@", From_Default,
++         True);
++      Set_Command (Native_Toolchain, GNAT_List, "@GNATLS@", From_Default,
++         True);
+       Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True);
+       Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True);
+ 
+       Compute_Predefined_Paths (Native_Toolchain);
+ 
+       if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then
+-         Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default);
++         Add_Compiler (Native_Toolchain, "Ada", "@GNATMAKE@",
++            From_Default);
+       end if;
+ 
+       if Get_Compiler (Native_Toolchain, "C") = No_Compiler then
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
new file mode 100644
index 000000000000..209c3305c697
--- /dev/null
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="The GNAT Programming Studio"
+HOMEPAGE="http://libre.adacore.com/tools/gps/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b
+	-> ${MYP}.tar.gz
+	doc? ( http://mirrors.cdn.adacore.com/art/591c6d80c7a447af2deed1d7
+			-> gnat-gpl-2017-x86_64-linux-bin.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-ada/gnatcoll-2017[gtk,iconv,projects,pygobject,shared,sqlite,tools]
+	>=dev-ada/gtkada-2017
+	dev-ada/libadalang
+	dev-libs/gobject-introspection
+	dev-libs/libffi
+	sys-devel/llvm:=
+	sys-devel/clang:=
+	x11-themes/adwaita-icon-theme
+	x11-themes/hicolor-icon-theme
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	GCC_PV=6.3.0
+	mv configure.{in,ac} || die
+	sed -i \
+		-e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \
+		-e "s:@GNAT@:gnat-${GCC_PV}:g" \
+		-e "s:@GNATLS@:gnatls-${GCC_PV}:g" \
+		aclocal.m4 \
+		share/support/core/gnat_help_menus.py \
+		share/support/core/toolchains.py \
+		share/support/core/projects.py \
+		cli/src/gps-cli_utils.adb \
+		toolchains_editor/core/src/toolchains.adb \
+		|| die
+	eautoreconf
+}
+
+src_compile() {
+	emake GPRBUILD_FLAGS="-v ${MAKEOPTS}"
+}
+
+src_install() {
+	default
+	if use doc; then
+		insinto /usr/share/doc
+		doins -r "${WORKDIR}"/gnat-gpl-2017-x86_64-linux-bin/share/doc/gnat
+	fi
+}
diff --git a/dev-ada/gps/metadata.xml b/dev-ada/gps/metadata.xml
new file mode 100644
index 000000000000..eb9ac43cfff3
--- /dev/null
+++ b/dev-ada/gps/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		GPS is a lightweight, extensible IDE, intended to develop
+		high-integrity software in Ada and SPARK, with support for C and C++
+		as well.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 8646e7c6f82f..8fe2acbff970 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,7 +1,7 @@
-AUX gtkada-2016-gentoo.patch 3728 SHA256 3646ea25757ada2eb7e631b1c411c42d3c4e656d12d512ce828a53e4255559f4 SHA512 8e8815173496f7ebc795e8b20e19f88f50a726cca3657b5798cd7cd613c0196aea4c63daa2874c36d5a039e5b6cc26c67d0003c47ddcf8ca6e9c28dd8a58bf4b WHIRLPOOL fdb302898aee47976904cc764d523e6594959bda33a1b19e2a6ef4314b68bf6cbdd3c2bd6b8fe13d69dd8fdc332d5b74f503aa23d705838ef932ef6283c8b8c5
-AUX gtkada-2017-gentoo.patch 2777 SHA256 166a96a1d9d68a916eb2211b5cc78e3a673776242a83e216ec835450b06e1ce6 SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13 WHIRLPOOL d5079e6a54157b363aba4b8b082b9644303e4da33fdbf07119063336d1bc181c4c135fbf5a5c4e3a93c59241bac1d857f796ddfbf885c6a1535d3e92ab04eef7
+AUX gtkada-2016-gentoo.patch 3728 BLAKE2B 8f05c4591d267e4e383f052e691876df915aad52a22b6305a7f338fbbf5063b0620c2bfb97a023570dbef0781d891299da65e165481d304e28e710eca8e93656 SHA512 8e8815173496f7ebc795e8b20e19f88f50a726cca3657b5798cd7cd613c0196aea4c63daa2874c36d5a039e5b6cc26c67d0003c47ddcf8ca6e9c28dd8a58bf4b
+AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
 DIST gtkada-gpl-2016-src.tgz 11944697 SHA256 263cc8323e726ae22946508792dd719ff266a9e847a4f7c95e27bd13d3fb4d8f SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7 WHIRLPOOL fc12f151c65ccef5d23b520cfc0625606ece06e56ed2d5b28e39bd65e51850d9b5c40e7382207f1d9186f93ce9232f6024bec977af6973163eb6603178dc1a30
 DIST gtkada-gpl-2017-src.tgz 11952333 SHA256 545a125dd41cce2a5e4aeeefbd9538e9e8c7aecbe39c106d27078eb5a649b5f0 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f WHIRLPOOL 69a05d9e8cd956681951a7adeb5eedd5b13f8d403f5fd0f2473e1f2f4579676314cfa7aac81631fe0e8f68362cdb09dde685b8b2bf30801c38f82ae7ba484b88
-EBUILD gtkada-2016.ebuild 1269 SHA256 52b96911b13c45a29a35b8cfe5194ed7af240e2b46c494398ea8e5ea5b5059be SHA512 32a327fa14ec2f7a4e658356d8af7cff460cd7faa6b2dd8d20ae593be5689f9bd8824047b0d034b32833fc978b66290cb2b584730828615f87ee9af18116f689 WHIRLPOOL 6168e9bb16534669f1da403e01449df23d4e398f364c48245f53f6210e00bc54a698e5d18d3204ca265c3127e769c983949eaefe0cf495da8737428d7832d720
-EBUILD gtkada-2017.ebuild 1269 SHA256 fde1117d68c78aa8b48827bbf22fbe9a59d5e825bc28c8ac6df70f4ceccae268 SHA512 c82beb455477b41b485a6c8b1dfa34f50d94112f649f205f0c8b3411c637caa9dd9fc84d90d68fce61e95febdf9a504cbda57999739a6cbebcfc84f99f908d78 WHIRLPOOL 9f15671bf4b42d64d80845b0cf2c38cff8fd990604d3c707def0bc61b32c353743164a6c6c32420cc304bbb9fa478396078b59ad741e6aa4408bf04a9f1e4505
-MISC metadata.xml 765 SHA256 dd15cc8fb534952a5a1ff1d3a5b1cdc777afa89f088b8bfd56419c01f5a5fd56 SHA512 f1f6999e5458ffb19a0d2a99a674f67af4a8839eed7c6a50c31c2d839f0f09abb6a2d1ad05bcf5b4c809a04a5d6b6959d9f27c7a3aca6c94bf50f8044201c59a WHIRLPOOL 6f376028c6c91a2dce783efb12383f2dbb14fdd9f2d9cbfe708c6a239df4ce0ee34b72cc193e55f7ded968c73a22db862690a20fd82846a8cd161961f386cae8
+EBUILD gtkada-2016.ebuild 1269 BLAKE2B 3c2772faa6a43f7f1ac0e19f1d50b0a840382f2b85280c9d4f446069d8625e71a1d863202cc6f246e327b0e07499800d11242b42c002d7407187a4c119d9620c SHA512 32a327fa14ec2f7a4e658356d8af7cff460cd7faa6b2dd8d20ae593be5689f9bd8824047b0d034b32833fc978b66290cb2b584730828615f87ee9af18116f689
+EBUILD gtkada-2017.ebuild 1269 BLAKE2B 0d9ff1fe178b4804a14cca0f373e938400fbd91004af7184b915ec12bd62e36ce1dbf11d783f349b78ab6f8d65a0d85a62a6ed4803d9a77721f5d1f6cb9369cc SHA512 c82beb455477b41b485a6c8b1dfa34f50d94112f649f205f0c8b3411c637caa9dd9fc84d90d68fce61e95febdf9a504cbda57999739a6cbebcfc84f99f908d78
+MISC metadata.xml 765 BLAKE2B 133d4eb632f6053e1ea36ab6244f871d3204f78d4761a3c0bfbe1caf7621980856ddcb54085e561bcf3ddd5aac1f99c1fffc3b9f8a234922c7a4c1165bb7516d SHA512 f1f6999e5458ffb19a0d2a99a674f67af4a8839eed7c6a50c31c2d839f0f09abb6a2d1ad05bcf5b4c809a04a5d6b6959d9f27c7a3aca6c94bf50f8044201c59a
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
new file mode 100644
index 000000000000..4b8b66cc087c
--- /dev/null
+++ b/dev-ada/libadalang/Manifest
@@ -0,0 +1,6 @@
+AUX libadalang-2017-gentoo.patch 1615 BLAKE2B 192a3981bed1d408d72e06431068eb3c204e28635231540cb25a5d561c778f00fb3f6532a92d296d52df7b9c850e9975d14cd15298665f7eed4a9ff1cd2048fc SHA512 30bd5d34b5f0a365c9ffda9d95025c424f8e1c5f1ee471d5565e1ba97ef0214998e2da911fcf156386baad845e1393f5de82946f2e17ad2ac80e1d53fe4166b0
+DIST langkit-gps-src-2017.tar.gz 364589 SHA256 eb5e344aba3c1ed59120d788db76bb17af13fda0a0ee23d44e7c323a18b96d98 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 WHIRLPOOL 2d8a5dee96bad2a019e87ed48f9ebee2433dd37c425913512d33bea8b6f4eabf46c10ea686ab1a7076247c8758b67c59d85bbc78cb1a88aadda6dc2a3014ea2e
+DIST libadalang-2017-src.tar.gz 1862217 SHA256 5f837e76e2a74bd3df551cf080e35d80c6bf9de6fde21fc2b9edf4260c6484f6 SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7 WHIRLPOOL 501b9f36eebdda3535381fc27dfeb514c380b62431f3124a8a72ea20060dd56a2765e2b5bd449416c53f1eadf8d30113429a38e3f5e1aec13c955ffd138090fe
+DIST quex-0.65.4.tar.gz 2202154 SHA256 42245d5795d03ca053741947733660ac4a0d6d54abdd7d2fa9997a9f2bd4ef3f SHA512 0b11d7e5c5165674626fbbe7f54853656c579c63b78bd2fef2f5a9b316171dc647812d9a37df4e7c49c05de11a307b6425089f4ab281affb6c03a9cf09e2a035 WHIRLPOOL a8103ae3c2adb1c3b0524f2d64b8043464e87a69741e6fb3735163bd58773e75c12ba464ecb08a91b6f465c5830adf1a45e4171fa72d0f738fbedaec5f764ea6
+EBUILD libadalang-2017.ebuild 2086 BLAKE2B 3fb67920d9c85c8405ff5b719e3cb5582f41faca280335845304a4d8780a3e6a2481c6e5116b4c490f65ce521cf19d8aa36ea140f312c2f2bffa811a4d91c475 SHA512 35319b7c17f1f5a59e95e21f179cb33384429e74bff1ac7a1d65f84e60e76d8fe9cb4013f196ec25c7af3ebca37a14ff06011fe79f0fc3812290ad0b6d1269d0
+MISC metadata.xml 692 BLAKE2B e95060511ad72cee837cc1bc5c131d87f137b25928022ac81049c2da9659d23828a229a001339ed83cddde4663dbf6acea2870c2cf802019aee56e620f7cdf83 SHA512 024b1a9f34cbdda3c49d1452ebe0928c1da6eecdc144447db03ba1f9df81d8abe5f27d4898487a1171e2820675d7dfd1ac05074b58869b1601a7042041050505
diff --git a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
new file mode 100644
index 000000000000..a54f0cf98583
--- /dev/null
+++ b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch
@@ -0,0 +1,32 @@
+--- work/langkit-gps-src/langkit/templates/project_file.mako.old	2017-07-11 14:19:12.841221846 +0200
++++ work/langkit-gps-src/langkit/templates/project_file.mako	2017-07-11 14:12:39.104981170 +0200
+@@ -82,9 +82,9 @@
+             for Default_Switches ("Ada") use
+                Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");
+ 
+-            for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
++            for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0", "-fPIC");
+ 
+-            for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
++            for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0", "-fPIC");
+             --  This file is *huge* and the debugging information for it harms
+             --  Valgrind runs. We almost never have to debug this file so
+             --  this is acceptable.
+@@ -111,6 +111,7 @@
+                   --  ... and this prevents OOM on other platforms
+             end case;
+       end case;
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Binder is
+--- work/libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py	2017-07-30 16:01:31.495287196 +0200
++++ work/libadalang-gps-src/ada/testsuite/testsuite_support/capi_driver.py.old	2017-07-30 16:00:08.104464440 +0200
+@@ -72,6 +72,7 @@
+                        --  different default standard.
+ 
+                        "-I{support_include_dir}", "-g");
++                   for Driver ("C") use External ("GCC", "gcc");
+                 end Compiler;
+             end P;
+             '''.format(main_source=compile_units[0],
diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild
new file mode 100644
index 000000000000..5a0a5cfba07e
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-2017.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
+	-> ${P}-src.tar.gz
+	mirror://sourceforge/quex/quex-0.65.4.tar.gz
+	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044
+	-> langkit-gps-src-${PV}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnat_2016 gnat_2017"
+
+RDEPEND="dev-python/pyyaml
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-python/virtualenv
+	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
+	dev-python/docutils
+	dev-python/mako
+	dev-python/enum34
+	dev-python/funcy"
+#REQUIRED_USE="gnat_2016 !gnat_2017 ${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	rm -r ${PN}-gps-src/ada/testsuite/tests/{acats_parse,stylechecks} || die
+}
+
+src_compile() {
+	cd ${PN}-gps-src
+	mkdir bin
+	ln -sf /usr/bin/gnatbind-4.9.4 bin/gnatbind
+	PATH=$PATH:${PWD}/bin \
+		QUEX_PATH="${WORKDIR}"/quex-0.65.4 \
+		PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
+		GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die
+}
+
+src_test () {
+	local myDir="${WORKDIR}"/${PN}-gps-src
+	cd ${PN}-gps-src/ada/testsuite
+	ln -sf "${myDir}"/build/include/libadalang.h c_support/libadalang.h
+	#./testsuite.py --show-error-output |& grep FAILED && die "Test failed"
+	GPR_PROJECT_PATH="${myDir}"/build/lib/gnat \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${myDir}"/build/lib/libadalang.relocatable \
+		PYTHONPATH="${myDir}"/build/python \
+		PATH=${PATH}:"${myDir}"/build/bin ./testsuite.py --show-error-output
+	rm c_support/libadalang.h
+	cd -
+}
+
+src_install () {
+	cd ${PN}-gps-src
+	QUEX_PATH="${WORKDIR}"/quex-0.65.4 \
+		PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \
+		ada/manage.py install "${D}"usr
+	python_domodule build/python/libadalang.py
+}
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
new file mode 100644
index 000000000000..31ddba84751f
--- /dev/null
+++ b/dev-ada/libadalang/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<use>
+		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
+		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
+	</use>
+	<longdescription lang="en">
+		Libadalang is a project to build a high performance semantic engine for
+		the Ada programming language. It is meant to provide a basis to write
+		Ada tooling, including tools working on potentially changing and
+		incorrect code, such as IDEs.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 8aa27f75e2db..d6ba7943d9cd 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +1,6 @@
-AUX xmlada-2016-gentoo.patch 736 SHA256 66e9636c44f7a512034c6b453aaebf7ee41df9a966635eabd70b3748bee051e0 SHA512 23de23e5af65b02133730cdc30112e1f0585019aa3e6154b30b029f3d2f3bec74d7fe93549d5c505426eb2a13e6b820bafb78c02885dd70c4f3bf66b754171d4 WHIRLPOOL 934ce64707ea5bd92410a5cb1568f5a2aa84e07191e24bb61d02289405f6f8f2b8076cc4fae9f93c359b5f680904865d0d9f84e4956cedbc023d7f77de3c679c
+AUX xmlada-2016-gentoo.patch 736 BLAKE2B 735fe5de39998f65777c4cdebd2390e9c3eb487d53a505faf8d2a1b083c71a439a5ef127e645b1aa23c9e90cedd82feb2f570d394aab308aed1432f46467a750 SHA512 23de23e5af65b02133730cdc30112e1f0585019aa3e6154b30b029f3d2f3bec74d7fe93549d5c505426eb2a13e6b820bafb78c02885dd70c4f3bf66b754171d4
 DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7
 DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd
-EBUILD xmlada-2016.ebuild 1236 SHA256 113ece65503d569ee45c43ded37ee9feb1ab204b8ef8147eaca512f143ef5568 SHA512 49a1a17034d3e8a4600ae237750528a5568798ebfaf9144280f67eb1e393bb8c030caf09f2f2066b53bcdb415c709c5bbd11b47034cb9e84eae3b43b34fdb2d6 WHIRLPOOL 4515805164b49c90e50d16c56f6a509b897822f9f122f5826605d0d06e2c153fed6450bb21eee517014735e06dee74949f7b63caba9cd37ad615a367dae2531c
-EBUILD xmlada-2017.ebuild 1480 SHA256 ae951953c56eb139bb2bc158a07a02566b3de9eb0d0efef8024f5125a38356e4 SHA512 93b51117c84e55abc54aebe54b95eee4c788044b83f1edbc626c8157a7eecab2c890ca41ac8a4f9530e251f20a1b3745493d1227c282415b78677535429d8a7f WHIRLPOOL 15e674a9263570c267c4d63353500faffe4d1ab1657960f36043f47a128717473125a9c043d16d9428a2e3adc187adc03fee62363713584888f8084351d99c83
-MISC metadata.xml 1125 SHA256 cfa482b10d38fcda4b7f335521ae521d9b0425c67d2dca54d85bf37482467cee SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d WHIRLPOOL 1a50bd49742d194e4a075d593ca9b5fc66c7d293eb399be54039a5362b1001d72b5b15823b528418da55642c4de6be82faf210a6938807a2c2e9aaf34cfdde54
+EBUILD xmlada-2016.ebuild 1236 BLAKE2B ebf64878afece76ca190cda760c5bde72c32b1f95021e2e1524963b1a50ad301954e94f083f914025a217417d04317f7e197e78d992bd56a2599107e08fc4aa3 SHA512 49a1a17034d3e8a4600ae237750528a5568798ebfaf9144280f67eb1e393bb8c030caf09f2f2066b53bcdb415c709c5bbd11b47034cb9e84eae3b43b34fdb2d6
+EBUILD xmlada-2017.ebuild 1480 BLAKE2B 4ed5bcbfa3ba121cb43860ff5a7afcac24c970e52708a897145b3a967b0f5dbbbfbbcbf99d843299e7d8c7b9f27fc83c792e8cb1792596c2a59636cc73bf24b7 SHA512 93b51117c84e55abc54aebe54b95eee4c788044b83f1edbc626c8157a7eecab2c890ca41ac8a4f9530e251f20a1b3745493d1227c282415b78677535429d8a7f
+MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d