10 files changed, 43 insertions, 33 deletions
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index f633b8099eeb..21465eb35bca 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/gnat-suite-bin-2019 b/metadata/md5-cache/dev-ada/gnat-suite-bin-2019
new file mode 100644
index 000000000000..e0a025a8035c
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gnat-suite-bin-2019
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=GNAT Ada suite
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+KEYWORDS=~amd64
+LICENSE=GPL-2 GPL-3
+RDEPEND=sys-devel/binutils sys-devel/gdb
+SLOT=2019
+SRC_URI=https://dev.gentoo.org/~tupone/distfiles/gnat-suite-bin-2019.txz
+_md5_=2cbcb366b868564a2469f53c0d5e0b17
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1
index 409154c8814d..cfe11d55eb2c 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8afa31e87a8f1d425054 -> gnatcoll-bindings-2019-20190430-1928C-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3839d4c33029b82ac115cb3a87b55b06
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-db-2019 b/metadata/md5-cache/dev-ada/gnatcoll-db-2019
index c18ae96709ae..f24ca7db204d 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-db-2019
+++ b/metadata/md5-cache/dev-ada/gnatcoll-db-2019
@@ -4,12 +4,12 @@ DEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,a
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,iconv,shared?,static-libs?,static-pic?] ) ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) db2ada? ( sql ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) db2ada? ( sql ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ) ^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/gnatcoll-db/archive/fbc46346dc67dfa83ae5132ef72fdd64fbe7e199.tar.gz -> gnatcoll-db-2019-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=084f4c8fb0d763f091a7fe791231558a
diff --git a/metadata/md5-cache/dev-ada/gps-2018-r2 b/metadata/md5-cache/dev-ada/gps-2018-r3
index 1af25b4ceed7..df181f07691f 100644
--- a/metadata/md5-cache/dev-ada/gps-2018-r2
+++ b/metadata/md5-cache/dev-ada/gps-2018-r3
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
 DESCRIPTION=The GNAT Programming Studio
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/gps/
-IUSE=ada_target_gnat_2018 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2019 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ada_target_gnat_2018 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2019 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ada_target_gnat_2018
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ada_target_gnat_2018
 RESTRICT=test
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> gps-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1fee0d66e73628e0e8fef663e511ef82
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5e7d682715e0f14090f8789bdd3093fd
diff --git a/metadata/md5-cache/dev-ada/gps-2019 b/metadata/md5-cache/dev-ada/gps-2019-r1
index 5e881c270289..1afae91ff92b 100644
--- a/metadata/md5-cache/dev-ada/gps-2019
+++ b/metadata/md5-cache/dev-ada/gps-2019-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
 DESCRIPTION=The GNAT Programming Studio
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/gps/
-IUSE=ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdaCore/gps/archive/8606676b6b4fb245faad5e91127b15c2e61174e9.tar.gz -> gps-gpl-2019-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f -> libadalang-tools-2019-20190517-195C4-src.tar.gz https://github.com/AdaCore/ada_language_server/archive/286f2d6bb14ccd4583034b26fd923e1b80cf522c.tar.gz -> ada_language_server-2019-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e73dd93045288543b95bfb3bb17bc77a
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ff777e860b577ae70051ff0cbd69850d
diff --git a/metadata/md5-cache/dev-ada/langkit-2018 b/metadata/md5-cache/dev-ada/langkit-2018
index 8494a87caf62..608170540312 100644
--- a/metadata/md5-cache/dev-ada/langkit-2018
+++ b/metadata/md5-cache/dev-ada/langkit-2018
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A Python framework to generate language parsers
 EAPI=6
 HOMEPAGE=https://www.adacore.com/community
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako dev-python/pyyaml <dev-python/pyyaml-5 dev-python/enum34 dev-python/funcy dev-python/docutils dev-python/quex
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a -> langkit-gpl-2018.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=47c55b2b45b7d29e44008a755f8fcf68
diff --git a/metadata/md5-cache/dev-ada/langkit-2019 b/metadata/md5-cache/dev-ada/langkit-2019
index f0868b1da954..d55a178e1b51 100644
--- a/metadata/md5-cache/dev-ada/langkit-2019
+++ b/metadata/md5-cache/dev-ada/langkit-2019
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A Python framework to generate language parsers
 EAPI=7
 HOMEPAGE=https://www.adacore.com/community
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako <dev-python/pyyaml-5 dev-python/enum34 dev-python/funcy dev-python/docutils
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8f8a31e87a8f1c967d31 -> langkit-2019-20190510-19B8C-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=04c23e392315f1e1a163d2f5c029a3f7
diff --git a/metadata/md5-cache/dev-ada/libadalang-2018-r2 b/metadata/md5-cache/dev-ada/libadalang-2018-r2
index 7e6412e04aad..123dcdad2ad6 100644
--- a/metadata/md5-cache/dev-ada/libadalang-2018-r2
+++ b/metadata/md5-cache/dev-ada/libadalang-2018-r2
@@ -3,12 +3,12 @@ DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2017(-)?,ada_
 DESCRIPTION=high performance semantic engine for the Ada programming language
 EAPI=7
 HOMEPAGE=https://libre.adacore.com/
-IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
 RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),iconv,shared=,static-libs=] ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18 -> libadalang-gpl-2018-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f05e08fd180902a227e67236e7f2befa
diff --git a/metadata/md5-cache/dev-ada/libadalang-2019-r1 b/metadata/md5-cache/dev-ada/libadalang-2019-r1
index 93c91e8fc015..1363efc773e4 100644
--- a/metadata/md5-cache/dev-ada/libadalang-2019-r1
+++ b/metadata/md5-cache/dev-ada/libadalang-2019-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gprbuild[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] >=dev-ada/langkit-2019
+DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),gmp,iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gprbuild[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] >=dev-ada/langkit-2019
 DESCRIPTION=high performance semantic engine for the Ada programming language
 EAPI=7
 HOMEPAGE=https://libre.adacore.com/
-IUSE=+shared static-libs ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+shared static-libs ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
-RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),gmp,iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8f3331e87a8f1c967d27 -> libadalang-2019-20190510-19916-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=50b4fcf5ee25b1cdb82ab35974966377
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=01dc9afde31ee0bd7da82ec7ccfe2589