Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/asis/
Date: Sat, 01 Dec 2018 20:51:41
Message-Id: 1543697485.4bb8ee9ce381386691a116bb0d21849b8618fca6.tupone@gentoo
1 commit: 4bb8ee9ce381386691a116bb0d21849b8618fca6
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 1 20:51:25 2018 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 1 20:51:25 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb8ee9c
7
8 dev-ada/asis: Remove unused and disable gnat_2016 on last version
9
10 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 dev-ada/asis/Manifest | 1 -
14 dev-ada/asis/asis-2017.ebuild | 50 -------------------------------------------
15 dev-ada/asis/asis-2018.ebuild | 12 ++++++-----
16 3 files changed, 7 insertions(+), 56 deletions(-)
17
18 diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
19 index 0a2d0c7643d..b32f5f227b7 100644
20 --- a/dev-ada/asis/Manifest
21 +++ b/dev-ada/asis/Manifest
22 @@ -1,3 +1,2 @@
23 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
24 -DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae061dc6fc693ee8960cd9b4abf68cc398f6b6d7dba864399c8e007aee2a91789614b7d2bf146645a5d983f20c1ccbc64 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f
25 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
26
27 diff --git a/dev-ada/asis/asis-2017.ebuild b/dev-ada/asis/asis-2017.ebuild
28 deleted file mode 100644
29 index 337e4c0f972..00000000000
30 --- a/dev-ada/asis/asis-2017.ebuild
31 +++ /dev/null
32 @@ -1,50 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit multiprocessing
39 -MYP=${PN}-gpl-${PV}-src
40 -
41 -DESCRIPTION="To develop tools for Ada software"
42 -HOMEPAGE="http://libre.adacore.com/"
43 -SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
44 - -> ${MYP}.tar.gz"
45 -
46 -LICENSE="GPL-3"
47 -SLOT="0"
48 -KEYWORDS="amd64 x86"
49 -IUSE="gnat_2016 +gnat_2017"
50 -
51 -RDEPEND="dev-ada/gnat_util[gnat_2017]
52 - || (
53 - dev-ada/gnatcoll-core[gnat_2017,shared]
54 - dev-ada/gnatcoll[gnat_2017,projects,shared]
55 - )"
56 -DEPEND="${RDEPEND}
57 - dev-ada/gprbuild[gnat_2017]"
58 -
59 -REQUIRED_USE="!gnat_2016 gnat_2017"
60 -
61 -S="${WORKDIR}"/${MYP}
62 -
63 -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
64 -
65 -src_compile() {
66 - emake PROCESSORS=$(makeopts_jobs) \
67 - GPRBUILD_FLAGS="-vl"
68 - emake tools PROCESSORS=$(makeopts_jobs) \
69 - GPRBUILD_FLAGS="-vl \
70 - -XGPR_BUILD=relocatable \
71 - -XLIBRARY_TYPE=relocatable \
72 - -XXMLADA_BUILD=relocatable"
73 -}
74 -
75 -src_install() {
76 - emake prefix="${D}"/usr install
77 - emake prefix="${D}"/usr install-tools \
78 - GPRINSTALL="gprinstall \
79 - -XGPR_BUILD=relocatable \
80 - -XLIBRARY_TYPE=relocatable \
81 - -XXMLADA_BUILD=relocatable"
82 -}
83
84 diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
85 index 8b14cc35616..503e0238347 100644
86 --- a/dev-ada/asis/asis-2018.ebuild
87 +++ b/dev-ada/asis/asis-2018.ebuild
88 @@ -14,15 +14,17 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8
89 LICENSE="GPL-3"
90 SLOT="0"
91 KEYWORDS="amd64 x86"
92 -IUSE="gnat_2016 gnat_2017 +gnat_2018"
93 +IUSE="gnat_2017 +gnat_2018"
94
95 -RDEPEND="dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
96 +RDEPEND="dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?]
97 || (
98 - dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]
99 - dev-ada/gnatcoll[gnat_2016=,gnat_2017=,gnat_2018=,projects,shared]
100 + dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared]
101 + dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared]
102 )"
103 DEPEND="${RDEPEND}
104 - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
105 + dev-ada/gprbuild[gnat_2017=,gnat_2018=]"
106 +
107 +REQUIRED_USE="|| ( gnat_2017 gnat_2018 )"
108
109 S="${WORKDIR}"/${MYP}