gentoo resync : 07.07.2018

32 files changed, 387 insertions, 25 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index d4a1d79b4ded..ce4d090b90cb 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index f57cdc9b9fc2..1be0f07df28f 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -5,5 +5,5 @@ DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae0
 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
 EBUILD asis-2016.ebuild 1175 BLAKE2B c896467c59d095c44b4f7bc83df71be00c5f416e707f08e688cd6770e53767710c456b1fcb75efff4192c52767c6238431e48c207c7ca5e8d19893a19a7dbd2f SHA512 46f43724b8b648f3a5a7d921209a08c59d3a4bdae75b1b4966dfdab8bdfe14cbdde01c2d1cba5e1a91d739a39838931d7ae17e4be486f2e281521cb70023c995
 EBUILD asis-2017.ebuild 1066 BLAKE2B dcca612165bfaa48d636e34606fb4f03eac1cf6fa5651458af91a923317090e5101911af771b82756eb6b0baf0bd6258b0d0c1a212f050f8294eaa8c92b61395 SHA512 6e1c71b2cbefa467fe434dbad8b600244adf6cda2f7cd40ab8497d093e483684591bdf571e6ad03019b90bc40494b7c7ec0b96b2540dc3f23dd3af8a69daeeef
-EBUILD asis-2018.ebuild 1091 BLAKE2B ad0907a3a61a6aeb8e2e329d5300b7ba73ff30b55020c96b3c8142d4e182927770561f93af30eca12ad2ca5921c43dfadc59cffeabdca6b805fa30ec9ed62ef5 SHA512 eeceecf65f8a70eac5ba1d65cc860ae680ae5cdd5e6d1eee62605cd1b382618ad4cb25eb58c74abbc9d35a2cf9ef461e9f4f525cafa6ace9520eeb05dbd03fe1
+EBUILD asis-2018.ebuild 1053 BLAKE2B 015860a7e4f4300d7f4c506ec08d7caccba622c3ed3fb04949b01c98fe0199e287a751c30548871614bc15fcc32664f824f5bc089803cc14314eaa155007759f SHA512 a2b9c5b4ece4b347c8f713abcf7430343c6fcbe0896d5ac3d8df18fad11468c1fa451936d0db9087d0aee3d6072c65c8d764fe557a83f9188060802da9aee6cf
 MISC metadata.xml 758 BLAKE2B aebcdb7e9be0cccf7350d68082d2461ec6a28c94df18dd936f689a3cf02a0139b96c0208fb7e8ff677ff0cb977199f8b4ef097faf6b3376624c4bf220845f216 SHA512 b673b7f404971e44cd09f746338dc2cd655b4b5cd0ced7a742e6986a8d454b4c2738a7576dd5b1ebe5fbea4ff073de60a1fbaf8dddac90e54981159affa0fb07
diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
index 129a8dc318f7..7a47041ede89 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-2018.ebuild
@@ -16,13 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
-DEPEND="dev-ada/gnat_util[gnat_2018]
-	dev-ada/gnatcoll-core[gnat_2018,shared]
-	dev-ada/gprbuild[gnat_2018]
-	dev-ada/xmlada[gnat_2018]
-	dev-lang/gnat-gpl:7.3.1"
-RDEPEND="${RDEPEND}"
-REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018"
+RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
 S="${WORKDIR}"/${MYP}
 
@@ -42,4 +38,5 @@ src_install() {
 		GPRINSTALL="gprinstall \
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
+	rm -r "${D}"/usr/share/gpr/manifests || die
 }
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index cbed62ef8443..e2e9501e52d5 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,4 +1,6 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
+DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
 EBUILD aws-2017.ebuild 1083 BLAKE2B 83cc71d74f7a173f693d1ceef8ebfc53a233aa3f989965c6b01e69bd1818a93bf321fa324573fcaa68f671b87dd82ba669b4d796d5cae660d2dbc574e0d4e003 SHA512 4a6f7bb017bb860670066b7b5fe3a1e9d10d32a802a391b3d2df52197ae1918ac38b8c942c5433644e87f28ceccdcb0615f9f91d2fe528e14e5357952ef183e8
-MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
+EBUILD aws-2018.ebuild 1125 BLAKE2B 6a0cfb8bc33626faa6e8a8c636840a4e23a45d558e8fa25fc38642deaba15e679d5d776f3c117e0f7c0173cf6a3745b5f8c5f271e767b51f7b426a03cefa47e6 SHA512 566317cb1c77e7772c3c4408de3578979fdaf653c1a02e95414d3104b6a0529ec7435a453880a8501874fd3a550326aa6e82b8dcdf044736af3e52886c0c6d21
+MISC metadata.xml 910 BLAKE2B 32c65b10f1286c68aaf8c4eb5d5078dca8b09a451ec02d1a845282124b71cac7363e8f068910fe6908befcf49d9e476f30f53b78bd66d6269cb7cb38f5d69597 SHA512 e3b9b10331c66b3e3ce4bb0b74a1c426656d33ffb37936a433fad3f7fc2e64de233c7d18158c5eea409d406ebe1edcf77135e7b490bec40387adc8b0928cad5a
diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild
new file mode 100644
index 000000000000..f4d94c7b9188
--- /dev/null
+++ b/dev-ada/aws/aws-2018.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing
+
+MY_P=${PN}-gpl-${PV}-src
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd
+	-> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018"
+
+RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=]
+	dev-ada/xmlada[shared,static-libs]"
+DEPEND="${RDEPEND}
+	dev-ada/asis[gnat_2016=,gnat_2017=,gnat_2018(-)=]
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
+
+src_configure() {
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true
+}
+
+src_compile() {
+	if use gnat_2018; then
+		GCC_PV=7.3.1
+	elif use gnat_2017; then
+		GCC_PV=6.3.0
+	else
+		GCC_PV=4.9.4
+	fi
+	emake GCC=${CHOST}-gcc-${GCC_PV} \
+		PROCESSORS=$(makeopts_jobs) \
+		DEBUG=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_install() {
+	emake DESTDIR="${D}" DEBUG=true install
+	einstalldocs
+}
diff --git a/dev-ada/aws/metadata.xml b/dev-ada/aws/metadata.xml
index 7662c41c5d1c..d2da63463732 100644
--- a/dev-ada/aws/metadata.xml
+++ b/dev-ada/aws/metadata.xml
@@ -8,6 +8,7 @@
 	<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>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
 	</use>
 	<longdescription lang="en">
 		AWS is a complete framework to develop Web based applications. The main part
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index af6ca1c82757..66dea9241c31 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,4 +1,4 @@
 AUX gnatcoll-core-2018-gentoo.patch 861 BLAKE2B 3bf6c4310fb02c20b780d7382fd8465774354c6132a0cc413d683fa2a2bdc8b0cc3dde2e7ca99dac8d00a231b002345d3be01e68da5c876f5d34c2f601ffc5c5 SHA512 4f211b71d5da88983d0c111aafc48c12c9486dec854e903f4ad352d61a48c097994aaf5679c42fb8f74a35c35d73ef6c33e814bf6ea391538ab4e3b5d1253368
 DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac
-EBUILD gnatcoll-core-2018.ebuild 1675 BLAKE2B 8952951b57b0778de9d70a45b70dd9abc736e6b481e9a744fa584fa22148214cfcff28368ffdfec47a5fca7f618735b32e648f4791a89152879d04e478a39249 SHA512 1a903ce8a641e900fe1c3e50da143923677eb102aaf7a0bbbd039daa4d368a62a1d65dd0ac7449acdd92218dab642e65e7447e4d4a7e3891561e58a6f98d1d2b
+EBUILD gnatcoll-core-2018.ebuild 1675 BLAKE2B 913974fecd9ede02d75193a2fe577a078ad771d53cf04f987ef4b6d036f79d9296e382b44bab0ae8d546b78996a16b4c75d3f42a04516babc2c1b7f5ddc7776a SHA512 422c0ceff9792bf92af4746b108e40f39427bc2904ffcda4df3449a6aa5bffd2e049fb7d84666f68716824566a87e3b990a74233e330bc378fac44ddebd25ba6
 MISC metadata.xml 1331 BLAKE2B 0227dacfedf39550b497596c95191f5c8524b9aaaaa19dbab296f4e34fe3ff3ea32f4f92a40c16194204661229986ad90a527131d4bb97decf1b6bd59b911884 SHA512 008d3836de7baa71b8d3655e3e7834d68a7ec304345bfda8a715416e46fa5255185336f84f6b75dbf7a85d24afebd0fdb85131b52ce7c655635e09b42bc1907e
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
index 3b34184becc8..88fa2a1f45ac 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
@@ -18,10 +18,10 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
 RDEPEND="
 	dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/libgpr[shared?,static-libs?,static-pic?]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]
+	dev-ada/libgpr[shared?,static-libs?,static-pic?]
 	!dev-ada/gnatcoll"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
 REQUIRED_USE="!gnat_2016"
 
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 7b4c1ba77dad..858df244106f 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,4 +1,4 @@
 AUX gnatcoll-db-2018-gentoo.patch 785 BLAKE2B 9136909b36568f624271e3244847702df3b53a86675e819989f32da258ace77d6b96e4a11cd8881a04f4348c44ec287274256909af8e94be3a0d9d95bffa4b9f SHA512 036434974dd482f6945beb23ab857961d6a92feb37b91bbe6f0cad74a1ebec81332cd7df872050720c52c784d6d0cbf9f0d856b832d940e156327093bdacba4d
 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018.ebuild 2701 BLAKE2B 0763b69c5f7d44f200820199647617730b05d87770f060a3e5d3bc02403f379093ab4974a8a924cc9a8b71a2f41e08b23433ff92a9eb638d269edd92b9fd0eeb SHA512 9d01eb245b71d521df97a40723605d7ccff320a151670da28a25bdbde76530c1a1df682ce4989b6f9e1e1d40fc3a9e6b76c4065d9f932561dfa2a8c0debd1ebd
+EBUILD gnatcoll-db-2018.ebuild 2702 BLAKE2B 45c35b10be332432f876d556939e6a26536182fe8a38883e71b40891c3d98d9058d09c039c9481e572e1e6fcda4fe270d358c8b7349336d3dc63c1405fa3b5e5 SHA512 55466619a1942dda47b987e79c92aecd5e880e25671cf2ef3a0fd051b154f81dbd5875aa17f2424d1fd56c26a56d1d113114141f3caedb1861575f335e15a7ac
 MISC metadata.xml 1519 BLAKE2B 93aa938ca272fb984d08a0471ff339204d0afc854f9fddc4c1f0e060650263c36166e1de91453bdfd52bc0d53844c7042c6f5b14d955b72ab042e6dffadaf4f4 SHA512 27cf0aa52080186fd7970dc02f31eb861ee20edc08366926ea29ec0a826d10c92d80eea840a403fe9be1ccf0be33aaf866f94fe66d351926ffb30104ce143e88
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
index 6fbd4efebd91..a9b22807ce10 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
@@ -27,7 +27,7 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
 		dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018]"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
 REQUIRED_USE="!gnat_2016
 	sqlite? ( sql )
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 336e45aad790..6be337014ce5 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,4 +1,6 @@
 AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
 DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897
+DIST gnatmem-gpl-2018-src.tar.gz 80101 BLAKE2B c117552c2f8369f588127933ca1ba3075aeea6d7c3867861817b080f633fe26a7692c101b500d7441b49e79e75ce5a771a80287d0fb28bd0f569a358a8976d7d SHA512 539703bcb97cab996a4b4381685b021a419df781be3997538120580944fdcbb021fd28f574f66b8d52adbf5c6f1d7e29495c2115515d761f3cfce5bcc7bd8f56
 EBUILD gnatmem-2017.ebuild 852 BLAKE2B 9c08a8678c1af06e6e1388d17a3d0a740fbd06301bfb9313c832989d71198b6cce7d54051de0c8c92b0bca779a8b96ba030b5eed6bfddf8990230ea91de13eb5 SHA512 fe4ef12c20bcc2e1a17d9b8d5b507a16ec818d636c2de732b1467828f32de133132430422e7519892f95027397c65dd3f2ed959fafa0ff5fe6d661b9851f47f2
-MISC metadata.xml 1138 BLAKE2B 867c1ccc45c510480cc4e93b62534182248cfe2e7aad4e5e8e3c5fef153590c2a9832687a5614786b115145d477ddc74a38008566266fa44e9e5e0a4769332d1 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b
+EBUILD gnatmem-2018.ebuild 888 BLAKE2B e8c11628ce8561866468d8971b96fea8bc1bf5dc698d1c8c69348c037fbe9122a4d7a88ce92eb5ade450fad1501842791befddc95b6d0355c37edfd102ee4fa5 SHA512 166e40d3eddd59f6629b9e87f0126a10f93dd1e205f5ba80550f97244331faf0ed84b2a50145deae1861038814a795ee2b41ecb16a14df718e916487bf6e5b2a
+MISC metadata.xml 1206 BLAKE2B 141fe49e4b3fa46b43658dc0e3852624f5e82d6c796eea4b5e228b65b727170f45a0d0675dd0b864a331df0cd14acb11ff8a251c83d9b1f8aff19588b8e7d677 SHA512 9a8ab793dcd6d6903b1fbe59170261b5454560bef9fd70982d261137b7f4d32c5b12755b4073e4d38050f79815796f752fd61dd9b0fee9c449ce3334ed584baa
diff --git a/dev-ada/gnatmem/gnatmem-2018.ebuild b/dev-ada/gnatmem/gnatmem-2018.ebuild
new file mode 100644
index 000000000000..74e1cea6ebff
--- /dev/null
+++ b/dev-ada/gnatmem/gnatmem-2018.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a72 ->
+	${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018"
+
+RDEPEND=""
+DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_compile() {
+	gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
+}
+
+src_install() {
+	dobin obj/gnatmem
+}
diff --git a/dev-ada/gnatmem/metadata.xml b/dev-ada/gnatmem/metadata.xml
index 0119f73e16b5..7fac49bbd330 100644
--- a/dev-ada/gnatmem/metadata.xml
+++ b/dev-ada/gnatmem/metadata.xml
@@ -8,6 +8,7 @@
 	<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>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
 	</use>
 	<longdescription lang="en">
 		The gnatmem utility monitors dynamic allocation and deallocation
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
new file mode 100644
index 000000000000..e0879c98a173
--- /dev/null
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -0,0 +1,3 @@
+DIST gnatsymbolize-gpl-2018-src.tar.gz 14286 BLAKE2B ac655b951b584224e64778fd800c082defee9abce4b3e7e1ac766a38c3b1ed8624c349f249714376e5984e37a9e9df256b6627b6ed2898f2f71fcaa8067cf36b SHA512 4fc21b45c32c08f9911cb7cdc0170e36f1c10d703244bbbfbd525386297b6e6779651751281402e8c4caee668df052e7c1ccc234e5cd88151ee471b8e3f06d0f
+EBUILD gnatsymbolize-2018.ebuild 626 BLAKE2B 56bf284d719dcdf27bf8159343bf39345f2fbe72cf75ddc55cbfbc60f8929c58128b2e17df44a9e89655ff9b1def569ccfceda46687d4c8839a6066dc5629d33 SHA512 e17cf9dddd4bfb0fa8b1e3413899f48b01460205c41deb9781a9f831f1260eb558d3d8eb2fe709957f214599a18a8efffcb88cf2d5bb28f5f01d98ed25dc9751
+MISC metadata.xml 422 BLAKE2B a2e229da82c90f88f59b396418b0c0f94026fda53e21e474e1515500c6a24c3d98382d866eedd51a5342a10b7d2d72e2dddf662a83c3674c580d8b05e72f1c63 SHA512 c73cf5cdc71ecc3e097d21af8b64d00e3ae1927fb67297c2cea1717942e30ba007105c539d02fe12944bd5b071f31f9d24722a4c4dd6e731796273fc862b49ba
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild
new file mode 100644
index 000000000000..192b6956dbb9
--- /dev/null
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2018.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing autotools
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="Translates addresses into filename, line number, and function names"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6d ->
+	${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-lang/gnat-gpl:7.3.1"
+
+S="${WORKDIR}"/${MYP}
+
+src_compile() {
+	gnatmake-7.3.1 -v gnatsymbolize -cargs ${ADAFLAGS} || die
+}
+
+src_install() {
+	dobin gnatsymbolize
+}
diff --git a/dev-ada/gnatsymbolize/metadata.xml b/dev-ada/gnatsymbolize/metadata.xml
new file mode 100644
index 000000000000..51c5ca471d80
--- /dev/null
+++ b/dev-ada/gnatsymbolize/metadata.xml
@@ -0,0 +1,12 @@
+<?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">
+		gnatsymbolize is a program which translates addresses into their
+		corresponding filename, line number, and function names.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 10bcc2041499..fc30dd6b8c1a 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -7,5 +7,5 @@ DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e10
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD gprbuild-2017.ebuild 2019 BLAKE2B f90f05d9e8272399cf3b231631f58df984cdb4d2d3cec2591cb14e1736d218befe14b2b3d1f02ee287f0e6b588b70f3a2ab0d05d0d5404c78645b233b3bcc46b SHA512 6735d6e22ee72d60e7300fc3cd99e7065d3203feddc3a296352bedbecd3f780eba8f776c07bf859404acf24b731387caf44208641b6ec5e8a35ce4b42dc2ce60
-EBUILD gprbuild-2018.ebuild 2122 BLAKE2B 44aad2909aeb39d064a3f306476a1689945c45367cbc1d29e497c01fa321b2bc03095b22e8fae15c6995c5cd2a11dc83c203fcd652482f6d9f3d39568d381ec7 SHA512 8dc48bef4b704b4d828252a11c3df4fae821e1cf41fbedd6ac25570036a01351a8820c0332b0c244866e9157cf2fe1c23687f363700197029caf7362909194e0
+EBUILD gprbuild-2018.ebuild 2123 BLAKE2B f9149135b6624e2a0701badae3258f79189a5690cdba6331513e7098b703f50b532868d8e2d868c7d9175ff65270821416fee87bf4d099275c37bd15c8e1befb SHA512 c679ce1d60c341c16f7c68d698b317ae3cf68f03fefac9ec324c9f4564c2bd7d79bc69f2b1cc56018e381183b0834275c578e76d6e940764655533cdaac52e24
 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild
index 19175a509333..f071a9a88506 100644
--- a/dev-ada/gprbuild/gprbuild-2018.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
+REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index ae45c139515d..fb9feb9a9956 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,4 +1,6 @@
 AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
+DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
 EBUILD gtkada-2017.ebuild 1333 BLAKE2B a010ed72e62dc6eecd7d84595b00174e4f5967a850d6c24e4c6283ad11a968ab46051a646e9f9f37a2aa1735fdbca417f612c85f586b3777c53ddab42c689bd2 SHA512 41db23dbb72e53b3956585cd33ab2a4e9e32c19de079e6ec5907e44b1a7d1166a132465871ba314f90297c5b0f07b9533890f2cdcda3a56621484a476b9ab01b
-MISC metadata.xml 704 BLAKE2B 3dd587570234d4bca6f818611011ff14c2a009d1078dba153bbe9fb1071b3962201ddde374176d4492f7066e978366a1ca1dd030b36c000b7f71281c4b407cac SHA512 3139597952f51ad23e7bdc4dfb49aec1b040016e60d1cb83319388146a503b4ca59a16c800548b32ef41987e631d06103360925c598c8cee2805bd84623e9b52
+EBUILD gtkada-2018.ebuild 1456 BLAKE2B 89167e673cc23c8e27f2cfc4341067fa7b77e01f3ddb72a329859d7b04e0c51595c969fa50fd488921f9f446c2e05cbef87fee6562cfc2027b40a592231561cb SHA512 01e015bef00579446aa2bfdae9216df85a972da2155e36becfc5e38b31ea8a0bcaf3b2a72fa8d50876a35425862d15c24b3e01c61a312f6042ff4458880c72b1
+MISC metadata.xml 772 BLAKE2B 5368ab9afd9387d681eca36cb0e93435b72570c31691a27b830b2ecca307ac3a1aba7c3aece27a5bdc27185fd822c9adc76a5091d480c10b7802bae37efa65c7 SHA512 fe764650755d97e2e148cf36fa1ac973a96e59e2143e5a8e90da27dd1272687f61f0e1fe602535366e068c813e3af54d74c0e2e1b88e2a4df8561165bc6448b7
diff --git a/dev-ada/gtkada/gtkada-2018.ebuild b/dev-ada/gtkada/gtkada-2018.ebuild
new file mode 100644
index 000000000000..1a6fabc18667
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-2018.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
+	-> ${MYP}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs"
+
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]"
+
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac}
+	eautoreconf
+}
+
+src_configure() {
+	if use gnat_2018; then
+		GCC_PV=7.3.1
+	elif use gnat_2017; then
+		GCC_PV=6.3.0
+	else
+		GCC_PV=4.9.4
+	fi
+	GCC=${CHOST}-gcc-${GCC_PV}
+	econf \
+		--prefix="${D}/usr" \
+		$(use_enable static-libs static) \
+		$(use_enable shared) \
+		--without-GL
+}
+
+src_compile() {
+	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
+	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+	emake -j1 install
+	einstalldocs
+}
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index e26ee639a2da..0373a027e239 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -8,6 +8,7 @@
 	<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>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
 		<flag name="shared">Build gtkada as shared library</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index d7b86114acc5..8d97f9122ce1 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,4 +1,7 @@
 AUX langkit-2017-gentoo.patch 4182 BLAKE2B 5f0a275837a80ac41e231c807eb54a620d49311b3539b995951ce30be3de6cbf1d00c7909f5ac3186b4e06892416f8a4274b75f1de10af123824f4eede466c57 SHA512 53530378e4e04d940656244f42161abc0aae9a5fc54b0ddd12c153faef0fd4a8d3f67e27742f6a2e27496a705a8dafe9288d1c7c066a43fe0e8e7c0a0886c21d
+AUX langkit-2018-gentoo.patch 948 BLAKE2B d34afd89907fef17207e5de6b4de61e5dc5ba33ef84c12d16b6c5f2c3ef31ad27a1474e251aebf87eca0bbad7c4b537f6458bf271d368d7f0c241dadfa526dd1 SHA512 41a3cb91d867f7ec33570082727167bf7c8c4514fd9a254c4adc515bd838c374530b5e24820a58cabfa1e3cf5ba713e261fe8e3f196fda7e7bc1b6839b0bb814
+DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f
 DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95
 EBUILD langkit-2017.ebuild 924 BLAKE2B 4fde947ea5db44e0e806162a7283bacd4d105d58bd20fcbb68952df7690e5f86c4dd6d998845a977f09808455bdbb29c572649e78addfb41bfe3fb9306ec283c SHA512 3430bc646265ccacc3178ba3f459613e3b0a0f4493b4238a97598158a4dbf7aa81ac5a60e40da380f86a075ce8119fe28770a438273133cef4ca3caa1626348d
+EBUILD langkit-2018.ebuild 985 BLAKE2B 2b4bc94e8e20f93ba4b98e345bcf07b717d3f07075a447bb69d6ae586cff4a1ed7d0dfd2f61aa6636cc6212aa335f17a7ed8301b52d98e6fe133219292225a73 SHA512 e499e41572d61a668707710824865ba431d8e6ef576668c8d31895334014996fd98adde25baa7d0017087102b1eadd8c0b768aab18ace9fa5192838635d4c3e6
 MISC metadata.xml 748 BLAKE2B 29a7b386b6d8d1b2f2bc8fc16739c28129b7886c8cdae6784d54bfaadea87502a5338ed6113f536e7c5701cefb42d5912f6189dccb55ddd704445ae65f5c4176 SHA512 8a3183336e00f01eeb51a5b7d06833599b408801b71713575d83131d39b82c8c74fda8ce133b352dc356135721ef19ca488ef17723172579cd1507d4c1d7c809
diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch
new file mode 100644
index 000000000000..aacca6092c1e
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/langkit/templates/project_file.mako	2017-07-11 14:19:12.841221846 +0200
++++ b/langkit/templates/project_file.mako	2017-07-11 14:12:39.104981170 +0200
+@@ -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
+--- a/langkit/compile_context.py	2018-07-04 19:17:08.329346507 +0200
++++ b/langkit/compile_context.py	2018-07-04 19:17:57.276615724 +0200
+@@ -1684,7 +1684,7 @@
+             generate_lexer
+         ):
+             quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py")
+-            subprocess.check_call([sys.executable, quex_py_file, "-i",
++            subprocess.check_call(["quex", "-i",
+                                    quex_file,
+                                    "-o", "quex_lexer",
+                                    "--buffer-element-size", "4",
diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild
new file mode 100644
index 000000000000..9bb818cf2e8b
--- /dev/null
+++ b/dev-ada/langkit/langkit-2018.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	|| (
+		dev-ada/gnatcoll[gnat_2017,iconv,shared]
+		dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared]
+	)
+	dev-python/mako
+	dev-python/pyyaml
+	dev-python/enum34
+	dev-python/funcy
+	dev-python/docutils
+	dev-python/quex"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_test() {
+	testsuite/testsuite.py | grep FAILED && die "Test failed"
+}
+
+src_install() {
+	default
+	python_domodule langkit
+	python_doscript scripts/create-project.py
+}
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 35a28942a712..9953b010329e 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,4 +1,7 @@
 AUX libadalang-2017-gentoo.patch 521 BLAKE2B 0493204f7a71f9f906017b69b988260add9744888559034e066dd0e33114aaad3c1f69cca23ca59b2c0b2d3503469772a91d6c278595ad8dbda5cf7fb063f8db SHA512 88613409e2ba5aa4e33ae01bdab3ac5298a363732372a33334a85781d1b29d045c7e1207650a1f9a819acad671c5dbfc1d3940a2eda9bf923456dadebb6c9af0
+AUX libadalang-2018-gentoo.patch 1161 BLAKE2B 421608844df562343aaa9c6fd1b1b61a13712a9d50b117011a69681e9da2b55ce29ddad3e91071d9f6aa09feb858358672dad4d037c8a593266d1cdabbe43484 SHA512 cafc3cea5da8cf958db102af78a2c675d9090a7848c83755249137c1d19879d0828c6df27f79c05707e80299ecf2be389411e04f77f021af36a797b6851acdf1
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
+DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
 EBUILD libadalang-2017.ebuild 1096 BLAKE2B f0ee4b436c3a7c0288e9360ecf392e7f8b2ae9592f4e3e1a2c3cd50f1979849c52bc52835e8b331ed14c7beaa28ca1f794d3d1bed189935644910505b2c70efa SHA512 802a402622df6d21390aa497342ad4b2fd9b8ba18f7cb52a5377909eedb8e47085f9f3df35d16763904cfaf3dd51413c8526d25a04bd0e1bf26477b6d86ec09c
-MISC metadata.xml 692 BLAKE2B e95060511ad72cee837cc1bc5c131d87f137b25928022ac81049c2da9659d23828a229a001339ed83cddde4663dbf6acea2870c2cf802019aee56e620f7cdf83 SHA512 024b1a9f34cbdda3c49d1452ebe0928c1da6eecdc144447db03ba1f9df81d8abe5f27d4898487a1171e2820675d7dfd1ac05074b58869b1601a7042041050505
+EBUILD libadalang-2018.ebuild 1112 BLAKE2B 68eaf77b6d6ed8182eb280f17e8e6a148c6272bb98af1d5fadd1c0ad00df0b3c6bd6840d1bd4f70056dbe9b60dfd1ee9f7c02f1b810d4cd08d5fc7189ff14b5e SHA512 5343549ba7721d2219aa01c09476425bcb7f5c7f905d0e8d827aa789a62d760fa852096d2e3f5fd0e47531997f873de25a51ed02574a87f8441d3036e03f1ef9
+MISC metadata.xml 760 BLAKE2B 2cfd4af1689dfac81faa0c9113e26db8d9325d03399abd46e8a38cf8fc049291e7220d6133ff392e280dd1374557d8dbe7083f130e1177cf32ba52ddc9f80988 SHA512 774868d6533effa22457464253da70e1adc650d0fe77d6e38e68608a3108e622defd135aecf9c496c8b2f2fe491b06368224236bcf33e9da9e4de8c712455557
diff --git a/dev-ada/libadalang/files/libadalang-2018-gentoo.patch b/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
new file mode 100644
index 000000000000..ef92b255cf48
--- /dev/null
+++ b/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/ada/testsuite/testsuite_support/capi_driver.py	2017-07-30 16:01:31.495287196 +0200
++++ b/ada/testsuite/testsuite_support/capi_driver.py	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],
+--- a/ada/testsuite/tests/c_api/unit_file_providers/test.out	2018-07-05 20:57:15.718357269 +0200
++++ b/ada/testsuite/tests/c_api/unit_file_providers/test.out	2018-07-05 20:58:47.363026320 +0200
+@@ -5,6 +5,8 @@
+ Calling ufp_get_unit_filename (some_field=42, kind=0) with name: "foo"
+ Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
+ Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
++Calling ufp_get_unit_filename (some_field=42, kind=0) with name: "foo"
++Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
+ <DottedName 5:17-5:22> resolves to:
+   <ObjectDecl ["I"] 2:4-2:21>
+ Calling ufp_destroy (some_field=42)
diff --git a/dev-ada/libadalang/libadalang-2018.ebuild b/dev-ada/libadalang/libadalang-2018.ebuild
new file mode 100644
index 000000000000..14689aeaafd1
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-2018.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MYP=${PN}-gpl-${PV}-src
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
+	-> ${MYP}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018"
+
+RDEPEND="dev-python/pyyaml
+	|| (
+		dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
+		dev-ada/gnatcoll-bindings[iconv,shared,gnat_2016=,gnat_2017=,gnat_2018]
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	>=dev-ada/langkit-2018"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	ada/manage.py generate || die
+}
+
+src_compile() {
+	ada/manage.py build || die
+}
+
+src_test () {
+	ada/manage.py test | grep FAILED && die
+}
+
+src_install () {
+	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
index 31ddba84751f..7af420635599 100644
--- a/dev-ada/libadalang/metadata.xml
+++ b/dev-ada/libadalang/metadata.xml
@@ -8,6 +8,7 @@
 	<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>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
 	</use>
 	<longdescription lang="en">
 		Libadalang is a project to build a high performance semantic engine for
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index c54ebfaf4d15..77803838eed8 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -5,5 +5,5 @@ DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 EBUILD libgpr-2016.ebuild 1243 BLAKE2B 68a8d2acd9a75c49cdbfc8828bc004ca4f1a586914302f108fdb655672ea229d965c3d00f08b041c6dc32316627d90a0d9fb1ca9c9126cf9f5fbd51e07043831 SHA512 389b16cbf67e40ef924f50492ac81cecb54eddf25342a435d16cebaf7b3b1be74e86b7ed2539a2c4cbb288f301ed6877998f8c50d5788fb7d075143f9f917349
 EBUILD libgpr-2017.ebuild 1388 BLAKE2B 97c790d84d22f76209bdc4f47a834a190e5faa8f6a3b179bf0d67ef91077e9c98b6a522903ee232a0444dd73a9fb6b8862f2a98155241657193c0175ef03ec93 SHA512 0430a17c2e7250b209cbe9508229a4dc59ff9f3b1f51f2c13de8a6484703946e59ae7380169c0e892b45aa78a5275b987075cf0903ab9e59068e30fab59945ac
-EBUILD libgpr-2018.ebuild 1537 BLAKE2B 3a920d3d91da3d6cc0da615d57b2ad14234d511217f470de605c5813931a258e4f7248bf805b60e269da1bd3b8adb3724ac28e4e5f5e6058287c2b95c3d1e258 SHA512 2cdd8a531356015edff8253dce2f0d83b6d878a8336c751ee11536bff8ac40bc400dd2a6b26d7f08231c3d6e7da4800556a20fd88bf5dace521bfff8d785de07
+EBUILD libgpr-2018.ebuild 1546 BLAKE2B 2a9fe66051f7ee45c2007191903f7750c5124cd7b2549c45a1325b779802164ff95f52c90b8532003a1c0bf6cf2fc18ff59f16ee141776d948ec5208e942b258 SHA512 8458b8b1e0df071a827f3443488975ecc382b5e796f038e716ad562ef0e9200fd1eee29383763f45eb27d9578869206b924e6ffadb54808044716b50353882fc
 MISC metadata.xml 1175 BLAKE2B 8b512fd5efae4481d319fc52a11f3730af081d5c3ff12f6c6d62768e905e0651e3b4792765f65edbf659862b56372f32ba3aa7ae51c12b2911b711cb12a013e1 SHA512 edd6bb889abfe036d2509e56f350cf058e249e398811fdb2890bd001b75143b8d9df28bb64acba195852d01d484b7e6381e82ce972aad6d8cf1e0c961b3ade72
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild
index 740fd1fbf765..9a2f65dac23a 100644
--- a/dev-ada/libgpr/libgpr-2018.ebuild
+++ b/dev-ada/libgpr/libgpr-2018.ebuild
@@ -19,7 +19,7 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
 	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 33304053e3eb..295e0834bd99 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -3,5 +3,5 @@ AUX xmlada-2018-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c92
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD xmlada-2017.ebuild 2120 BLAKE2B 075a4fc91c5a68063f01df6fbbadd51ba550cd4e1b6896b0ad4ab5345d920fbab354aa3dff9ad0c5609fa16a25173c7390cc03dce16cc59bf87c7c3335bcd17a SHA512 bb4e8f7623d06eec64d5677bb41ef69e2fe4dd503799c66da37a2d2a42f63ac125900a10c5f04c4ca1e9b19696c4112877ce233f009352f96b53fdb82eb4da7b
-EBUILD xmlada-2018.ebuild 1868 BLAKE2B e2754399074f9dd41c217781f9f774fa8cc4bebcd113959d1d716e952ecdc2a2422f5bafd256fb5be0f91ee9044f925258de54a21e55b81a953f9b1850404d5b SHA512 b760d9ac596ed331ac59bcce7c3cd2260d4f3e99cccd68980844641d153ffeb97abd2d21934b4f6314891983f8437713b3e907135815de730b0ef8aabc474e48
+EBUILD xmlada-2018.ebuild 1876 BLAKE2B 8ba99bf5e814c73acda968f19704b9c9e8133c44fbb5579089fb28671ab05046f9cf66c9faf9d4ad2ddbda6557a0e3e4f5d57285ead91cc8e8d6c3ad7d1dc294 SHA512 993cb87181ae50750db09301603658cfde9ddca99f91a0712af407a1fd6330709127cb57cafdcd3c37219b78e44ce420950502e48e7f2ee697552483f24d52f8
 MISC metadata.xml 1143 BLAKE2B 7f633dfb6a079c1e981b7b7fe53f60df746919bea32c32c257002c3e13682d24b269d5bbe1b61700df930b7722d3f503bfff52c00676301f7a19523749edda81 SHA512 ce5fe7f5ca7d79bbd4b648608f1521056b62b90c70aec62b49e4be5737319df56a9248bd57b695b1469e2bb9b9b49c6c910c2321f1a690546ae1447bb0519006
diff --git a/dev-ada/xmlada/xmlada-2018.ebuild b/dev-ada/xmlada/xmlada-2018.ebuild
index 04866d734b83..8d4099a1ce52 100644
--- a/dev-ada/xmlada/xmlada-2018.ebuild
+++ b/dev-ada/xmlada/xmlada-2018.ebuild
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
-	!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
+	^^ ( gnat_2016 gnat_2017 gnat_2018 )"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
 
 S="${WORKDIR}"/${MYP}-src