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

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     4bb8ee9ce381386691a116bb0d21849b8618fca6
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 20:51:25 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 20:51:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb8ee9c

dev-ada/asis: Remove unused and disable gnat_2016 on last version

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-ada/asis/Manifest         |  1 -
 dev-ada/asis/asis-2017.ebuild | 50 -------------------------------------------
 dev-ada/asis/asis-2018.ebuild | 12 ++++++-----
 3 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 0a2d0c7643d..b32f5f227b7 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,3 +1,2 @@
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
-DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae061dc6fc693ee8960cd9b4abf68cc398f6b6d7dba864399c8e007aee2a91789614b7d2bf146645a5d983f20c1ccbc64 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f
 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a

diff --git a/dev-ada/asis/asis-2017.ebuild b/dev-ada/asis/asis-2017.ebuild
deleted file mode 100644
index 337e4c0f972..00000000000
--- a/dev-ada/asis/asis-2017.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="To develop tools for Ada software"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-RDEPEND="dev-ada/gnat_util[gnat_2017]
-	|| (
-		dev-ada/gnatcoll-core[gnat_2017,shared]
-		dev-ada/gnatcoll[gnat_2017,projects,shared]
-	)"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017]"
-
-REQUIRED_USE="!gnat_2016 gnat_2017"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl"
-	emake tools PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	emake prefix="${D}"/usr install-tools \
-		GPRINSTALL="gprinstall \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}

diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
index 8b14cc35616..503e0238347 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-2018.ebuild
@@ -14,15 +14,17 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
+IUSE="gnat_2017 +gnat_2018"
 
-RDEPEND="dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+RDEPEND="dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?]
 	|| (
-		dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]
-		dev-ada/gnatcoll[gnat_2016=,gnat_2017=,gnat_2018=,projects,shared]
+		dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared]
+		dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
+	dev-ada/gprbuild[gnat_2017=,gnat_2018=]"
+
+REQUIRED_USE="|| ( gnat_2017 gnat_2018 )"
 
 S="${WORKDIR}"/${MYP}