gentoo resync : 30.06.2018

24 files changed, 256 insertions, 84 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 379e4676d075..d4a1d79b4ded 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 2c7a10e8b683..f57cdc9b9fc2 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 11206881114e73637f9c063933bcfcba6cf663f864edf64037e51625918b1c05da79ea586d4fd76f2b096920c992f1a3e1cad10981f6370239e644da5de3c99a SHA512 31120e76cc569c89b406365b50914b1f5698b1e8b5c1cfda61b504dd420c374bf62170da5a2f4506b8e9e2f0033dac5d476677f5f5ec8c3114c52acb180c88f6
+EBUILD asis-2018.ebuild 1091 BLAKE2B ad0907a3a61a6aeb8e2e329d5300b7ba73ff30b55020c96b3c8142d4e182927770561f93af30eca12ad2ca5921c43dfadc59cffeabdca6b805fa30ec9ed62ef5 SHA512 eeceecf65f8a70eac5ba1d65cc860ae680ae5cdd5e6d1eee62605cd1b382618ad4cb25eb58c74abbc9d35a2cf9ef461e9f4f525cafa6ace9520eeb05dbd03fe1
 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 c23aae9d5e1b..129a8dc318f7 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-2018.ebuild
@@ -20,7 +20,7 @@ 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.0"
+	dev-lang/gnat-gpl:7.3.1"
 RDEPEND="${RDEPEND}"
 REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018"
 
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index e2213fee8f77..0ae1be66e60c 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -2,5 +2,5 @@ AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb8
 DIST aunit-gpl-2017-src.tar.gz 638311 BLAKE2B aa551202677983451d1c8c9f248d85d58f6de442797ee5a3c14d418de1cd8e9a58a82ee7b8bb5b64da924265ef26c64b5d69e86f0103f0721b2c6e007896f6bb SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4
 DIST aunit-gpl-2018-src.tar.gz 639544 BLAKE2B a7d7469b0ec4951517b113a794dca4399a27d6d5d848194fc5bfa7728a5cd04644e4b5f1247eb3cfbab64c0294502ac70cdd6e7052cd60b788c7892eddb4294e SHA512 3409b490978e9160e3ec2d9214d50f846c4c38f7a728cd4ff306d6454d1e0944023342f17a580b0449cb528f42d3c608adec58b61318284237d02b7f77498513
 EBUILD aunit-2017.ebuild 1040 BLAKE2B d90758ca89ce116afcbb613e9496a8c71c736600ae69ee2d9505b9b6b922906ac37300449d406c4062340706ea4064e2198a4dc2c5a3de6339daeba00eb1ae8b SHA512 fbf380c4ede428883249f7661f515b1a91cdb0b828aba2be1a46be443d81134b242375aaf4e3f128fb5c1b41505149a229c16b1b7d5bc0bc627c51775aba0604
-EBUILD aunit-2018.ebuild 1113 BLAKE2B 35def93436e0cc19d37a845ac1b0f37c83429831ff5647d89465697beaddfad9c8d81793a13bc185ed10fe9e47508f662e889b97d579da617f2474e5224137dd SHA512 07b8de3d35451d849b5c549b2176f84fface94d5b7b8d37d112f5190e1ab3a3a1623dae5856bc518e06c256c8166ce8e1571ed1dc285813413d17dc89bd7840d
+EBUILD aunit-2018.ebuild 1158 BLAKE2B bcbf5cede0254e73aedfa0c6ea23988d62501af208fcaf296e3e681d2d21516d534b6b1f8d54918b57c0abeba259d6330c5f66d2d9f1619c00c9ab4dfa627069 SHA512 bef7c6b556515c28d34fa9d67008fea8b833ccbdc2979cee2ab86e15ee4d21c7d27c61133043f79ed2f7b549dacac2e3dac67e5ad4ddfe3aaa5bdf73b32c7b5f
 MISC metadata.xml 1003 BLAKE2B 3e0c97d5fd20eca517240a72cc7164e48f6e89db9a3ee313e1493c5f613857fd5c118b6d588266fa59dc6fc66a6da88487367526082462e3dbebc1e41379af78 SHA512 f3b1d914eaa4d7d0aa2143ef00c9d42f6dd86dc5e913fbce014c36fec8b26c65127dbe7f10661759256899596b79d7aba49315f01e1176f9d0b97c8f4fe04dc4
diff --git a/dev-ada/aunit/aunit-2018.ebuild b/dev-ada/aunit/aunit-2018.ebuild
index 229589904c86..95e27b8d0b26 100644
--- a/dev-ada/aunit/aunit-2018.ebuild
+++ b/dev-ada/aunit/aunit-2018.ebuild
@@ -19,7 +19,7 @@ IUSE="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.0 )"
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
@@ -40,4 +40,5 @@ src_install() {
 	rmdir "${D}"usr/share/doc/${PN} || die
 	mv "${D}"usr/share/examples/${PN} "${D}"usr/share/doc/${PF}/examples || die
 	rmdir "${D}"usr/share/examples || die
+	rm -r "${D}"/usr/share/gpr/manifests || die
 }
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index 631a13ecdf8b..a794df771b59 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -5,5 +5,5 @@ DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818
 DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
 EBUILD gnat_util-2016.ebuild 1477 BLAKE2B 2b9e5cc94fee078cf11c870198668ef563507bfbeecc8da8553967e2a261685fa8affa89a56ba85a9522c894c263040eacfce0790fb5e11a89b4a3c9a70cf683 SHA512 b314664a35c77809172a8ac8fb6d07e565d98877ce9847b082d5386aff279cd87527b199881e84795254e68cde6fcd06f69ace8a3dcb016bc614def523f60957
 EBUILD gnat_util-2017.ebuild 1404 BLAKE2B 7f66ffa00fd9cfc9d4af3e0bafc945582f720d134b9b56ac2939cd9e05423dd944103d1004b7b7bab93a499d40ae7922cd93084f531ab79f5bedd39407b8fac4 SHA512 4c056592777aeaab9f908ee39c6d1f27be12900b73626db628225b4ca6575c3821d51239f75ee15f931dc41a1c55ccef4a772c58a3c96022a4fdd196fcf57c6c
-EBUILD gnat_util-2018.ebuild 1383 BLAKE2B 3ded125713d428453b9777fa7a06dfed7caab00a9410c8a7650c476e83512749f1bfa25e953675426fcd2daeac49cf5d2131561db4c66ba67ae898bffbc667ae SHA512 253790479745562f02fd9441bdc4772cb4822943bd3a33d2e28b440ce1fef1ec3b11314a4882d4d4ebfa3484cd1363e8636d97ba6a8dcdba58b3a14d2e8f6735
+EBUILD gnat_util-2018.ebuild 1383 BLAKE2B 4d0dc5cf21c7c4505197f7fb564b51adcf06f852b79119ba363483e7561dc8fe75b53385ca3a4f4bafc4e1f9693bac140ace09b567e5454a1c58f86d8a759417 SHA512 d83632a99afb02d389d80da648dcd56bf78b40dafa35e0583ae2ef57024d60fafca94fd31a1da549db2ed15db5022d6c33dabe09cbc5339f4a9840bb9685dd4f
 MISC metadata.xml 1157 BLAKE2B e747ed9b4c63bd802debbc784ca3aed291382259989a1ca3c5622a8058e407df3133d05635ba7442038dd78d5627bb37a9f16af278aa9bb490244884532a00c2 SHA512 b7dad53debfedd16f6192d7632557b4a65580bae8a47bef0d6138958b91ac329c96e629713c3274707a70846f332834081755fbb77c12842e75da966a39ec6ad
diff --git a/dev-ada/gnat_util/gnat_util-2018.ebuild b/dev-ada/gnat_util/gnat_util-2018.ebuild
index 3f9094eca060..a60bab1f3254 100644
--- a/dev-ada/gnat_util/gnat_util-2018.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2018.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
-RDEPEND="dev-lang/gnat-gpl:7.3.0"
+RDEPEND="dev-lang/gnat-gpl:7.3.1"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2018]"
 REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018"
@@ -27,7 +27,7 @@ S="${WORKDIR}"/${MYP}-src
 PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_compile() {
-	GCC_PV=7.3.0
+	GCC_PV=7.3.1
 	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index ceda2896b36f..e106c7d9a497 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,4 +1,4 @@
 AUX gnatcoll-bindings-2018-gentoo.patch 395 BLAKE2B 2815a837cf68eb545c35d46d70b24fab8664580457f1525784c83519918984e225bde66a93c336f88f87ac0d6436229f350fa3b6e2d2f7bf2c37dd3bc55aa771 SHA512 e6511dac4d89c8751a0806495459de9d691a2136010ad4e6be31413a86659e286a6abcb53340dc22df2714eec925f26b7b222e63bd292e9689baa50a9a205d0c
 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
-EBUILD gnatcoll-bindings-2018.ebuild 2134 BLAKE2B 7ffaeb17532de03669e737f6e556324f0864a90bcbcbc9b16262b4ab42d8c6d729df5118a873643f7b736c8f8e7e0a63642f39c038ed6fc212ec029f93c8863a SHA512 628b9f865bdfd1834c4e3cc0b7b488eb1586d8788966197f4bfaf9d353d38fab6f19f426de8c3662e53addb619d0a4a313aa88c900c349ea5aa7f98188beabad
+EBUILD gnatcoll-bindings-2018.ebuild 2070 BLAKE2B ce662822fdbf11f440711993e4ac913bc43f6dd481930491f2c465a44025aaa7102ba8e3ca790d83826776ccbaf0c3532fb503ec7cd472daaade2620acbb77f0 SHA512 299300f491cc4e65723b7c8c494bc3d8367c9b5c496f867173286376e9269797e98ef8f7467b2eed81514f39c50cbf0fefd64c9acdf633a5531ea3ea74cc72f6
 MISC metadata.xml 1317 BLAKE2B 99ea5cb11a8d16c2cde5c902f68f515b2a337d2753453405f2747c72e1d15ba597991ed2bc8d842d1ff127be653d9e59c9e18eec8e034bd5a3bb3726a8ed35a2 SHA512 833bd43bb77645561af5df8ebe904e1b2354ca4be7915aa0fdbe6f6986b116cb8850d91d36bfb1bfd520e037ce93eb206b86488939840e2f64e714f5c1daa083
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
index 238c3d8a2042..4cc7fcaf6a9b 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
@@ -18,30 +18,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared
 	static-libs static-pic syslog"
-# gtk iconv postgres pygobject projects sqlite tools
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
-	dev-ada/gnatcoll-core[gnat_2018,shared?,static-libs?,static-pic?]
-	dev-ada/libgpr[gnat_2018,shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2018,shared?,static-libs?,static-pic?]
-	dev-lang/gnat-gpl:7.3.0
+	dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
+	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
 	gmp? ( dev-libs/gmp:* )"
-
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2018]"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	!gnat_2016 !gnat_2017 gnat_2018"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) !gnat_2016"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	GCC_PV=7.3.0
-	GCC=${CHOST}-gcc-${GCC_PV}
+	if use gnat_2017; then
+		GCC_VER=6.3.0
+	else
+		GCC_VER=7.3.1
+	fi
 	build () {
-		GCC=${CHOST}-gcc-${GCC_PV} gprbuild -j$(makeopts_jobs) -m -p -v \
+		GCC=${CHOST}-gcc-${GCC_VER} gprbuild -j$(makeopts_jobs) -m -p -v \
 			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
 			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
 			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
@@ -62,9 +60,8 @@ src_compile() {
 
 src_install() {
 	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr \
-			--build-name=$2
+		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
 	}
 	for kind in shared static-libs static-pic ; do
 		if use $kind; then
@@ -77,5 +74,6 @@ src_install() {
 			done
 		fi
 	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs
 }
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 1503abd5c512..af6ca1c82757 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 1621 BLAKE2B 7e514ef506d50e727ef3e126d3c1076bbb8eb362414a89db5370cffc4f90f23b81d99980ec59e217bf55a1c0ae9ef29def8393b35df072ab228c17e5c6f9f58e SHA512 2d2a9a2115150885f1cac1b6e4022a8e133563259cb90b63040676b3c786c94fb2d38fba022c3ceef952d6bc737f0ae215994f7450d90f6635930386e06c79f4
+EBUILD gnatcoll-core-2018.ebuild 1675 BLAKE2B 8952951b57b0778de9d70a45b70dd9abc736e6b481e9a744fa584fa22148214cfcff28368ffdfec47a5fca7f618735b32e648f4791a89152879d04e478a39249 SHA512 1a903ce8a641e900fe1c3e50da143923677eb102aaf7a0bbbd039daa4d368a62a1d65dd0ac7449acdd92218dab642e65e7447e4d4a7e3891561e58a6f98d1d2b
 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 38313cd8d131..3b34184becc8 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
@@ -16,21 +16,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
-RDEPEND="dev-lang/gnat-gpl:7.3.0
-	dev-ada/libgpr[gnat_2018,shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[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_2018]
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]
 	!dev-ada/gnatcoll"
 
-REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018"
+REQUIRED_USE="!gnat_2016"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
-	GCC_PV=7.3.0
+	if use gnat_2017; then
+		GCC_PV=6.3.0
+	else
+		GCC_PV=7.3.1
+	fi
 	default
 	sed -i \
 		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
@@ -70,5 +74,6 @@ src_install() {
 	if use static-libs; then
 		emake install-static
 	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs
 }
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
new file mode 100644
index 000000000000..7b4c1ba77dad
--- /dev/null
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -0,0 +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
+MISC metadata.xml 1519 BLAKE2B 93aa938ca272fb984d08a0471ff339204d0afc854f9fddc4c1f0e060650263c36166e1de91453bdfd52bc0d53844c7042c6f5b14d955b72ab042e6dffadaf4f4 SHA512 27cf0aa52080186fd7970dc02f31eb861ee20edc08366926ea29ec0a826d10c92d80eea840a403fe9be1ccf0be33aaf866f94fe66d351926ffb30104ce143e88
diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
new file mode 100644
index 000000000000..e6d5119aed4e
--- /dev/null
+++ b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/sqlite/gnatcoll_sqlite.gpr	2018-06-24 14:08:52.477478654 +0200
++++ b/sqlite/gnatcoll_sqlite.gpr	2018-06-24 14:08:59.149372684 +0200
+@@ -42,7 +42,7 @@
+    for Library_Name    use Name;
+    for Library_Version use "lib" & Name & Gnatcoll.So_Ext & "." & Version;
+ 
+-   for Languages use ("Ada", "C");
++   for Languages use ("Ada");
+ 
+    Thread_Lib := ();
+ 
+--- a/postgres/gnatcoll_postgres.gpr	2018-06-24 16:39:56.345322365 +0200
++++ b/postgres/gnatcoll_postgres.gpr	2018-06-24 16:40:30.737772583 +0200
+@@ -81,6 +81,7 @@
+             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
+             for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag;
+       end case;
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Binder is
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
new file mode 100644
index 000000000000..6fbd4efebd91
--- /dev/null
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit multilib multiprocessing autotools python-single-r1
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres
+	+shared sql sqlite static-libs static-pic xref"
+
+RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
+	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:* )
+	xref? (
+		dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
+		dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
+	)"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018]"
+
+REQUIRED_USE="!gnat_2016
+	sqlite? ( sql )
+	xref? ( sqlite )
+	gnatinspect? ( xref )
+	gnatcoll_db2ada? ( sql )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+	GCC_PV=7.3.1
+	build () {
+		GCC=${CHOST}-gcc-${GCC_PV} \
+			GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
+			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
+			-XGNATCOLL_VERSION=2018 \
+			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
+			-P $1/$3.gpr \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	if use shared; then
+		preflib=relocatable
+	elif use static-libs; then
+		preflib=static
+	else
+		preflib=static-pic
+	fi
+	for dir in gnatinspect gnatcoll_db2ada ; do
+		if use $dir; then
+			build $dir $lib ${dir}
+		fi
+	done
+}
+
+src_install() {
+	build () {
+		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
+			-XBUILD=PROD -XGNATCOLL_VERSION=2018 \
+			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
+			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
+			-P $1/$3.gpr
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in sql sqlite xref postgres ; do
+				if use $dir; then
+					build $dir $lib gnatcoll_${dir}
+				fi
+			done
+		fi
+	done
+	for dir in gnatinspect gnatcoll_db2ada ; do
+		if use $dir; then
+			build $dir $lib ${dir}
+		fi
+	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml
new file mode 100644
index 000000000000..4a18c9113ff2
--- /dev/null
+++ b/dev-ada/gnatcoll-db/metadata.xml
@@ -0,0 +1,33 @@
+<?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>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnatcoll_db2ada">Build gnatcoll_db2ada</flag>
+		<flag name="gnatinspect">Build gnatinspect</flag>
+		<flag name="shared">Build shared library</flag>
+		<flag name="sql">Build sql library</flag>
+		<flag name="static-pic">Build shared library</flag>
+		<flag name="xref">Build xref library</flag>
+	</use>
+	<longdescription lang="en">
+		The reusable library known as the GNAT Component Collection (GNATColl)
+		is based on one main principle: general-purpose packages that are part
+		of the GNAT technology should also be available to GNAT user
+		application code. The compiler front end, the GNAT Programming Studio
+		(GPS) Interactive Development Environment, and the GNAT Tracker
+		web-based interface all served as sources for the components.
+
+		The GNATColl components complement the predefined Ada and GNAT
+		libraries and deal with a range of common programming issues including
+		string and text processing, memory management, and file handling.
+		Several of the components are especially useful in enterprise
+		applications.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 8e04e0877ac6..829505901c9a 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -3,5 +3,5 @@ AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547
 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 3054 BLAKE2B 7a0bbdff620eba5c2fa4d5741bc16af0e0a041350480740f6c3f3950f853f62ccf1373c11c98d21a290fbcb6b767713fbcb360ec8f59cdb634d1b791f8644284 SHA512 0d86e9b77320282b2c3044bda968465abc1157e114c113ae891776aa0f480c62158f2d7ad94cee2b77b570a4c89440d5b7863c18403886b9b509d88d80652f25
-EBUILD gnatcoll-2017.ebuild 3182 BLAKE2B 232707259e63fed9456d8e0556d6a83fc9a865f4838b484ab7abf63e6f1d2c3787f3851d31336492f9a365fc69023b735c03ea1031e8bd73b22017d1d3deb27f SHA512 befa784e50a609921169fd9f7073fe0098eee30bc2a8ac37e19ff3b355926d2dbc6cea626d14af4513490ec421deb90b35a902ae5f1b3089f7135d743434f0b9
+EBUILD gnatcoll-2017.ebuild 3182 BLAKE2B 7bed5c75933d402a26f62f83922df50ab786980ce80059abf833f0ceab9f9e421c257a84ef5f9c5cafc506b22e7c29d2f158d20c1653e3c72a1286668025cec4 SHA512 a1a8fb749a8df6276b33c19063ea9e5d59543e8abf1fea7ec32725ba00166aed1d11ddb77b9d5322a05da6522c45cba6730602b1902c5ebdf79cd05467c6e682
 MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 7340f0455856..e13a6333db26 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -34,7 +34,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		>=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?]
+		=dev-ada/libgpr-2017*[gnat_2017,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 388d9b6e27ff..10bcc2041499 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,11 +1,11 @@
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2017.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
-AUX gprbuild-2018-gentoo.patch 2884 BLAKE2B 8f50d855883ab7e051fb8275f30f21af87a03e0f43ed94e1badfca24c96bcb0925ff551afec743d6b8d4a6958487ac748d9abc2626b91c4fb4d42692626e4581 SHA512 ab4f93c7869fb682bd9e647ea1ca21dcf3d1d39f76ac170f871d09d850beb0d6c8b07bcc97a3f45304f86cb591782d51124e6bae7f410542c6c660535b067f42
+AUX gprbuild-2018-gentoo.patch 3384 BLAKE2B cf10449869b12fad0043b7422e6ce51a0c3a72a145b517b752c43d30f675366b0c7b5b2881b8d66c65848b637bd3bdad0fe0182551bb0e391c8e86d311349610 SHA512 29a751fbae2630d53c3d0c7a7ccb4a0828ceb17928eae25665fd7d5d3b2d4d8693e5b3a9a14718f8dee1cae94cd2d321ec3070a5fd0daf4da7ae475edd373874
 AUX gprbuild-2018.xml 3844 BLAKE2B ca36a571c90235d7f2468ffcd3b1f6703a19ae99c582a6c8a88bb9a237d02c119b191d3d8f8f941e974c74192b1ecab28c9d54fb7c4a9de02691989810e772d8 SHA512 13ba2efec9fa9fa0023d052163e186e9ccad1e8c80acff972568323b7e614dd9953f7c2a8f3a5d2f95eaee17072b1c50a2da5c3c2daafa81f5d2ab17fb95bf89
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 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 cfd22d168d1644d13c30b143299581dc97bb0ba7b69457e1f04103b59d429ea34d5b814823c1b7c93c622dc52b4c4e49df42bb15ae185b58b310ad58651bd87f SHA512 357b92851c14bd0ee5daf89e70b5ab1595a92c54e946ae2938a3500064520d81f9ee7ef00bd3a3dc1906a6db2bd5014cb87e415ddf51aa1daf2db5d6fa5d12e9
+EBUILD gprbuild-2018.ebuild 2122 BLAKE2B 44aad2909aeb39d064a3f306476a1689945c45367cbc1d29e497c01fa321b2bc03095b22e8fae15c6995c5cd2a11dc83c203fcd652482f6d9f3d39568d381ec7 SHA512 8dc48bef4b704b4d828252a11c3df4fae821e1cf41fbedd6ac25570036a01351a8820c0332b0c244866e9157cf2fe1c23687f363700197029caf7362909194e0
 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index c5225d8d11f2..35a98ae03fcb 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -1,5 +1,5 @@
---- gprbuild-2017/gpr/gpr.gpr.old	2017-05-27 20:59:07.061135892 +0200
-+++ gprbuild-2017/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
+--- a/gpr/gpr.gpr	2017-05-27 20:59:07.061135892 +0200
++++ b/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
 @@ -67,6 +67,7 @@
              for Switches ("gpr*.ad?") use
                Compiler'Default_Switches ("Ada") & ("-g1");
@@ -8,8 +8,8 @@
     end Compiler;
  
  end GPR;
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
+--- a/gpr/src/gpr-names.ads	2017-11-19 13:09:18.947527738 +0100
++++ b/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
 @@ -27,6 +27,8 @@
     Name_Buffer : String (1 .. 1_000_000);
     Name_Len    : Natural := 0;
@@ -19,8 +19,8 @@
     procedure Get_Name_String (Id : Name_Id);
     procedure Get_Name_String (Id : Unit_Name_Type);
     procedure Get_Name_String (Id : File_Name_Type);
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
+--- a/gpr/src/gpr-names.adb	2017-11-19 13:10:27.674316703 +0100
++++ b/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
 @@ -354,6 +354,8 @@
  
        Name_Chars.Append (ASCII.NUL);
@@ -39,8 +39,8 @@
        return Name_Entries.Last;
     end Name_Find;
  
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
+--- a/gpr/src/gpr-snames.adb	2017-11-19 13:12:41.592995718 +0100
++++ b/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
 @@ -53,6 +53,10 @@
           return;
        end if;
@@ -52,18 +52,20 @@
        Add_Name ("a");
        Add_Name ("b");
        Add_Name ("c");
---- gprbuild-gpl-2017/src/gprlib.adb.old	2017-12-18 12:20:02.937317216 +0100
-+++ gprbuild-gpl-2017/src/gprlib.adb	2017-12-18 12:21:36.519604590 +0100
-@@ -263,7 +263,7 @@
+--- a/src/gprlib.adb	2017-12-18 12:20:02.937317216 +0100
++++ b/src/gprlib.adb	2017-12-18 12:21:36.519604590 +0100
+@@ -263,7 +263,9 @@
  
     Driver_Name                   : Name_Id := No_Name;
  
 -   Gnatbind_Name                 : String_Access := new String'("gnatbind");
 +   Gnatbind_Name                 : String_Access := new String'("@GNATBIND@");
++
++   Gnatbind_Path_Option          : constant String := "--gnatbind_path=";
  
     Compiler_Name                 : String_Access := new String'("gcc");
  
-@@ -2237,13 +2237,13 @@
+@@ -1944,13 +1946,13 @@
                            and then Line (Last - 2 .. Last) = "gcc"
                          then
                             Gnatbind_Name :=
@@ -79,3 +81,18 @@
                          end if;
                       end if;
  
+@@ -2100,7 +2102,13 @@
+                Mapping_File_Name := new String'(Line (1 .. Last));
+ 
+             when Binding_Options =>
+-               Binding_Options_Table.Append (Line (1 .. Last));
++               if Last > Gnatbind_Path_Option'Length
++                  and then Line (1 .. Gnatbind_Path_Option'Length) =
++                     Gnatbind_Path_Option then
++                     null;
++               else
++                  Binding_Options_Table.Append (Line (1 .. Last));
++               end if;
+ 
+             when Copy_Source_Dir =>
+                Copy_Source_Directory := new String'(Line (1 .. Last));
diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild
index 2a10644bfbb2..19175a509333 100644
--- a/dev-ada/gprbuild/gprbuild-2018.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018.ebuild
@@ -21,7 +21,7 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
 DEPEND="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.0 )"
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}-src
@@ -35,7 +35,7 @@ src_prepare() {
 	elif use gnat_2017; then
 		GCC_PV=6.3.0
 	else
-		GCC_PV=7.3.0
+		GCC_PV=7.3.1
 	fi
 	sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
 	default
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 05bbd9f159a5..c54ebfaf4d15 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 1458 BLAKE2B bbbc9cdd16d5cd1a650bd8725c276720a1d3923312142dfaf7dfc74a986954531a565f5ebad39826519be09d82b3e49468470fbe466ecd8e6791dcd460b2f236 SHA512 7256f63a32d6e64d6d19991fc424bbba5e293604406234ab13e224b6b0002a07bd0b3372f84fc8ccd4a31c9a55f98a01d288edf46a7ea608e7a66a5b70c36bbc
+EBUILD libgpr-2018.ebuild 1537 BLAKE2B 3a920d3d91da3d6cc0da615d57b2ad14234d511217f470de605c5813931a258e4f7248bf805b60e269da1bd3b8adb3724ac28e4e5f5e6058287c2b95c3d1e258 SHA512 2cdd8a531356015edff8253dce2f0d83b6d878a8336c751ee11536bff8ac40bc400dd2a6b26d7f08231c3d6e7da4800556a20fd88bf5dace521bfff8d785de07
 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 fa24b7210d56..740fd1fbf765 100644
--- a/dev-ada/libgpr/libgpr-2018.ebuild
+++ b/dev-ada/libgpr/libgpr-2018.ebuild
@@ -16,13 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
-RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=,gnat_2018=]"
+RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
+	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
 S="${WORKDIR}"/${MYP}-src
 
-REQUIRED_USE="|| ( shared static-libs static-pic )"
 PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_configure() {
@@ -40,7 +40,7 @@ src_compile() {
 	elif use gnat_2017; then
 		GCC_PV=6.3.0
 	else
-		GCC_PV=7.3.0
+		GCC_PV=7.3.1
 	fi
 	GCC=${CHOST}-gcc-${GCC_PV}
 	if use shared; then
@@ -63,4 +63,6 @@ src_install() {
 			emake DESTDIR="${D}" libgpr.install.${kind}
 		fi
 	done
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
 }
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index c2ea8f36d2ba..33304053e3eb 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 2193 BLAKE2B 9b3030c7b5d8cda39aac1bbd25ad83b1d3e01a5fdcc133103505e38d3b051728f581846157d50a511e6543f0f362187f969cee733d38181b0055f8a41dde4b9f SHA512 c1c1bcc1907a7faf30616ddbaa67e9abe5ce510f83becb0c2cea817abf88a1b188617b41ef9fa19900824ee288585ab4204b6dcd741fec92399900eb1a4523ea
+EBUILD xmlada-2018.ebuild 1868 BLAKE2B e2754399074f9dd41c217781f9f774fa8cc4bebcd113959d1d716e952ecdc2a2422f5bafd256fb5be0f91ee9044f925258de54a21e55b81a953f9b1850404d5b SHA512 b760d9ac596ed331ac59bcce7c3cd2260d4f3e99cccd68980844641d153ffeb97abd2d21934b4f6314891983f8437713b3e907135815de730b0ef8aabc474e48
 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 0696bbdadb19..04866d734b83 100644
--- a/dev-ada/xmlada/xmlada-2018.ebuild
+++ b/dev-ada/xmlada/xmlada-2018.ebuild
@@ -17,11 +17,11 @@ 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.0 )"
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
 
@@ -56,38 +56,25 @@ src_test() {
 }
 
 src_install () {
-	local includedir=/usr/include/${PN}
-
-	fix_install () {
-		mv "${D}"${includedir}/$1.$2/* "${D}"${includedir}/$1/ || die
-		for file in "${D}"${includedir}/$1/*; do
-			dosym ../$1/$(basename ${file}) \
-				${includedir}/$1.$2/$(basename ${file})
-		done
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
+			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"usr \
+			--install-name=xmlada --build-var=LIBRARY_TYPE \
+			--build-var=XMLADA_BUILD \
+			--build-name=$1 xmlada.gpr || die "gprinstall failed"
 	}
-
+	if use shared; then
+		build relocatable
+	fi
 	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) install-static
+		build static
 	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake PROCESSORS=$(makeopts_jobs) install-${kind}
-		fi
-	done
-	rm "${D}"/usr/lib/libxmlada_* || die
-	for dir in xmlada_{dom,input,sax,schema,unicode}; do
-		dodir /usr/include/${PN}/${dir}
-		if use shared; then
-			fix_install ${dir} relocatable
-		fi
-		if use static-libs; then
-			fix_install ${dir} static
-		fi
-		if use static-pic; then
-			fix_install ${dir} static-pic
-		fi
-	done
+	if use static-pic; then
+		build static-pic
+	fi
+
 	einstalldocs
 	dodoc xmlada-roadmap.txt
 	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
+	rm -r "${D}"/usr/share/gpr/manifests || die
 }