gentoo resync : 15.02.2018

13 files changed, 20 insertions, 73 deletions

diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index d0f74449a80e..9110453791a4 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/aunit-2016 b/metadata/md5-cache/dev-ada/aunit-2016
deleted file mode 100644
index 52ba20e0124f..000000000000
--- a/metadata/md5-cache/dev-ada/aunit-2016
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-DESCRIPTION=Ada unit testing framework
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/tools/aunit/
-IUSE=+gnat_2016 gnat_2017
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/573990c6c7a447658d00e1cb -> aunit-gpl-2016-src.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=11088a59fcb5e2a6639af8bc881b8135
diff --git a/metadata/md5-cache/dev-ada/aunit-2017 b/metadata/md5-cache/dev-ada/aunit-2017
index 5643b3f6fe6b..696fede0dff7 100644
--- a/metadata/md5-cache/dev-ada/aunit-2017
+++ b/metadata/md5-cache/dev-ada/aunit-2017
@@ -4,11 +4,11 @@ DESCRIPTION=Ada unit testing framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
 IUSE=gnat_2016 +gnat_2017
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000 -> aunit-gpl-2017-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=54d69625f2f1e74af11d1038c17369af
+_md5_=27c8490ac87202b51a6572cbe75e5dd7
diff --git a/metadata/md5-cache/dev-ada/aws-2016 b/metadata/md5-cache/dev-ada/aws-2016
deleted file mode 100644
index e63728291833..000000000000
--- a/metadata/md5-cache/dev-ada/aws-2016
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-DESCRIPTION=A complete Web development framework
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=+gnat_2016 gnat_2017
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> aws-gpl-2016-src.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=32dd0d26ce05805874f2b3f57f2e224e
diff --git a/metadata/md5-cache/dev-ada/aws-2017 b/metadata/md5-cache/dev-ada/aws-2017
index 6788b197ae94..7b66ba6c7c9d 100644
--- a/metadata/md5-cache/dev-ada/aws-2017
+++ b/metadata/md5-cache/dev-ada/aws-2017
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001 -> aws-gpl-2017-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=f5ca6c499055d6c20f50768cea76ad4f
+_md5_=a36288c305f0cf6925e69f8741f10816
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2016 b/metadata/md5-cache/dev-ada/gnat_util-2016
index 6a6c67a9901c..7fdea6b3282f 100644
--- a/metadata/md5-cache/dev-ada/gnat_util-2016
+++ b/metadata/md5-cache/dev-ada/gnat_util-2016
@@ -3,7 +3,7 @@ DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3
 DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=+gnat_2016 gnat_2017 +shared static static-pic
+IUSE=+gnat_2016 gnat_2017 +shared static-libs static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6 -> gnat_util-gpl-2016-src.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b6776503854bee01653e0ccbe03767e5
+_md5_=ba187e4dad692de6a09485fb92eeef81
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2017 b/metadata/md5-cache/dev-ada/gnat_util-2017
index 85114d46278d..1fe4b9abf463 100644
--- a/metadata/md5-cache/dev-ada/gnat_util-2017
+++ b/metadata/md5-cache/dev-ada/gnat_util-2017
@@ -3,7 +3,7 @@ DEPEND=dev-lang/gnat-gpl:6.3.0 dev-ada/gprbuild[gnat_2017]
 DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=gnat_2016 +gnat_2017 +shared static static-pic
+IUSE=gnat_2016 +gnat_2017 +shared static-libs static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-lang/gnat-gpl:6.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=!gnat_2016 gnat_2017
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037 -> gnat_util-gpl-2017-src.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3d9191b3f7c57cd00019c45983091ffe
+_md5_=1682b374a69dd020cd2e35992a94d03b
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-2016 b/metadata/md5-cache/dev-ada/gnatcoll-2016
index f297aae3f8e7..a46fcbf83296 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-2016
+++ b/metadata/md5-cache/dev-ada/gnatcoll-2016
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] static? ( dev-ada/libgpr[static-libs] ) ) dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] ) dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNAT Component Collection
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static syslog tools python_targets_python2_7
+IUSE=gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static-libs syslog tools python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] static? ( dev-ada/libgpr[static-libs] ) )
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] )
 REQUIRED_USE=python_targets_python2_7 pygobject? ( gtk ) ^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7 -> gnatcoll-gpl-2016-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2daf8948e58290555365180de29bf377
+_md5_=db76d66296d9dd961c628638a38fdb69
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-2017 b/metadata/md5-cache/dev-ada/gnatcoll-2017
index 7a9191a7f261..9d8a93ba097f 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-2017
+++ b/metadata/md5-cache/dev-ada/gnatcoll-2017
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-lang/gnat-gpl:6.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?] static? ( dev-ada/libgpr[static-libs] ) ) dev-ada/gprbuild[gnat_2017] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-lang/gnat-gpl:6.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] ) dev-ada/gprbuild[gnat_2017] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNAT Component Collection
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static syslog tools python_targets_python2_7
+IUSE=gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static-libs syslog tools python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-lang/gnat-gpl:6.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?] static? ( dev-ada/libgpr[static-libs] ) )
+RDEPEND=dev-lang/gnat-gpl:6.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] )
 REQUIRED_USE=python_targets_python2_7 pygobject? ( gtk ) !gnat_2016 gnat_2017
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016 -> gnatcoll-gpl-2017-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fd7b1ab346ad03ab3d15669dd393cab1
+_md5_=4692b2af838ded7142e27dfa2d9d045f
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2016 b/metadata/md5-cache/dev-ada/gnatmem-2016
deleted file mode 100644
index 5aa6b60f5844..000000000000
--- a/metadata/md5-cache/dev-ada/gnatmem-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/
-IUSE=+gnat_2016 gnat_2017
-KEYWORDS=~amd64
-LICENSE=GPL-3
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> gnatmem-gpl-2016-src.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=63af5f595f53500ef9e28ef3615003a9
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2017 b/metadata/md5-cache/dev-ada/gnatmem-2017
index 4e523cb9556a..913c16491fe1 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2017
+++ b/metadata/md5-cache/dev-ada/gnatmem-2017
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> gnatmem-gpl-2017-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b94e0206fd0b316a0ee3183f22cf1e75
+_md5_=01ef283c3cf2c1ef7dad4bed72da062e
diff --git a/metadata/md5-cache/dev-ada/gtkada-2016 b/metadata/md5-cache/dev-ada/gtkada-2016
deleted file mode 100644
index dd3fe8143643..000000000000
--- a/metadata/md5-cache/dev-ada/gtkada-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A complete Ada graphical toolkit
-EAPI=6
-HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=gnat_2016 gnat_2017 +shared static
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae -> gtkada-gpl-2016-src.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0c39d734fd328bf602629ec832ac0d9b
diff --git a/metadata/md5-cache/dev-ada/gtkada-2017 b/metadata/md5-cache/dev-ada/gtkada-2017
index a0604c6637ba..4296501071a9 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2017
+++ b/metadata/md5-cache/dev-ada/gtkada-2017
@@ -3,11 +3,12 @@ DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=6
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=gnat_2016 gnat_2017 +shared static
+IUSE=gnat_2016 +gnat_2017 +shared static-libs
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9 -> gtkada-gpl-2017-src.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a2cc396e47394aa317f6aaca78dafa08
+_md5_=c297c69f54ceb40c5ef3ce9c8aa79bbe