Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libbufr/files/, sci-libs/libbufr/, profiles/
Date: Sun, 28 Nov 2021 21:48:37
Message-Id: 1638136059.230f27319c991680b603d76641117b95eb5b1e9c.jsmolic@gentoo
1 commit: 230f27319c991680b603d76641117b95eb5b1e9c
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 28 21:46:28 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 28 21:47:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=230f2731
7
8 sci-libs/libbufr: treeclean
9
10 Closes: https://bugs.gentoo.org/819111
11 Closes: https://bugs.gentoo.org/715688
12 Closes: https://bugs.gentoo.org/723466
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 profiles/package.mask | 5 -
16 sci-libs/libbufr/Manifest | 1 -
17 .../libbufr/files/libbufr-000405-makefile.patch | 80 ---------
18 sci-libs/libbufr/libbufr-000405.ebuild | 196 ---------------------
19 sci-libs/libbufr/metadata.xml | 10 --
20 5 files changed, 292 deletions(-)
21
22 diff --git a/profiles/package.mask b/profiles/package.mask
23 index 48f944044774..04b21534a19d 100644
24 --- a/profiles/package.mask
25 +++ b/profiles/package.mask
26 @@ -465,11 +465,6 @@ dev-ruby/rbnacl:4
27 # Removal on 2021-11-29. Bug #819258.
28 net-wireless/btcrack
29
30 -# Jakov Smolić <jsmolic@g.o> (2021-10-30)
31 -# EAPI 5, no revdeps, replaced by sci-libs/eccodes
32 -# Removal on 2021-11-29. Bug #819111.
33 -sci-libs/libbufr
34 -
35 # Sam James <sam@g.o> (2021-10-10)
36 # Needs upstream build system fixes (currently in progress).
37 # Python toggles don't work correctly right now.
38
39 diff --git a/sci-libs/libbufr/Manifest b/sci-libs/libbufr/Manifest
40 deleted file mode 100644
41 index 79737e4052d6..000000000000
42 --- a/sci-libs/libbufr/Manifest
43 +++ /dev/null
44 @@ -1 +0,0 @@
45 -DIST bufrdc_000405.tar.gz 11873311 BLAKE2B e8282fc539b80365420c538afd911aaba698d6a60d15018eae2d4f00e0838c3f665894078b2c0969b4558841187dd6a4a9e620468cebd5b08e171a2c18c85288 SHA512 3355d6bac54ef152f9feb13ae13f3c94f4e01a665a4b9bc7f85f0c98f9aa37411170668ba9adfb6b62c2fe906d0dff67b03a708cdf1acd21a0037e327c7c6169
46
47 diff --git a/sci-libs/libbufr/files/libbufr-000405-makefile.patch b/sci-libs/libbufr/files/libbufr-000405-makefile.patch
48 deleted file mode 100644
49 index 08b30ded8d72..000000000000
50 --- a/sci-libs/libbufr/files/libbufr-000405-makefile.patch
51 +++ /dev/null
52 @@ -1,80 +0,0 @@
53 ---- Makefile.orig 2016-01-04 13:09:58.661150785 -0800
54 -+++ Makefile 2016-01-04 13:17:12.707621825 -0800
55 -@@ -1,7 +1,7 @@
56 - # Makefile for libbufrex
57 - #
58 - R64 = R64
59 --TARGETS = all clean
60 -+TARGETS = all clean test
61 - LIBRARY = libbufr$(R64).a
62 - SHELL=/bin/sh
63 - SUBDIRS = fortranC bufrdc pbio bufrtables examples
64 -@@ -11,12 +11,14 @@
65 - ( echo "*************************"; \
66 - echo "*** Make in $$name "; \
67 - echo "*************************"; \
68 -- cd $$name ; make ; ) done
69 -+ $(MAKE) -C $$name LIB=bufr ; ) done
70 -+
71 -+test :
72 - ./test.sh
73 - tables_tools/check_tables.sh bufrtables
74 -
75 - clean :
76 - @for name in $(SUBDIRS); do\
77 -- ( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
78 -+ ( echo "*** Clean in $$name ***" ;$(MAKE) -C $$name clean ); \
79 - done
80 - rm -f $(LIBRARY)
81 ---- examples/Makefile.in.orig 2016-01-04 13:42:39.790648703 -0800
82 -+++ examples/Makefile.in 2016-01-04 13:45:02.384967830 -0800
83 -@@ -16,19 +16,19 @@
84 - #
85 - #
86 - TARGETS = all clean
87 --EXECS = decode_bufr decode_bufr_image bufr_decode_all tdexp tdexp create_bufr
88 -+EXECS = decode_bufr decode_bufr_image bufr_decode_all bufr_compress tdexp create_bufr
89 - #
90 - #
91 - all :$(EXECS)
92 -
93 --decode_bufr: decode_bufr.o
94 -+decode_bufr: decode_bufr.o
95 - $(FC) $(FFLAGS) -o $@ decode_bufr.o -L$(PLACE) -l$(LIB)$(R64)
96 -
97 --bufr_decode_all: bufr_decode_all.o
98 -- $(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
99 -+bufr_decode_all: bufr_decode_all.o
100 -+ $(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
101 -
102 --bufr_compress: bufr_compress.o
103 -- $(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
104 -+bufr_compress: bufr_compress.o
105 -+ $(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
106 -
107 - bufr2crex : bufr2crex.o
108 - $(FC) $(FFLAGS) -o $@ bufr2crex.o -L$(PLACE) -l$(LIB)$(R64) -lcrex$(R64)
109 -@@ -48,4 +48,4 @@
110 - clean :
111 - @for name in $(EXECS); do\
112 - (rm -f $$name *.o ); \
113 -- done
114 -+ done
115 ---- bufrtables/Makefile.orig 2016-01-04 14:03:47.292850644 -0800
116 -+++ bufrtables/Makefile 2016-01-04 14:05:22.242500485 -0800
117 -@@ -25,11 +25,14 @@
118 - OBJECTS = $(OBJECTS.F) $(OBJECTS.c)
119 - #
120 - #
121 --all: links
122 -+all: pgms links
123 -
124 - links:
125 - ./clean.sh
126 - ./links.sh
127 -+
128 -+pgms: bufr2txt_tables bufr_split_tables txt2bufr_tables
129 -+
130 - bufr2txt_tables: bufr2txt_tables.f
131 - $(FC) $(FFLAGS) -o bufr2txt_tables bufr2txt_tables.f $(LIBRARY)
132 - bufr_split_tables: bufr_split_tables.f
133
134 diff --git a/sci-libs/libbufr/libbufr-000405.ebuild b/sci-libs/libbufr/libbufr-000405.ebuild
135 deleted file mode 100644
136 index 85febe3abf26..000000000000
137 --- a/sci-libs/libbufr/libbufr-000405.ebuild
138 +++ /dev/null
139 @@ -1,196 +0,0 @@
140 -# Copyright 1999-2021 Gentoo Authors
141 -# Distributed under the terms of the GNU General Public License v2
142 -
143 -EAPI=5
144 -
145 -inherit epatch fortran-2 toolchain-funcs
146 -
147 -MY_P="${PN/lib/}dc_${PV}"
148 -
149 -DESCRIPTION="ECMWF BUFR library - includes both C and Fortran example utilities"
150 -HOMEPAGE="https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home"
151 -SRC_URI="https://software.ecmwf.int/wiki/download/attachments/35752466/${MY_P}.tar.gz"
152 -
153 -LICENSE="LGPL-3"
154 -SLOT="0"
155 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
156 -# needs someone to test on these: ~alpha ~hppa ~ia64 ~sparc etc ...
157 -
158 -IUSE="debug doc examples"
159 -
160 -RDEPEND="
161 - virtual/fortran
162 - "
163 -
164 -DEPEND="sys-apps/findutils"
165 -
166 -S=${WORKDIR}/${MY_P}
167 -
168 -pkg_setup() {
169 - fortran-2_pkg_setup
170 - case "$(tc-getFC)" in
171 - *gfortran)
172 - export CNAME="_gfortran"
173 - ;;
174 - *g77)
175 - export CNAME="_gnu"
176 - ;;
177 - *pgf90|*pgf77)
178 - export CNAME=""
179 - ;;
180 - ifc|ifort)
181 - export CNAME="_intel"
182 - ;;
183 - esac
184 -
185 - elog "Note non-GNU compilers are not currently supported on non-x86"
186 - elog "architectures. If you need it, please submit a patch..."
187 -
188 - export target="linux"
189 - export A64=""
190 - export R64=""
191 - case "${ARCH}" in
192 - amd64)
193 - export R64="R64"
194 - export A64="A64"
195 - ;;
196 - ppc64)
197 - export target="ppc_G5"
198 - ;;
199 - ppc)
200 - export target="ppc"
201 - ;;
202 - *)
203 - ;;
204 - esac
205 -}
206 -
207 -src_prepare() {
208 - update_configs
209 - epatch "${FILESDIR}"/${P}-makefile.patch
210 -
211 - local config="config/config.$target$CNAME$R64$A64"
212 -
213 - if [[ "${ARCH}" == "ppc" ]] ; then
214 - sed -i -e "s|= -mcpu=G4 -mtune=G4|= |" ${config}
215 - elif [[ "${ARCH}" == "ppc64" ]] ; then
216 - sed -i -e "s|= -mcpu=G5 -mtune=G5|= |" \
217 - -e "s|-fdefault-real-8|-fdefault-real-8 -fdefault-double-8|" \
218 - ${config}
219 - elif [[ "${ARCH}" == "amd64" ]] ; then
220 - cp ${config}.in ${config}
221 - sed -i -e "s|-fdefault-real-8|-fdefault-real-8 -fdefault-double-8|" \
222 - ${config}
223 - else
224 - cp ${config}.in ${config} || die "Error updating config!"
225 - fi
226 -
227 - sed -i -e "s:DEBUG = -O2:DEBUG = -g:g" ${config}
228 - use debug || sed -i -e "s:DEBUG = -g:DEBUG =:g" ${config}
229 -
230 - # add local CFLAGS to build flags
231 - sed -i -e "s|\$(DEBUG)|${CFLAGS} \$(DEBUG) -fPIC|" \
232 - -e 's|emos|/usr/share/bufrtables|g' ${config}
233 -
234 - # add local LDFLAGS to bins
235 - sed -i \
236 - -e "s|-o|${LDFLAGS} -fPIC -o|" \
237 - examples/Makefile \
238 - bufrtables/Makefile
239 -}
240 -
241 -src_compile() {
242 - export BUFR_TABLES="${S}"/bufrtables
243 - EBUILD_ARCH="${ARCH}"
244 - EBUILD_CFLAGS="${CFLAGS}"
245 - unset ARCH CFLAGS
246 -
247 - tc-export CC FC AR NM RANLIB
248 - export STRIP="/bin/true"
249 - TC_FLAGS="CC=$CC FC=$FC AR=$AR RANLIB=$RANLIB"
250 - ARFLAGS="rv"
251 -
252 - # emake won't work with this fossil...
253 - BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
254 - make $TC_FLAGS ARFLAGS="${ARFLAGS}" $BUFRFLAGS || die "make failed"
255 -
256 - generate_files
257 -
258 - ARCH="${EBUILD_ARCH}"
259 - CFLAGS="${EBUILD_CFLAGS}"
260 -}
261 -
262 -src_test() {
263 - unset ARCH CFLAGS
264 - BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
265 - make $BUFRFLAGS test || die "make test failed"
266 -
267 - ARCH="${EBUILD_ARCH}"
268 - CFLAGS="${EBUILD_CFLAGS}"
269 -}
270 -
271 -src_install() {
272 - # install library
273 - dolib.a libbufr$R64.a
274 -
275 - dosbin bufrtables/{bufr2txt_tables,bufr_split_tables,txt2bufr_tables}
276 - dobin examples/{bufr_decode_all,create_bufr,decode_bufr,decode_bufr_image,tdexp}
277 -
278 - keepdir /usr/share/bufrtables
279 - insinto /usr/share/bufrtables
280 - doins -r bufrtables/{B,C,D}*.*
281 -
282 - # files generated above
283 - doenvd 20${PN}
284 -
285 - dodoc README
286 - if use doc ; then
287 - insinto /usr/share/doc/${PF}
288 - doins doc/*.pdf
289 - fi
290 -
291 - if use examples ; then
292 - newdoc examples/README README.examples
293 - insinto /usr/share/doc/${PF}/examples
294 - doins examples/{*.F,*.c,Makefile}
295 - fi
296 -}
297 -
298 -pkg_postinst() {
299 - elog
300 - elog "This is the only GPL'd BUFR decoder library written in C/Fortran"
301 - elog "but the build system is an old kluge that pre-dates the discovery"
302 - elog "of fire. File bugs as usual if you have build/runtime problems."
303 - elog ""
304 - elog "The default BUFR tables are stored in /usr/share/bufrtables, so"
305 - elog "add your local tables there if needed. Only a static lib is"
306 - elog "installed currently, as shared lib support is incomplete (feel"
307 - elog "free to submit a patch :)"
308 - elog ""
309 - elog "The installed user-land bufr utilities are just the examples;"
310 - elog "the main library is really all there is (and there are no man"
311 - elog "pages either). Install the examples and use the source, Luke..."
312 - elog
313 -}
314 -
315 -generate_files() {
316 - ## Do not remove blank lines from the response file
317 - cat <<-EOF > 20${PN}
318 - BUFR_TABLES="/usr/share/bufrtables"
319 - EOF
320 -}
321 -
322 -update_configs() {
323 - find . -type f -name \*.distinct -o -name \*.f -o -name \*.in \
324 - | xargs chmod -x
325 - cp options/options_linux options/options_ppc
326 - cp options/options_linux options/options_ppc_G5
327 - cp pbio/sources.linux pbio/sources.ppc
328 - cp pbio/sources.linux pbio/sources.ppc_G5
329 - pushd config > /dev/null
330 - cp config.ppc_gfortran.in config.ppc_gfortran
331 - cp config.ppc_gfortranR64.in config.ppc_gfortranR64
332 - cp config.ppc_gfortran_G5.in config.ppc_gfortran_G5
333 - cp config.ppc_gfortranR64_G5.in config.ppc_gfortranR64_G5
334 - popd > /dev/null
335 -}
336
337 diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
338 deleted file mode 100644
339 index 17252cf7e7b1..000000000000
340 --- a/sci-libs/libbufr/metadata.xml
341 +++ /dev/null
342 @@ -1,10 +0,0 @@
343 -<?xml version="1.0" encoding="UTF-8"?>
344 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
345 -<pkgmetadata>
346 - <!-- maintainer-needed -->
347 - <longdescription lang="en">
348 - This is the only useable open source BUFR library (from ECMWF)
349 - and comes with a few example tools (some of which are built
350 - and installed).
351 - </longdescription>
352 -</pkgmetadata>