[gentoo-commits] repo/gentoo:master commit in: dev-ada/aws/

[Alfredo Tupone]

commit:     0a5947a888b7f5664a0e889d7aa90045a8bdbe51
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 19:11:21 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 19:11:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a5947a8

dev-ada/aws: dev-ada/gnat_util use static -> static-libs

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-ada/aws/Manifest        |  1 -
 dev-ada/aws/aws-2016.ebuild | 49 ---------------------------------------------
 dev-ada/aws/aws-2017.ebuild |  2 +-
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index fad602ea102..f4d60634e1e 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,2 +1 @@
-DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35

diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
deleted file mode 100644
index 61bfe3b8ff8..00000000000
--- 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 ddae3fbd89b..6a12331a44e 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 )"