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/gnat_util/files/, dev-ada/gnat_util/
Date: Thu, 25 Nov 2021 07:23:31
Message-Id: 1637824976.c37d813eff85081e3b69880944873bf81df0e2c3.tupone@gentoo
1 commit: c37d813eff85081e3b69880944873bf81df0e2c3
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 25 07:22:56 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 25 07:22:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37d813e
7
8 dev-ada/gnat_util: rm
9
10 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
11
12 dev-ada/gnat_util/Manifest | 1 -
13 .../gnat_util/files/gnat_util-2017-gentoo.patch | 70 ----------------------
14 dev-ada/gnat_util/gnat_util-2019-r1.ebuild | 54 -----------------
15 dev-ada/gnat_util/metadata.xml | 20 -------
16 4 files changed, 145 deletions(-)
17
18 diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
19 deleted file mode 100644
20 index 44352c56cb93..000000000000
21 --- a/dev-ada/gnat_util/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425
25
26 diff --git a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
27 deleted file mode 100644
28 index 59cb7cf66467..000000000000
29 --- a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
30 +++ /dev/null
31 @@ -1,70 +0,0 @@
32 ---- gnat_util-gpl-2014-src/Makefile.old 2016-12-28 09:56:49.378950217 +0100
33 -+++ gnat_util-gpl-2014-src/Makefile 2016-12-28 09:57:12.301562519 +0100
34 -@@ -21,21 +21,30 @@
35 -
36 - .PHONY: all
37 - all: generate_sources
38 -- ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
39 -- -XLIBRARY_TYPE=static -Pgnat_util -p
40 -+ $(MAKE) build-static
41 - ifeq ($(ENABLE_SHARED), yes)
42 -- ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
43 -- -XLIBRARY_TYPE=relocatable -Pgnat_util -p
44 -+ $(MAKE) build-shared
45 - endif
46 -+ $(MAKE) build-static-pic
47 -+build-static:
48 -+ ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
49 -+ -XLIBRARY_TYPE=static -Pgnat_util -p -XCC=${CC} \
50 -+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
51 -+build-shared:
52 -+ ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
53 -+ -XLIBRARY_TYPE=relocatable -Pgnat_util -p -XCC=${CC} \
54 -+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
55 -+build-static-pic:
56 - ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
57 -- -XLIBRARY_TYPE=static-pic -Pgnat_util -p
58 -+ -XLIBRARY_TYPE=static-pic -Pgnat_util -p -XCC=${CC} \
59 -+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
60 -
61 - .PHONY: generate_sources
62 - generate_sources:
63 - $(MKDIR) $(SRC)
64 - $(CP) xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl snames.h-tmpl $(SRC)
65 - (cd $(SRC) && \
66 -- gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
67 -+ ${GNATMAKE} -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
68 - ./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb)
69 - $(CP) sdefault_adb.gnat_util $(SRC)/sdefault.adb
70 -
71 -@@ -47,6 +56,12 @@
72 -
73 - .PHONY: install
74 - install: install-clean
75 -+ ${MAKE} install-static
76 -+ifeq ($(ENABLE_SHARED), yes)
77 -+ ${MAKE} install-shared
78 -+endif
79 -+ ${MAKE} install-static-pic
80 -+install-static:
81 - ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
82 - -XLIBRARY_TYPE=static \
83 - --prefix=$(prefix) \
84 -@@ -54,7 +69,7 @@
85 - --lib-subdir=lib/gnat_util/static \
86 - --project-subdir=lib/gnat \
87 - --build-var=LIBRARY_TYPE --build-name=static -Pgnat_util
88 --ifeq ($(ENABLE_SHARED), yes)
89 -+install-shared:
90 - ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
91 - -XLIBRARY_TYPE=relocatable \
92 - --prefix=$(prefix) \
93 -@@ -62,7 +77,7 @@
94 - --lib-subdir=lib/gnat_util/relocatable \
95 - --project-subdir=lib/gnat \
96 - --build-var=LIBRARY_TYPE --build-name=relocatable -Pgnat_util
97 --endif
98 -+install-static-pic:
99 - ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
100 - -XLIBRARY_TYPE=static-pic \
101 - --prefix=$(prefix) \
102
103 diff --git a/dev-ada/gnat_util/gnat_util-2019-r1.ebuild b/dev-ada/gnat_util/gnat_util-2019-r1.ebuild
104 deleted file mode 100644
105 index 16d0964668a7..000000000000
106 --- a/dev-ada/gnat_util/gnat_util-2019-r1.ebuild
107 +++ /dev/null
108 @@ -1,54 +0,0 @@
109 -# Copyright 1999-2021 Gentoo Authors
110 -# Distributed under the terms of the GNU General Public License v2
111 -
112 -EAPI=7
113 -
114 -ADA_COMPAT=( gnat_2019 )
115 -inherit ada multiprocessing
116 -
117 -MYP=${P}-20190517
118 -
119 -DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
120 -HOMEPAGE="http://libre.adacore.com"
121 -SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e5031e87a8f1d425090
122 - -> ${MYP}-18c94-src.tar.gz"
123 -
124 -LICENSE="GPL-3"
125 -SLOT="0"
126 -KEYWORDS="amd64 x86"
127 -IUSE="+shared static-libs static-pic"
128 -
129 -RDEPEND="${ADA_DEPS}"
130 -DEPEND="${RDEPEND}
131 - dev-ada/gprbuild[${ADA_USEDEP}]"
132 -REQUIRED_USE="${ADA_REQUIRED_USE}"
133 -
134 -S="${WORKDIR}"/${MYP}-194CA-src
135 -
136 -PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
137 -
138 -src_compile() {
139 - emake GNATMAKE="gnatmake ${ADAFLAGS}" \
140 - BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
141 - if use static-libs; then
142 - emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
143 - fi
144 - for kind in shared static-pic; do
145 - if use ${kind}; then
146 - emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
147 - build-${kind}
148 - fi
149 - done
150 -}
151 -
152 -src_install() {
153 - if use static-libs; then
154 - emake prefix="${D}"/usr install-static
155 - fi
156 - for kind in shared static-pic; do
157 - if use ${kind}; then
158 - emake prefix="${D}"/usr install-${kind}
159 - fi
160 - done
161 - einstalldocs
162 -}
163
164 diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
165 deleted file mode 100644
166 index 6b4152f4af37..000000000000
167 --- a/dev-ada/gnat_util/metadata.xml
168 +++ /dev/null
169 @@ -1,20 +0,0 @@
170 -<?xml version="1.0" encoding="UTF-8"?>
171 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
172 -<pkgmetadata>
173 - <maintainer type="project">
174 - <email>ada@g.o</email>
175 - </maintainer>
176 - <use>
177 - <flag name="shared">Build gnat_util shared library</flag>
178 - <flag name="static-pic">Build gnat_util static library with pic code</flag>
179 - </use>
180 - <longdescription lang="en">
181 - Gnat_Util is a library uniting a number of GNAT sources that are used by
182 - different tools. At the moment Gnat_Util provides GNAT sources needed by ASIS,
183 - GNATCOLL and Gprbuild. Its main purpose is allowing to simultaneously use
184 - tools like ASIS and GNATCOLL (and other ones based on GNAT sources, if they
185 - are to come), which would normally cause name conflicts between the same GNAT
186 - sources that they use. Building both of them using same set of sources that
187 - is Gnat_Util solves this problem.
188 - </longdescription>
189 -</pkgmetadata>