gentoo resync : 14.07.2018

16 files changed, 248 insertions, 10 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index ce4d090b90cb..2e26ed4c9204 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 1be0f07df28f..f68b35ec3341 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 1053 BLAKE2B 015860a7e4f4300d7f4c506ec08d7caccba622c3ed3fb04949b01c98fe0199e287a751c30548871614bc15fcc32664f824f5bc089803cc14314eaa155007759f SHA512 a2b9c5b4ece4b347c8f713abcf7430343c6fcbe0896d5ac3d8df18fad11468c1fa451936d0db9087d0aee3d6072c65c8d764fe557a83f9188060802da9aee6cf
+EBUILD asis-2018.ebuild 1094 BLAKE2B 8f7ad8347e9587d430565d39e6764bc4f1f8a4ca17df6278d9b1e2e798e30220b6b8446a76263d76f17ad64d0193459c63c646c70f0e9e23a92777bd44663a96 SHA512 4815766b0b98af239be713dfb3a97a4c2ece83a5e66ca50ce2c66d1ca9732e26ae112b514c660d268b6b1c641fe9a2f4cfabb322a8290e4cbd6c6a0fb8e067e9
 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 7a47041ede89..88b9ba97d07e 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-2018.ebuild
@@ -39,4 +39,5 @@ src_install() {
 		-XLIBRARY_TYPE=relocatable \
 		-XXMLADA_BUILD=relocatable"
 	rm -r "${D}"/usr/share/gpr/manifests || die
+	mv "${D}"/usr/bin/gnatpp{,-asis} || die
 }
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index e106c7d9a497..8e3b8ef0c2b5 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 2070 BLAKE2B ce662822fdbf11f440711993e4ac913bc43f6dd481930491f2c465a44025aaa7102ba8e3ca790d83826776ccbaf0c3532fb503ec7cd472daaade2620acbb77f0 SHA512 299300f491cc4e65723b7c8c494bc3d8367c9b5c496f867173286376e9269797e98ef8f7467b2eed81514f39c50cbf0fefd64c9acdf633a5531ea3ea74cc72f6
+EBUILD gnatcoll-bindings-2018.ebuild 2207 BLAKE2B 0eb1b8cdf92c3d37db3bd5d6a9587319530389f2eb6f9abbf4f0a4b42009f7a180d043a401fefc355ccd32d798fb83db7ce74c5ad40f13e70ed46f7b7f54f5dc SHA512 3dfaa068b84de81873cbfa4232bae4070d020c42aa9863785b5630ee3e618cbcbcd1083e668f0a967d6b2cc3d3f7ebe65dbaa6fef478beeea8cd593fb7a96308
 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 4cc7fcaf6a9b..8c6d81608c04 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
@@ -74,6 +74,12 @@ src_install() {
 			done
 		fi
 	done
+	if use iconv; then
+		sed -i \
+			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
+			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
+			|| die
+	fi
 	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs
 }
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index fc30dd6b8c1a..f1e529c2cf91 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 2123 BLAKE2B f9149135b6624e2a0701badae3258f79189a5690cdba6331513e7098b703f50b532868d8e2d868c7d9175ff65270821416fee87bf4d099275c37bd15c8e1befb SHA512 c679ce1d60c341c16f7c68d698b317ae3cf68f03fefac9ec324c9f4564c2bd7d79bc69f2b1cc56018e381183b0834275c578e76d6e940764655533cdaac52e24
+EBUILD gprbuild-2018.ebuild 2204 BLAKE2B affcc6b4a174e98efc65b5742c67d0d7824c2fc88f57b018905dd6de15491d1c28a6101c7469a10bfd75ffea60e882042cac523879326a16cd158ccbe0237b7f SHA512 1f739c44179a0f5fbdc8890d99af83561d06e8df8f8c59fa08506a0c5af2415389f881ac4a1ea861fb97f2e0e716f9a0818536c5dce85e8d10ec5b11807f0639
 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 f071a9a88506..95d0bdafd854 100644
--- a/dev-ada/gprbuild/gprbuild-2018.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018.ebuild
@@ -43,6 +43,10 @@ src_prepare() {
 		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
 		src/gprlib.adb \
 		|| die
+	sed -i \
+		-e "s:\"-Wl,-r\":\"-r\":g" \
+		share/gprconfig/linker.xml \
+		|| die
 }
 
 src_configure() {
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 8fcef2079d62..b5fef0b0a68c 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,5 +1,9 @@
 AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b
+AUX gps-2018-gentoo.patch 3372 BLAKE2B 22128eca9a779dc7bc9659d27f439e881570342d8057e8bad9c1a99600a120f193c4d662d089846aefb8ac0c21cc60c68027c8c997dcbd140c390bc61d760007 SHA512 1c27b56d89c9edea301dfdbfd47d52ab1449805da888c6709115e6d43a8d6270cb57b56f2a18863dcc74f241aaa7e57c12d076cd0bffbd175df519033cb635e9
 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
+DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
+DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2017.ebuild 1946 BLAKE2B 8f1619962738e8d1fe5a60baa3b63bc0318441b95234c0a667d12ad88040a62635b8b46ec94f3598e583dd33a3d88b2bb1f3dcbb191a1c3007eb9efc007144b8 SHA512 67c410fb567b5b82fce282803f5b6292b0b8b221a4f554eab11dd097229e88d614716ee212bf83695721e254892666b1231073d8616da3f2584f3e187fecfc5d
+EBUILD gps-2018.ebuild 1873 BLAKE2B d2c57775c79786768d82914f7c39679107f9130845c42fa62b9b471604dffe93a25550114d20b34577cdd7e7bd8ca6067782c9a85255dc3b75588c002f7ab54f SHA512 69c90e7005c0c474bb73ca20908fc2869f35960f340f365be79bbcaa5f37c5f727f61f2ffc75703105a211a69b25e3ccb7996f602656729861a5ce2b2fbadd50
 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch
new file mode 100644
index 000000000000..d03a01111223
--- /dev/null
+++ b/dev-ada/gps/files/gps-2018-gentoo.patch
@@ -0,0 +1,87 @@
+--- a/gps/Makefile	2018-07-09 20:27:34.950424490 +0200
++++ b/gps/Makefile	2018-07-09 20:37:39.510558817 +0200
+@@ -47,7 +47,7 @@
+ 	for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
+ endif
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
+-	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
++	  $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7
+ 
+ resources:
+ ifeq ($(OS),Windows_NT)
+--- a/testsuite/Makefile	2018-07-09 21:45:48.115937491 +0200
++++ b/testsuite/Makefile	2018-07-09 21:46:15.896547268 +0200
+@@ -13,7 +13,7 @@
+ endif
+ 
+ all default: package
+-	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
++	$(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable -largs -lpython2.7
+ 
+ package:
+ 	mkdir -p share/doc
+--- a/Makefile.in	2018-07-09 21:51:08.422550386 +0200
++++ b/Makefile.in	2018-07-09 21:51:32.187225891 +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
+--- a/docs/Makefile.in	2018-07-09 21:53:33.074572729 +0200
++++ b/docs/Makefile.in	2018-07-09 21:53:52.149311484 +0200
+@@ -1,4 +1,4 @@
+-prefix = @prefix@
++prefix = $(DESTDIR)@prefix@
+ docdir = $(prefix)/share/doc/gps
+ sharedir = $(prefix)/share/gps
+ 
+--- a/share/support/core/toolchains.py	2018-07-11 12:15:18.758674244 +0200
++++ b/share/support/core/toolchains.py	2018-07-11 12:20:20.389220849 +0200
+@@ -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>
+--- a/share/support/core/projects.py	2018-07-11 13:49:29.631289680 +0200
++++ b/share/support/core/projects.py	2018-07-11 13:51:46.568252607 +0200
+@@ -146,7 +146,7 @@
+           <string />
+        </index>
+        <specialized_index value="Ada">
+-          <choice default="true" >gnatmake</choice>
++          <choice default="true" >@GNATMAKE@</choice>
+        </specialized_index>
+    </project_attribute>
+ 
+@@ -166,7 +166,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>
+ 
+@@ -178,7 +178,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>
+ 
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
new file mode 100644
index 000000000000..e67c569534ff
--- /dev/null
+++ b/dev-ada/gps/gps-2018.ebuild
@@ -0,0 +1,78 @@
+# 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 autotools desktop
+
+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/5b0cf627c7a4475261f97ceb
+	-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
+	    libadalang-tools-gpl-2018-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools]
+		(
+			dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref]
+			dev-ada/gnatcoll-bindings[python]
+		)
+	)
+	>=dev-ada/gtkada-2017
+	dev-ada/libadalang
+	dev-libs/gobject-introspection
+	dev-libs/libffi
+	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}"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	GCC_PV=7.3.1
+	default
+	sed -i \
+	-e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
+	-e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
+	-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
+	share/support/core/toolchains.py \
+	share/support/core/projects.py \
+	|| die
+	mv "${WORKDIR}"/libadalang-tools-src laltools
+}
+
+src_configure() {
+	econf \
+		GNATMAKE=/usr/bin/gnatmake-7.3.1 \
+		GNATDRV=/usr/bin/gnat-7.3.1 \
+		--with-clang=$(llvm-config --libdir)
+}
+
+src_compile() {
+	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \
+		Build=Production
+	gprbuild -v -p -Pcli/cli.gpr -XLIBRARY_TYPE=relocatable
+	emake -C testsuite
+}
+
+src_install() {
+	default
+	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
+}
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
new file mode 100644
index 000000000000..f90bc76ae6fb
--- /dev/null
+++ b/dev-ada/libadalang-tools/Manifest
@@ -0,0 +1,3 @@
+DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
+EBUILD libadalang-tools-2018.ebuild 667 BLAKE2B 9e48cda947ed4c2ebeeb5f17f3e4d88ec3bcb1000fc4568869110aa3414a7a278ab697e6e87585e7930685bf8bfa914506f1c4c864d8c276d8a6a1fd9b147799 SHA512 7de168fa7cd7b99313e8af9ce8b9ac52eecacd1069d27ea5be2e8726a29ca10a17f9eb965cf95da9c81ded3b1e50e5761dd85939d6533a80b3a9248d224a07b4
+MISC metadata.xml 573 BLAKE2B 9648a05c891ba971ff98b7e3bd8eabb8dd4a13bf505261977af45d683f25b30cdb59becb03ed2a106c0bb82a71b43bb824571190ad746fa4d1c53e64dcca04f6 SHA512 5bbe15c71d9cf2ea97d7ca28f9c3d97288a3c39db6f7b5b532b950de5d9d2036a6d067c7bb3d415edb785dfc20f7e2ce0296db10eaa25ade6e0eeb517f8541fd
diff --git a/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild
new file mode 100644
index 000000000000..1a4889aaeea3
--- /dev/null
+++ b/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MYP=${PN}-gpl-${PV}
+DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
+	${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ada/libadalang[gnat_2016=,gnat_2017=,gnat_2018=]"
+
+S="${WORKDIR}"/${PN}-src
+
+src_install() {
+	dobin bin/gnatpp
+	newbin bin/gnatmetric gnatmetric-tool
+	newbin bin/gnatstub gnatstub-tool
+	einstalldocs
+}
diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml
new file mode 100644
index 000000000000..83deb1bafdd0
--- /dev/null
+++ b/dev-ada/libadalang-tools/metadata.xml
@@ -0,0 +1,16 @@
+<?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>
+	</use>
+	<longdescription lang="en">
+		Libadalang-based tools: gnatpp, gnatmetric and gnatstub
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 9953b010329e..7955fa858065 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -3,5 +3,5 @@ AUX libadalang-2018-gentoo.patch 1161 BLAKE2B 421608844df562343aaa9c6fd1b1b61a13
 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
-EBUILD libadalang-2018.ebuild 1112 BLAKE2B 68eaf77b6d6ed8182eb280f17e8e6a148c6272bb98af1d5fadd1c0ad00df0b3c6bd6840d1bd4f70056dbe9b60dfd1ee9f7c02f1b810d4cd08d5fc7189ff14b5e SHA512 5343549ba7721d2219aa01c09476425bcb7f5c7f905d0e8d827aa789a62d760fa852096d2e3f5fd0e47531997f873de25a51ed02574a87f8441d3036e03f1ef9
-MISC metadata.xml 760 BLAKE2B 2cfd4af1689dfac81faa0c9113e26db8d9325d03399abd46e8a38cf8fc049291e7220d6133ff392e280dd1374557d8dbe7083f130e1177cf32ba52ddc9f80988 SHA512 774868d6533effa22457464253da70e1adc650d0fe77d6e38e68608a3108e622defd135aecf9c496c8b2f2fe491b06368224236bcf33e9da9e4de8c712455557
+EBUILD libadalang-2018.ebuild 1341 BLAKE2B 2440d20e69e4991a5e0f28f47658080c6c2a3784e6339ae85f01d053dfa5f93c4c8aeb31cdcac4be5c5e99b6c59ef7f30963281604428ad1d539cf5890f49020 SHA512 53570131296ef159031711c777d9b20dc34cc2171f3aea67608267f775ccc1bfaa2b5318952c318868a6bfdc812425c2e6d1d00bb3fcefaa487bd70ebfe58c54
+MISC metadata.xml 810 BLAKE2B 89dbced5c050ba4dea4ba0537cda9512bc534bee25aa8260cd7ac30129ada091ced7c37d29efdbf11ceac9e295171e84b248d186cfb11b2072fd2beb7997089a SHA512 6857c4ac7b2cd9de167039889a99d9cdac1ba0235379f36630d51e075f1fbfccab974bbd9f34a1be08cab7869c8dbc5ec14da9ff4ec6225bd89470c350f22ebd
diff --git a/dev-ada/libadalang/libadalang-2018.ebuild b/dev-ada/libadalang/libadalang-2018.ebuild
index 14689aeaafd1..7a0db2177830 100644
--- a/dev-ada/libadalang/libadalang-2018.ebuild
+++ b/dev-ada/libadalang/libadalang-2018.ebuild
@@ -16,12 +16,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs"
 
 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]
+		(
+			dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
+			dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
+		)
 	)
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
@@ -33,11 +36,15 @@ S="${WORKDIR}"/${MYP}
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
-	ada/manage.py generate || die
+	ada/manage.py -v debug generate || die
 }
 
 src_compile() {
-	ada/manage.py build || die
+	ada/manage.py \
+		-v \
+		$(use_enable shared) \
+		$(use_enable static-libs static) \
+		build || die
 }
 
 src_test () {
@@ -45,6 +52,9 @@ src_test () {
 }
 
 src_install () {
-	ada/manage.py install "${D}"usr
+	ada/manage.py \
+		$(use_enable shared) \
+		$(use_enable static-libs static) \
+		install "${D}"usr || die
 	python_domodule build/python/libadalang.py
 }
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
index 7af420635599..a2f3f0910000 100644
--- a/dev-ada/libadalang/metadata.xml
+++ b/dev-ada/libadalang/metadata.xml
@@ -9,6 +9,7 @@
 		<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 shared library</flag>
 	</use>
 	<longdescription lang="en">
 		Libadalang is a project to build a high performance semantic engine for