gentoo resync : 15.02.2018

23 files changed, 52 insertions, 341 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index e5c0b01d2a52..d12d970da521 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index a2b671245646..99a3f0cabaa9 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,6 +1,4 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
-DIST aunit-gpl-2016-src.tar.gz 393489 BLAKE2B 188c42d20d287d00553a9c35828b2389a480ed1dbc2f4066de352ee3821fa3dc7db3a5600bca47a3b6b047ac43b0991c961dc4569b790adc2be2a62fec1097fc SHA512 94721f04ff721bbb572ede3fe7b8b61f9682ecaec8076eec3a0a27a41d9bab86248921671b7e63656f473f8d4ddb3a44ecdfb19f479073cf2ae378d62dc68190
 DIST aunit-gpl-2017-src.tar.gz 638311 BLAKE2B aa551202677983451d1c8c9f248d85d58f6de442797ee5a3c14d418de1cd8e9a58a82ee7b8bb5b64da924265ef26c64b5d69e86f0103f0721b2c6e007896f6bb SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4
-EBUILD aunit-2016.ebuild 1065 BLAKE2B ef2548bb13d111928bd5c649c104ac30e47f87df1239c098b8a506f72d46068f2d2687e82114ff588a2a8859d343fe9fa51d5e6619adda5c45d812ad1b22a8bb SHA512 9f07e046e3f4e5a04f542cc49ffc719d968a80276fe6054d402e16e570034dd5a734ece83b949f79eb3d9386c6601bd8d6294a90eaf140fa7ec801ce355c09d6
-EBUILD aunit-2017.ebuild 1037 BLAKE2B eac0d1a8d072362a3a9f6ec32727133e78a1b599f984795dd8954a44f548bd1c04646a74aab0be18991e116de6fa9774a0db992cf87c6ad6740f191071b6d5cc SHA512 27efa10a7cf424c04e561e2591552f5996d0eee499e0ff349b0d7171b27c1939d58644114e6ece32c108833be96da038fb73b6572ec5d26635d629d2ce6ce4aa
+EBUILD aunit-2017.ebuild 1036 BLAKE2B a3bc7c793baeeca8a7aaaa85bc57161b57ebf52319078f8d659fdf2a0afe08e91a54ac2becda20fee714786c0d19f4254c4500f85667adad351c0feeab5def8b SHA512 59d78b143dc5dcccf8041caaa3c2b740590466920fac043367478f456d541c6b12488033927641e8e3b28bdf51b79c330c26885ed6c8036eacffb491fc9225e7
 MISC metadata.xml 935 BLAKE2B 5b05b2dd0e33d0d2d5b8876d3c0b0bfbc89678383b9a3c635decd8762340703a2f75a31e6408f901a9173f28469d8d32bbaf471de377abddc23c8a0c869c05f5 SHA512 e7afc9ef7b05532b2230943b0bec08045d3bb2c0ba875679de97ac4e7948bc4853054bf99e303e1a75da0ead1c592c45070175f62678329a4929ab49a3e6f72e
diff --git a/dev-ada/aunit/aunit-2016.ebuild b/dev-ada/aunit/aunit-2016.ebuild
deleted file mode 100644
index 452fa5ca584e..000000000000
--- a/dev-ada/aunit/aunit-2016.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/573990c6c7a447658d00e1cb -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs)"
-}
-
-src_install() {
-	emake INSTALL="${D}"usr install
-	einstalldocs
-	mv "${D}"usr/share/doc/${PN}/* "${D}"usr/share/doc/${PF}/ || die
-	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
-	dodoc features-* known-problems-*
-}
diff --git a/dev-ada/aunit/aunit-2017.ebuild b/dev-ada/aunit/aunit-2017.ebuild
index e5f793ed48af..104432300fd3 100644
--- a/dev-ada/aunit/aunit-2017.ebuild
+++ b/dev-ada/aunit/aunit-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 42ad7cadeedd..218ee5890ecb 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,6 +1,4 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
-DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
-EBUILD aws-2016.ebuild 1068 BLAKE2B 18daa6c3e03eec724aa91a9c915530db708651b975e803b37b65c3426b20389b81b33203bc8095de269861804185fbd22b8296a845ef9d2f971aa3b1149ea864 SHA512 0d3eb5c5879c3d4ecfd0a8529c59e2999ad6fc76a6604fb88f6e76bb6d42a20ce953af14717fb2da59ed4eeeded14c57cb09259d4d65bfb71eb1f5d9aff30fdf
-EBUILD aws-2017.ebuild 1075 BLAKE2B 88126d8f186c6363ffd00d4ed2cd020b767339bef3ade2913d6bc6e4b81363f207f5558f3a6ecd9826bcb209e28e9b8201ce67d3280436d9aa3c53ebeb167ad9 SHA512 0e4ff02f6aa2fdd6cc97b0e8473ddbb8e3caa61ca249683643db545d739041c9b901977fc97e5a8688487b9eb8ef2f427aea5e4fa7669282044a4953e2c0ff72
+EBUILD aws-2017.ebuild 1080 BLAKE2B c36441dcdbf96348a10173aa5443620836e7045060dd688e75c86715efcc367199360f21b227d54484aabe9968f7f603d198aa03277fb64dcc46e609d5d3a0ed SHA512 0411df9e10bfa931063fd63552bce0e0d593a8a7522723a0db5c0c48124dca251af0bfc45c891078cd6726bb6a40b27a4536e0cd5ee39a6e74c67992c4949ecd
 MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
deleted file mode 100644
index 61bfe3b8ff8c..000000000000
--- a/dev-ada/aws/aws-2016.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MY_P=${PN}-gpl-${PV}-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017"
-
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
-	dev-ada/asis[gnat_2016=,gnat_2017=]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	emake -j1 setup prefix=/usr
-}
-
-src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	emake GCC=${CHOST}-gcc-${GCC_PV} \
-		PROCESSORS=$(makeopts_jobs) \
-		DEBUG=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_install() {
-	emake DESTDIR="${D}" DEBUG=true install
-	einstalldocs
-}
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index ddae3fbd89b2..6a12331a44e8 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.ebuild
@@ -19,7 +19,7 @@ IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
-	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
+	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs]
 	dev-ada/asis[gnat_2016=,gnat_2017=]
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index caf604f6982a..aaf5604d73ba 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,6 +2,6 @@ AUX gnat_util-2016-gentoo.patch 3197 BLAKE2B e5a15c5becd1882fa7649c7b18d628dd38c
 AUX gnat_util-2017-gentoo.patch 2840 BLAKE2B 95e39f8c054cefb2ddc879e44b9e11e49fa91bb3e521440e25ca050e276d3ff067f0d407be29826f550d960cc729f3adabb7d81134906af39c1fb0ce668edec3 SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846
 DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
-EBUILD gnat_util-2016.ebuild 1308 BLAKE2B 11b5bfc7afd2f9d9ddb6b72fddb5e89d83c61fb9a7220f0731365eca2769d904b91368425093b8f805c4bd499da46ee7787cf18084d1506672baa396427aaf1e SHA512 96dbb211227db1918ff6bc8cb5e91d360f804576f9f7a6eeaf31686e7161109b86474ff67baed28ef9baa13c4127b1f9f24a73d07beff2c7ec5a0ee8d5e2a7dc
-EBUILD gnat_util-2017.ebuild 1235 BLAKE2B 42d41ee344fae4aa675a356da98749d7a5877c2b4f40f6d97a74e5c24bdbe76fe12c24929050c8e30db7bc5b12fcc697916eee6a5b95a0cb31f2305147431e56 SHA512 9d39a0de6d9f60162d4144ec40161bc6f01b4cb5171cc7d0d5e774406d11411207346ba278dbb820558aa392110d93d5dc0120bc5e66eff6807eaebfe1be5d1e
-MISC metadata.xml 1149 BLAKE2B 4dbc973d0a669f2db9c2fee1aad40cd6eab81d453e1cf7805f98a220b8c2f8e91642b4a5e5474befed69357400a7ed70da703f4ce71ba5f3df706c248803fe31 SHA512 d433f228882662e5b896d0ade071d502cee9c260fad096fe2556a5e7c4eb9ce82287edfb0240f96716538160d5403db010712633248bd6c53097951bb899313c
+EBUILD gnat_util-2016.ebuild 1470 BLAKE2B 79cb3f9855a5c8f5434c743163541eb40bd32af299620e9395b87194d67b2903e37d0d0b8ed4df3e44b3ca01c2c847f74866d2842de5cac0feeaef1ed831b249 SHA512 3b5c5fe536f43f91e3ac783915f158502049f62686064f994743e71b2c918f3557211ab1d8a47c1636e991f1b0e02784e3488553d98f62d0679c2d3328c04f7b
+EBUILD gnat_util-2017.ebuild 1401 BLAKE2B 55ff6ce95d0f9779a4d7ca16b413ea9a9ce93e1a0ded0eb57f86714901addcc059c836aba0a00899ac23a46b7d511d70010340d52ec95b9a797853c997a88b83 SHA512 68beaab114ad8cb01850276c2a59f5824d2fbff6de48700482a0580c1afd6d9d92f7a27fc83baea10415e1a674c25d8de3b266066be54249f01fd1632bc0f5f8
+MISC metadata.xml 1089 BLAKE2B 7c47328868c0760d57201e434899bd832918e6bc68810dabedb061fd4ee2fb16c9908987fc5d90511ebf91f2901a7947ca626001ca242af0ff6f621cb9e03bf5 SHA512 ce4ba6a642deb1e60d84e01c32bba7478554afe4a9c71c32c7131034e82a0ba0c410891e2d1d7e31e33fe27125ba611dc20e716bb0f688658809f05769427ed7
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index 2fc260b394ac..4cc279585ec7 100644
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
@@ -37,7 +37,10 @@ src_compile() {
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
 		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	for kind in shared static static-pic; do
+	if use ${kind}; then
+		emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
 				build-${kind}
@@ -46,7 +49,10 @@ src_compile() {
 }
 
 src_install() {
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake prefix="${D}"/usr install-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake prefix="${D}"/usr install-${kind}
 		fi
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index 6116171b45ce..88db63ccf09d 100644
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0"
 DEPEND="${RDEPEND}
@@ -36,7 +36,10 @@ src_compile() {
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
 		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
 				build-${kind}
@@ -45,7 +48,10 @@ src_compile() {
 }
 
 src_install() {
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake prefix="${D}"/usr install-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake prefix="${D}"/usr install-${kind}
 		fi
diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
index 22a3c1f31fe6..031651ccbbdc 100644
--- a/dev-ada/gnat_util/metadata.xml
+++ b/dev-ada/gnat_util/metadata.xml
@@ -9,7 +9,6 @@
 		<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="shared">Build gnat_util shared library</flag>
-		<flag name="static">Build gnat_util static library</flag>
 		<flag name="static-pic">Build gnat_util static library with pic code</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index c697b939613d..abbcf70c0ed1 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf
 AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
 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 2997 BLAKE2B c5ede25bb739b20af41220f035d6d0eb577ef2e9bb5f113d177cf5d014ca73b94df7ab772371361183d4c4af832f2f19475a83965fe09d4749d2b93442e3ffd0 SHA512 ac033da158a745dfb037d1fc632adc082ae717f01efb3b28d3256ccaaf8a2aa6c1f1bcf291185b829925d653723cf2fb765360e0d8bdf1f247ce7cd2d9ae7b0e
-EBUILD gnatcoll-2017.ebuild 3125 BLAKE2B 1cec59b829326461c4b4baa93fb83eaff8d4d1ce999bad2d405f3fa94c1f7064983c7032214d279eb7c6b75611c6559b3a553d7f110cbc2ab45602310132bec2 SHA512 e5d0ffb4b41947e9f362124dced0cb873a19e4a7779b910f6331ae77343b9f04890fa532fd1668bfebd6a3f59ffeef8e4c106c1ad0b62b7b7d33b43ddcf0d1c0
-MISC metadata.xml 1412 BLAKE2B 363f55392d7b2859157ecde38b7d2ff918cbd52d4b24a327d80460ee0b1fbcb3f220e32df31b1dd7ce59258c267a2ca843be30b6eba3ffb6f4ccdc1d8360bc3c SHA512 607a522c91bf0e1d7f7bbbdb541d35108e4d77760f9dbb375abca7a361602d9157ed60d1b71fd51af652b718a763010be8daab44eb3a87aa7d47ca0f20e468fc
+EBUILD gnatcoll-2016.ebuild 2988 BLAKE2B e114c29a5a7e1ff023c52eb0d1897bee392ce0aab093e22f7b257500c9a6e04658aadfff52e4d125c66fdeed501d06804507b45c292adb501fc4142274472c04 SHA512 fd5f510872ca8c592d88df1981c6c2b383223c70cb5e6b80889631982c1e43a82eb05685d9446172ea365c7d7d2bb25f50fa707ed24d5c8f22fb230ebba16b2a
+EBUILD gnatcoll-2017.ebuild 3116 BLAKE2B bc148d0ba9b67c38599cac863ad30f68b947c131404174f6014df5d2141568fcdb60a610a9f4620bae4c6d94565cdb1480a59819b108b18237d520d6cc53f751 SHA512 515842789e8aeff6ca6d7d7c374156b724439b8fbdde898639a2e4b9e3cc6e13a43bc05942cf4fb5cc609da4376dba0dd093c16f180b86895c7bb8999acb9bee
+MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index dd595440c8b5..0ccb4224f75c 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -16,14 +16,14 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline
-	+shared sqlite static syslog tools"
+	+shared sqlite static-libs syslog tools"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?]
+		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -35,8 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	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/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
@@ -98,7 +97,7 @@ src_compile() {
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/static
 	fi
@@ -109,7 +108,7 @@ src_install() {
 	if use shared; then
 		emake prefix="${D}usr" install_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake prefix="${D}usr" install_library_type/static
 	fi
 	emake prefix="${D}usr" install_gps_plugin
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 52ac0776cb56..f67e1a2f877e 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -16,13 +16,13 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
-	+shared sqlite static syslog tools"
+	+shared sqlite static-libs syslog tools"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2017,shared?,static?]
+		dev-ada/gtkada[gnat_2017,shared?,static-libs?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -34,8 +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? ( dev-ada/libgpr[static-libs] )
+		>=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2017]"
@@ -98,7 +97,7 @@ src_compile() {
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/static
 	fi
@@ -113,7 +112,7 @@ src_install() {
 	if use shared; then
 		emake prefix="${D}usr" install_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake prefix="${D}usr" install_library_type/static
 	fi
 	if use tools; then
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
index 5bc4030a3e0e..df4d11fa0b3a 100644
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="projects">Adds support for projects</flag>
 		<flag name="pygobject">Adds support for pygobject</flag>
 		<flag name="shared">Build shared library</flag>
-		<flag name="static">Build static library</flag>
 		<flag name="tools">Build associated tools</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 1cb0ab14f1b8..a2b755aa7367 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,6 +1,4 @@
 AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
-DIST gnatmem-gpl-2016-src.tar.gz 80104 BLAKE2B c7ccdf4a8b2c91117550592763c467a32befc00ad3fa6488963635be283d6e84dd572123d9586166af215dd845aa785f5953dae7fadca6e49fbb6004af0576fa SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b
 DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897
-EBUILD gnatmem-2016.ebuild 842 BLAKE2B dd7e2a614fb95e1efd71c52b656add578e0f19d75ea5ee196583af2d5a52fa04c953719cfc2b4a6ce78ad0cfbd87e9d0cbe60760f0971480b10dea6255fdd0cf SHA512 4e664ce22d13588ff3df666eab80c33eeb11e02e9a8afe5133f7a09174e61e7b60ec35468fcfa74773473adb841b2df31d659e36adec12dce8b346a5ac85be91
-EBUILD gnatmem-2017.ebuild 848 BLAKE2B 3b84c0264ea45eceb521e601c0294c2d73f11f338e4b64177f9aa8224b97c76e93dba33764e720042743ce07de47b84584b395735ab6d36be17da428193b58dd SHA512 458273979293719d0332de7f911593f5cf8f14968cd53a3b20ed94b4ddd941d9190bc69dda2e97a121a41c7b9d937f9dae2bc7b9a42c5cce89a4833c32b1bbd8
+EBUILD gnatmem-2017.ebuild 849 BLAKE2B 2918a1a435f35b7bebc12b2bca2811a48405a6860b22d5917e4029eb6ceb7cfc4e7e965b662cb9daaaebe68059805dfcdf04cfe45735cdc4118602856a9d2600 SHA512 b1e222f730c279cbbed36a2afd8ae3d324f4b7fbe1be0eef094c1d3d8adcf07c9dae1d8c9b42b7d5a1be7d1cc1dff846767aed79de01e523e75aa35c050367c1
 MISC metadata.xml 1138 BLAKE2B 867c1ccc45c510480cc4e93b62534182248cfe2e7aad4e5e8e3c5fef153590c2a9832687a5614786b115145d477ddc74a38008566266fa44e9e5e0a4769332d1 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b
diff --git a/dev-ada/gnatmem/gnatmem-2016.ebuild b/dev-ada/gnatmem/gnatmem-2016.ebuild
deleted file mode 100644
index 1b7bae00d069..000000000000
--- a/dev-ada/gnatmem/gnatmem-2016.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing autotools
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017"
-
-RDEPEND=""
-DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild
index c9a384fa74dc..f5b63e51484f 100644
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,8 @@ MYP=${PN}-gpl-${PV}-src
 
 DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> ${MYP}.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 ->
+	${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 2d0f8258eb22..68b8c2577112 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,7 +1,4 @@
-AUX gtkada-2016-gentoo.patch 3728 BLAKE2B 8f05c4591d267e4e383f052e691876df915aad52a22b6305a7f338fbbf5063b0620c2bfb97a023570dbef0781d891299da65e165481d304e28e710eca8e93656 SHA512 8e8815173496f7ebc795e8b20e19f88f50a726cca3657b5798cd7cd613c0196aea4c63daa2874c36d5a039e5b6cc26c67d0003c47ddcf8ca6e9c28dd8a58bf4b
 AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
-DIST gtkada-gpl-2016-src.tgz 11944697 BLAKE2B 61760bad9417ef76a8d3779b1fd67cfaf8ec9c1427871ae8152226a5d3a75862a4b4a72480a1d5a1b60ceb06444e89d37440ca5368f954de6a9ba26ac17bef02 SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
-EBUILD gtkada-2016.ebuild 1269 BLAKE2B 3c2772faa6a43f7f1ac0e19f1d50b0a840382f2b85280c9d4f446069d8625e71a1d863202cc6f246e327b0e07499800d11242b42c002d7407187a4c119d9620c SHA512 32a327fa14ec2f7a4e658356d8af7cff460cd7faa6b2dd8d20ae593be5689f9bd8824047b0d034b32833fc978b66290cb2b584730828615f87ee9af18116f689
-EBUILD gtkada-2017.ebuild 1269 BLAKE2B 0d9ff1fe178b4804a14cca0f373e938400fbd91004af7184b915ec12bd62e36ce1dbf11d783f349b78ab6f8d65a0d85a62a6ed4803d9a77721f5d1f6cb9369cc SHA512 c82beb455477b41b485a6c8b1dfa34f50d94112f649f205f0c8b3411c637caa9dd9fc84d90d68fce61e95febdf9a504cbda57999739a6cbebcfc84f99f908d78
-MISC metadata.xml 764 BLAKE2B dfc39e0e4fa7b9919f02f67680bdd5c5afa200a45102184b8aa760291694a20431798b5de06b87bbc366590ff7b49dfc5114f466b219bff6c9a1e4abc01344a7 SHA512 96d85d1f4ddc06554fd4fb8572bf55b2bb880423c9813f00a69d7211bf9b441e84feac1e19c04cb99a54396ac220e9d79cdc441e4c10de5805487baebcee0e64
+EBUILD gtkada-2017.ebuild 1330 BLAKE2B 33c5f296517fe9ccca131534489449b53dc1eb4980904ccbc3e460bfd45c214456c8ca50c662ba98e123f52347bbab21241632de14505a0b617d5fa8d2df895a SHA512 c9eb4add40823dd56cfdea7bfb7388bd506f6802c211d610f14241491119ec5a461b5fe24dd75a948a8b9537414f5548ed581e8d594df58d9cf863310f28bfb5
+MISC metadata.xml 704 BLAKE2B 3dd587570234d4bca6f818611011ff14c2a009d1078dba153bbe9fb1071b3962201ddde374176d4492f7066e978366a1ca1dd030b36c000b7f71281c4b407cac SHA512 3139597952f51ad23e7bdc4dfb49aec1b040016e60d1cb83319388146a503b4ca59a16c800548b32ef41987e631d06103360925c598c8cee2805bd84623e9b52
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
deleted file mode 100644
index 808b07dfdfaf..000000000000
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- gtkada-gpl-2015-src/shared.gpr.in.old	2017-01-05 23:28:35.838073270 +0100
-+++ gtkada-gpl-2015-src/shared.gpr.in	2017-01-05 23:30:17.752255709 +0100
-@@ -44,6 +44,8 @@
-              for Switches ("C") use ("-O2");
-       end case;
- 
-+      for Driver ("C") use External ("GCC", "gcc");
-+      for PIC_Option ("C") use ("-fPIC");
-       for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
-       for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
-    end Compiler;
---- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
- 
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
- 
- tools:
- 	@echo "====== Building tools ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
- 
- build_library_type/%:  src/gtkada-intl.adb
- 	@echo "====== Building $(@F) libraries ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+	  -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
- 
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
--	gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-+	$(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
- 
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
--	gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-+	$(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
- 
- tests: testgtk/opengl/view_gl.adb
- 	@echo "====== Building tests ====="
--	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+	cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
- 
- install/%: force
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -96,7 +96,7 @@
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
- 		--sources-subdir=include/gtkada/gtkada_gl.$(@F) \
--		--lib-subdir=${libdir}/gtkada/gtkada_gl.$(@F) \
-+		--lib-subdir=lib/gtkada/gtkada_gl.$(@F) \
- 		-Psrc/opengl/gtkada_gl.gpr
- endif
- 
-@@ -106,12 +106,9 @@
- 		--project-subdir=lib/gnat gtkada
- endif
- 
--install: install-clean
-+install:
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- 		--mode=usage -Psrc/tools/tools.gpr
--	cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
--		--mode=usage --exec-subdir=${exampledir} \
--		-Ptestgtk.gpr -aP ../src
- 
- 	@echo '-----------------------------------------------------------------------'
- 	@echo '--  GtkAda has now been installed.                                   --'
---- gtkada-gpl-2016-src/src/gtkada.gpr.old	2017-05-31 14:21:35.007965274 +0200
-+++ gtkada-gpl-2016-src/src/gtkada.gpr	2017-05-31 14:23:16.597315577 +0200
-@@ -41,7 +41,13 @@
-    for Library_Name use "gtkada";
-    for Library_Version use
-       "lib" & Project'Library_Name & Shared.So_Ext & "." & Version;
--   for Library_Options use Shared.Gtk_Libs;
-+
-+   case Shared.Library_Kind is
-+      when "relocatable" =>
-+         for Library_Options use Shared.Gtk_Libs;
-+      when others =>
-+         null;
-+   end case;
- 
-    package Builder  renames Shared.Builder;
-    package Naming   renames Shared.Naming;
diff --git a/dev-ada/gtkada/gtkada-2016.ebuild b/dev-ada/gtkada/gtkada-2016.ebuild
deleted file mode 100644
index 6ca105eb3655..000000000000
--- a/dev-ada/gtkada/gtkada-2016.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
-
-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"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 659aacbe7b77..aed9663db246 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -30,6 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
@@ -49,7 +51,7 @@ src_configure() {
 	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
 		--prefix="${D}/usr" \
-		$(use_enable static) \
+		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
 }
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 1b27068850f3..e26ee639a2da 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -9,7 +9,6 @@
 		<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="shared">Build gtkada as shared library</flag>
-		<flag name="static">Build gtkada as static library</flag>
 	</use>
 	<longdescription lang="en">
 		GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.