Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/files/, sci-libs/p4est/
Date: Wed, 01 Feb 2023 19:27:23
Message-Id: 1675279598.909ba8f64518c9f336989401fa5e9ec20fbea938.asturm@gentoo
1 commit: 909ba8f64518c9f336989401fa5e9ec20fbea938
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 28 15:52:10 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 19:26:38 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909ba8f6
7
8 sci-libs/p4est: drop 2.3.1-r1, 2.3.3
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 sci-libs/p4est/Manifest | 4 -
13 sci-libs/p4est/files/p4est-2.3-add_soname.patch | 13 ---
14 sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch | 12 ---
15 sci-libs/p4est/metadata.xml | 1 -
16 sci-libs/p4est/p4est-2.3.1-r1.ebuild | 122 -----------------------
17 sci-libs/p4est/p4est-2.3.3.ebuild | 122 -----------------------
18 6 files changed, 274 deletions(-)
19
20 diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
21 index 13b4e1e65938..2a5552e304f3 100644
22 --- a/sci-libs/p4est/Manifest
23 +++ b/sci-libs/p4est/Manifest
24 @@ -1,5 +1 @@
25 -DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
26 -DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b
27 -DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
28 -DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f7466f27049ef4e38d1138c83f57e991f6a702d0109e438337f98be13e8554a4dfef3e1c129f3d2690e0b4a54bbb SHA512 7f528a942438073c9f43242eae5383cdc1f64f0f26f96eccd01afc053e0454691160e7210dda2ad2bdd621fd3c17551dd205af417dd244642b1358cbe4aaa2fd
29 DIST p4est-2.8.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
30
31 diff --git a/sci-libs/p4est/files/p4est-2.3-add_soname.patch b/sci-libs/p4est/files/p4est-2.3-add_soname.patch
32 deleted file mode 100644
33 index 9438633138a0..000000000000
34 --- a/sci-libs/p4est/files/p4est-2.3-add_soname.patch
35 +++ /dev/null
36 @@ -1,13 +0,0 @@
37 -diff --git a/src/Makefile.am b/src/Makefile.am
38 -index 0d96429..1b76969 100644
39 ---- a/src/Makefile.am
40 -+++ b/src/Makefile.am
41 -@@ -80,7 +80,7 @@ src_libp4est_la_SOURCES = \
42 - $(libp4est_internal_headers) \
43 - $(libp4est_compiled_sources)
44 - src_libp4est_la_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS)
45 --## src_libp4est_la_LDFLAGS = -release $(VERSION)
46 -+src_libp4est_la_LDFLAGS = -release $(VERSION)
47 - src_libp4est_la_LIBADD = @P4EST_SC_LDADD@
48 - LDADD += @top_builddir@/src/libp4est.la @P4EST_SC_LDADD@
49 - EXTRA_src_libp4est_la_DEPENDENCIES = @P4EST_SC_LDADD@
50
51 diff --git a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch b/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch
52 deleted file mode 100644
53 index a3209d5064fb..000000000000
54 --- a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch
55 +++ /dev/null
56 @@ -1,12 +0,0 @@
57 -diff --git a/Makefile.am b/Makefile.am
58 -index e8b7e67..1817e37 100644
59 ---- a/Makefile.am
60 -+++ b/Makefile.am
61 -@@ -2,7 +2,6 @@
62 - # This file is part of p4est.
63 - # Makefile.am in toplevel directory
64 -
65 --ACLOCAL_AMFLAGS = -I config @P4EST_SC_AMFLAGS@
66 - if P4EST_SC_MK_USE
67 - @P4EST_SC_MK_INCLUDE@
68 - endif
69
70 diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
71 index c58dd131de04..f29f22e517cb 100644
72 --- a/sci-libs/p4est/metadata.xml
73 +++ b/sci-libs/p4est/metadata.xml
74 @@ -17,7 +17,6 @@ processor cores.
75 </longdescription>
76 <use>
77 <flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag>
78 - <flag name="romio">Build with support for the ROMIO MPI-IO component</flag>
79 </use>
80 <upstream>
81 <remote-id type="github">cburstedde/libsc</remote-id>
82
83 diff --git a/sci-libs/p4est/p4est-2.3.1-r1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
84 deleted file mode 100644
85 index 0d1041be0bd0..000000000000
86 --- a/sci-libs/p4est/p4est-2.3.1-r1.ebuild
87 +++ /dev/null
88 @@ -1,122 +0,0 @@
89 -# Copyright 1999-2022 Gentoo Authors
90 -# Distributed under the terms of the GNU General Public License v2
91 -
92 -EAPI=7
93 -
94 -LUA_COMPAT=( lua5-{1..3} )
95 -
96 -inherit autotools flag-o-matic lua-single toolchain-funcs
97 -
98 -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
99 -HOMEPAGE="http://www.p4est.org/"
100 -
101 -if [[ ${PV} = *9999* ]]; then
102 - inherit git-r3
103 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
104 - EGIT_BRANCH="develop"
105 - SRC_URI=""
106 -else
107 - SRC_URI="
108 - https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
109 - https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
110 - KEYWORDS="~amd64 ~x86"
111 -fi
112 -
113 -LICENSE="GPL-2+"
114 -SLOT="0"
115 -
116 -# TODO petsc
117 -IUSE="debug doc examples mpi openmp romio threads +vtk-binary"
118 -REQUIRED_USE="${LUA_REQUIRED_USE}
119 - romio? ( mpi )"
120 -
121 -RDEPEND="${LUA_DEPS}
122 - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=]
123 - sys-apps/util-linux
124 - virtual/blas
125 - virtual/lapack
126 - mpi? ( virtual/mpi[romio=] )"
127 -DEPEND="${RDEPEND}"
128 -BDEPEND="virtual/pkgconfig"
129 -
130 -PATCHES=(
131 - "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
132 - "${FILESDIR}"/${PN}-2.3-add_soname.patch
133 -)
134 -
135 -pkg_pretend() {
136 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
137 -}
138 -
139 -pkg_setup() {
140 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
141 - lua-single_pkg_setup
142 -}
143 -
144 -src_prepare() {
145 - default
146 -
147 - # Inject libsc to get all parts of the build system...
148 - if ! [[ ${PV} = *9999* ]]; then
149 - rmdir "${S}/sc" || die "rmdir failed"
150 - mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
151 - fi
152 -
153 - # Inject a version number into the build system
154 - echo "${PV}" > "${S}"/.tarball-version
155 -
156 - AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
157 - eautoreconf
158 -
159 - sed -i \
160 - "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
161 - "${S}"/configure || die "sed failed"
162 -
163 - sed -i \
164 - "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
165 - "${S}"/configure || die "sed failed"
166 -}
167 -
168 -src_configure() {
169 - # avoid underlinkage
170 - append-libs -lsc
171 -
172 - local myeconfargs=(
173 - --disable-static
174 - $(use_enable debug)
175 - $(use_enable mpi)
176 - $(use_enable openmp)
177 - $(use_enable romio mpiio)
178 - $(use_enable threads pthread)
179 - $(use_enable vtk-binary)
180 - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
181 - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
182 - --with-sc="${ESYSROOT}/usr"
183 - )
184 - econf "${myeconfargs[@]}"
185 -}
186 -
187 -src_install() {
188 - default
189 -
190 - use doc && dodoc -r doc/*
191 -
192 - if use examples
193 - then
194 - docinto examples
195 - dodoc -r example/*
196 - docompress -x /usr/share/doc/${PF}/examples
197 - else
198 - # Remove compiled example binaries in case of -examples:
199 - rm -r "${ED}"/usr/bin || die "rm failed"
200 - fi
201 -
202 - # Fix wrong installation paths:
203 - dodir /usr/share/p4est
204 - mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
205 - mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
206 - rmdir "${ED}"/etc/ || die "rmdir failed"
207 -
208 - # no static archives
209 - find "${ED}" -name '*.la' -delete || die
210 -}
211
212 diff --git a/sci-libs/p4est/p4est-2.3.3.ebuild b/sci-libs/p4est/p4est-2.3.3.ebuild
213 deleted file mode 100644
214 index 0d1041be0bd0..000000000000
215 --- a/sci-libs/p4est/p4est-2.3.3.ebuild
216 +++ /dev/null
217 @@ -1,122 +0,0 @@
218 -# Copyright 1999-2022 Gentoo Authors
219 -# Distributed under the terms of the GNU General Public License v2
220 -
221 -EAPI=7
222 -
223 -LUA_COMPAT=( lua5-{1..3} )
224 -
225 -inherit autotools flag-o-matic lua-single toolchain-funcs
226 -
227 -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
228 -HOMEPAGE="http://www.p4est.org/"
229 -
230 -if [[ ${PV} = *9999* ]]; then
231 - inherit git-r3
232 - EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
233 - EGIT_BRANCH="develop"
234 - SRC_URI=""
235 -else
236 - SRC_URI="
237 - https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
238 - https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
239 - KEYWORDS="~amd64 ~x86"
240 -fi
241 -
242 -LICENSE="GPL-2+"
243 -SLOT="0"
244 -
245 -# TODO petsc
246 -IUSE="debug doc examples mpi openmp romio threads +vtk-binary"
247 -REQUIRED_USE="${LUA_REQUIRED_USE}
248 - romio? ( mpi )"
249 -
250 -RDEPEND="${LUA_DEPS}
251 - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=]
252 - sys-apps/util-linux
253 - virtual/blas
254 - virtual/lapack
255 - mpi? ( virtual/mpi[romio=] )"
256 -DEPEND="${RDEPEND}"
257 -BDEPEND="virtual/pkgconfig"
258 -
259 -PATCHES=(
260 - "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
261 - "${FILESDIR}"/${PN}-2.3-add_soname.patch
262 -)
263 -
264 -pkg_pretend() {
265 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
266 -}
267 -
268 -pkg_setup() {
269 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
270 - lua-single_pkg_setup
271 -}
272 -
273 -src_prepare() {
274 - default
275 -
276 - # Inject libsc to get all parts of the build system...
277 - if ! [[ ${PV} = *9999* ]]; then
278 - rmdir "${S}/sc" || die "rmdir failed"
279 - mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
280 - fi
281 -
282 - # Inject a version number into the build system
283 - echo "${PV}" > "${S}"/.tarball-version
284 -
285 - AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
286 - eautoreconf
287 -
288 - sed -i \
289 - "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
290 - "${S}"/configure || die "sed failed"
291 -
292 - sed -i \
293 - "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
294 - "${S}"/configure || die "sed failed"
295 -}
296 -
297 -src_configure() {
298 - # avoid underlinkage
299 - append-libs -lsc
300 -
301 - local myeconfargs=(
302 - --disable-static
303 - $(use_enable debug)
304 - $(use_enable mpi)
305 - $(use_enable openmp)
306 - $(use_enable romio mpiio)
307 - $(use_enable threads pthread)
308 - $(use_enable vtk-binary)
309 - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
310 - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
311 - --with-sc="${ESYSROOT}/usr"
312 - )
313 - econf "${myeconfargs[@]}"
314 -}
315 -
316 -src_install() {
317 - default
318 -
319 - use doc && dodoc -r doc/*
320 -
321 - if use examples
322 - then
323 - docinto examples
324 - dodoc -r example/*
325 - docompress -x /usr/share/doc/${PF}/examples
326 - else
327 - # Remove compiled example binaries in case of -examples:
328 - rm -r "${ED}"/usr/bin || die "rm failed"
329 - fi
330 -
331 - # Fix wrong installation paths:
332 - dodir /usr/share/p4est
333 - mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
334 - mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
335 - rmdir "${ED}"/etc/ || die "rmdir failed"
336 -
337 - # no static archives
338 - find "${ED}" -name '*.la' -delete || die
339 -}