Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-ada/gnatcoll-db/files/, dev-ada/gnatcoll-db/
Date: Sun, 31 Jan 2021 00:07:53
Message-Id: 1612051589.4366c349561aa0de2746ac44ecda5260028f635d.mgorny@gentoo
1 commit: 4366c349561aa0de2746ac44ecda5260028f635d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 23:46:39 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 00:06:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4366c349
7
8 dev-ada/gnatcoll-db: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735262
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-ada/gnatcoll-db/Manifest | 1 -
14 .../files/gnatcoll-db-2018-gentoo.patch | 11 --
15 dev-ada/gnatcoll-db/gnatcoll-db-2019.ebuild | 119 ---------------------
16 dev-ada/gnatcoll-db/metadata.xml | 29 -----
17 profiles/package.mask | 1 -
18 5 files changed, 161 deletions(-)
19
20 diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
21 deleted file mode 100644
22 index ecb7f53f200..00000000000
23 --- a/dev-ada/gnatcoll-db/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST gnatcoll-db-2019-src.tar.gz 2405755 BLAKE2B 70db599e8fe90a1312c2078379c6cddf518159fd8eea8c958d1abf4f4ccc504c8296e0018b03fe7f145619b6f73d6ce38b7a43cfd73dd5e1df7eb1949aa81043 SHA512 89e941a786b1d9591f4cb9f5f7db02875bb37638be7efb88e31087900c8c10ac52680f1246f90cda6fbac1b9ab213bf364d88bf583ad262f17c0a647492019a3
27
28 diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
29 deleted file mode 100644
30 index 9d95a9bfc1c..00000000000
31 --- a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
32 +++ /dev/null
33 @@ -1,11 +0,0 @@
34 ---- a/sqlite/gnatcoll_sqlite.gpr 2018-06-24 14:08:52.477478654 +0200
35 -+++ b/sqlite/gnatcoll_sqlite.gpr 2018-06-24 14:08:59.149372684 +0200
36 -@@ -42,7 +42,7 @@
37 - for Library_Name use Name;
38 - for Library_Version use "lib" & Name & Gnatcoll.So_Ext & "." & Version;
39 -
40 -- for Languages use ("Ada", "C");
41 -+ for Languages use ("Ada");
42 -
43 - Thread_Lib := ();
44 -
45
46 diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2019.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2019.ebuild
47 deleted file mode 100644
48 index 58c774b5e3c..00000000000
49 --- a/dev-ada/gnatcoll-db/gnatcoll-db-2019.ebuild
50 +++ /dev/null
51 @@ -1,119 +0,0 @@
52 -# Copyright 1999-2020 Gentoo Authors
53 -# Distributed under the terms of the GNU General Public License v2
54 -
55 -EAPI=7
56 -PYTHON_COMPAT=( python2_7 )
57 -ADA_COMPAT=( gnat_201{6,7,8,9} )
58 -inherit ada multilib multiprocessing autotools python-single-r1
59 -
60 -commitId="fbc46346dc67dfa83ae5132ef72fdd64fbe7e199"
61 -DESCRIPTION="GNAT Component Collection"
62 -HOMEPAGE="http://libre.adacore.com"
63 -SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
64 - -> ${P}-src.tar.gz"
65 -
66 -LICENSE="GPL-3"
67 -SLOT="0"
68 -KEYWORDS="amd64 x86"
69 -IUSE="db2ada gnatinspect postgres
70 - +shared sql sqlite static-libs static-pic xref"
71 -
72 -RDEPEND="dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
73 - sqlite? ( dev-db/sqlite:3 )
74 - postgres? ( dev-db/postgresql:* )
75 - xref? (
76 - dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,shared?,static-libs?,static-pic?]
77 - )
78 - ${ADA_DEPS}
79 - ${PYTHON_DEPS}"
80 -DEPEND="${RDEPEND}
81 - dev-ada/gprbuild[${ADA_USEDEP}]"
82 -
83 -REQUIRED_USE="gnatinspect? ( xref )
84 - xref? ( sqlite )
85 - sqlite? ( sql )
86 - db2ada? ( sql )
87 - ${ADA_REQUIRED_USE}
88 - ${PYTHON_REQUIRED_USE}"
89 -
90 -S="${WORKDIR}"/${PN}-${commitId}
91 -
92 -PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
93 -
94 -pkg_setup() {
95 - python-single-r1_pkg_setup
96 - ada_setup
97 -}
98 -
99 -src_compile() {
100 - build () {
101 - GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
102 - gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
103 - -XGNATCOLL_VERSION=2018 \
104 - -XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
105 - -P $1/$3.gpr \
106 - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
107 - }
108 - local lib
109 - for kind in shared static-libs static-pic ; do
110 - if use $kind; then
111 - lib=${kind%-libs}
112 - lib=${lib/shared/relocatable}
113 - for dir in sql sqlite xref postgres ; do
114 - if use $dir; then
115 - build $dir $lib gnatcoll_${dir}
116 - fi
117 - done
118 - fi
119 - done
120 - if use shared; then
121 - lib=relocatable
122 - elif use static-libs; then
123 - lib=static
124 - else
125 - lib=static-pic
126 - fi
127 - if use gnatinspect; then
128 - build gnatinspect ${lib} gnatinspect
129 - fi
130 - if use db2ada; then
131 - build gnatcoll_db2ada ${lib} gnatcoll_db2ada
132 - fi
133 -}
134 -
135 -src_install() {
136 - build () {
137 - GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
138 - -XBUILD=PROD -XGNATCOLL_VERSION=2018 \
139 - --prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
140 - -XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
141 - -P $1/$3.gpr
142 - }
143 - local lib
144 - for kind in shared static-libs static-pic ; do
145 - if use $kind; then
146 - lib=${kind%-libs}
147 - lib=${lib/shared/relocatable}
148 - for dir in sql sqlite xref postgres ; do
149 - if use $dir; then
150 - build $dir $lib gnatcoll_${dir}
151 - fi
152 - done
153 - fi
154 - done
155 - if use shared; then
156 - lib=relocatable
157 - elif use static-libs; then
158 - lib=static
159 - else
160 - lib=static-pic
161 - fi
162 - if use gnatinspect; then
163 - build gnatinspect ${lib} gnatinspect
164 - fi
165 - if use db2ada; then
166 - build gnatcoll_db2ada ${lib} gnatcoll_db2ada
167 - fi
168 - rm -rf "${D}"/usr/share/gpr/manifests
169 - einstalldocs
170 -}
171
172 diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml
173 deleted file mode 100644
174 index b73349412d9..00000000000
175 --- a/dev-ada/gnatcoll-db/metadata.xml
176 +++ /dev/null
177 @@ -1,29 +0,0 @@
178 -<?xml version="1.0" encoding="UTF-8"?>
179 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
180 -<pkgmetadata>
181 - <maintainer type="project">
182 - <email>ada@g.o</email>
183 - </maintainer>
184 - <use>
185 - <flag name="db2ada">Build gnatcoll_db2ada</flag>
186 - <flag name="gnatinspect">Build gnatinspect</flag>
187 - <flag name="shared">Build shared library</flag>
188 - <flag name="sql">Build sql library</flag>
189 - <flag name="static-pic">Build shared library</flag>
190 - <flag name="xref">Build xref library</flag>
191 - </use>
192 - <longdescription lang="en">
193 - The reusable library known as the GNAT Component Collection (GNATColl)
194 - is based on one main principle: general-purpose packages that are part
195 - of the GNAT technology should also be available to GNAT user
196 - application code. The compiler front end, the GNAT Programming Studio
197 - (GPS) Interactive Development Environment, and the GNAT Tracker
198 - web-based interface all served as sources for the components.
199 -
200 - The GNATColl components complement the predefined Ada and GNAT
201 - libraries and deal with a range of common programming issues including
202 - string and text processing, memory management, and file handling.
203 - Several of the components are especially useful in enterprise
204 - applications.
205 - </longdescription>
206 -</pkgmetadata>
207
208 diff --git a/profiles/package.mask b/profiles/package.mask
209 index b7fab6032d2..007a2a0f835 100644
210 --- a/profiles/package.mask
211 +++ b/profiles/package.mask
212 @@ -350,7 +350,6 @@ dev-ada/langkit
213 dev-ada/libadalang
214 dev-ada/libadalang-tools
215 dev-ada/gps
216 -dev-ada/gnatcoll-db
217
218 # Mart Raudsepp <leio@g.o> (2020-08-15)
219 # Development release, needs testing to ensure valac-0.50