Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, sci-libs/libbufr/files/, sci-libs/libbufr/
Date: Mon, 22 Feb 2016 15:22:55
Message-Id: 1456154346.2808c0ef3ba423fd376a1eb1dd7356bac22e4242.jlec@gentoo
1 commit: 2808c0ef3ba423fd376a1eb1dd7356bac22e4242
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 22 15:19:06 2016 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 22 15:19:06 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2808c0ef
7
8 Drop sci-libs/libbufr
9
10 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12 profiles/package.mask | 6 -
13 sci-libs/libbufr/Manifest | 1 -
14 .../files/libbufr-000360-gcc-includes.patch | 15 --
15 .../libbufr/files/libbufr-000405-makefile.patch | 80 ---------
16 sci-libs/libbufr/files/libbufr-makefile.patch | 11 --
17 sci-libs/libbufr/libbufr-000405.ebuild | 199 ---------------------
18 sci-libs/libbufr/metadata.xml | 20 ---
19 7 files changed, 332 deletions(-)
20
21 diff --git a/profiles/package.mask b/profiles/package.mask
22 index b738090..1f63929 100644
23 --- a/profiles/package.mask
24 +++ b/profiles/package.mask
25 @@ -279,12 +279,6 @@ www-apps/389-dsgw
26 # Mask this liferea version because upstream released it broken
27 =net-news/liferea-1.10.17
28
29 -# Justin Lecher <jlec@g.o> (29 Dec 2015)
30 -# Fails to build and test runs
31 -# No reverse deps
32 -# #370021, #478614, #513964
33 -sci-libs/libbufr
34 -
35 # Fabian Groffen <grobian@g.o> (11 Dec 2015)
36 # Release candidates for Exim 4.87
37 =mail-mta/exim-4.87_rc2
38
39 diff --git a/sci-libs/libbufr/Manifest b/sci-libs/libbufr/Manifest
40 deleted file mode 100644
41 index e0171be..0000000
42 --- a/sci-libs/libbufr/Manifest
43 +++ /dev/null
44 @@ -1 +0,0 @@
45 -DIST bufrdc_000405.tar.gz 11873311 SHA256 0c3ab33bdb3eea600c5af6f1e4064a000ec143f4c96a14b72ca09666ca3c3775 SHA512 3355d6bac54ef152f9feb13ae13f3c94f4e01a665a4b9bc7f85f0c98f9aa37411170668ba9adfb6b62c2fe906d0dff67b03a708cdf1acd21a0037e327c7c6169 WHIRLPOOL f97662c240e40086be2e2f7d33d446280576dd79ff119374d54d02af05bd51c9176a6592d965765baf549043ee80e8bb9e824e3149d4ce85599db1f5e3f42e10
46
47 diff --git a/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch b/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch
48 deleted file mode 100644
49 index 8b0ac1c..0000000
50 --- a/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch
51 +++ /dev/null
52 @@ -1,15 +0,0 @@
53 ---- examples/bufr_decode.c.orig 2008-09-17 03:02:39.000000000 -0700
54 -+++ examples/bufr_decode.c 2010-12-27 19:03:57.000000000 -0800
55 -@@ -7,9 +7,9 @@
56 - * See LICENSE and gpl-3.0.txt for details.
57 - */
58 -
59 --#include "stdio.h"
60 --#include "stdlib.h"
61 --
62 -+#include <stdio.h>
63 -+#include <stdlib.h>
64 -+#include <string.h>
65 -
66 -
67 - int main(int argc, char *argv[])
68
69 diff --git a/sci-libs/libbufr/files/libbufr-000405-makefile.patch b/sci-libs/libbufr/files/libbufr-000405-makefile.patch
70 deleted file mode 100644
71 index 08b30de..0000000
72 --- a/sci-libs/libbufr/files/libbufr-000405-makefile.patch
73 +++ /dev/null
74 @@ -1,80 +0,0 @@
75 ---- Makefile.orig 2016-01-04 13:09:58.661150785 -0800
76 -+++ Makefile 2016-01-04 13:17:12.707621825 -0800
77 -@@ -1,7 +1,7 @@
78 - # Makefile for libbufrex
79 - #
80 - R64 = R64
81 --TARGETS = all clean
82 -+TARGETS = all clean test
83 - LIBRARY = libbufr$(R64).a
84 - SHELL=/bin/sh
85 - SUBDIRS = fortranC bufrdc pbio bufrtables examples
86 -@@ -11,12 +11,14 @@
87 - ( echo "*************************"; \
88 - echo "*** Make in $$name "; \
89 - echo "*************************"; \
90 -- cd $$name ; make ; ) done
91 -+ $(MAKE) -C $$name LIB=bufr ; ) done
92 -+
93 -+test :
94 - ./test.sh
95 - tables_tools/check_tables.sh bufrtables
96 -
97 - clean :
98 - @for name in $(SUBDIRS); do\
99 -- ( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
100 -+ ( echo "*** Clean in $$name ***" ;$(MAKE) -C $$name clean ); \
101 - done
102 - rm -f $(LIBRARY)
103 ---- examples/Makefile.in.orig 2016-01-04 13:42:39.790648703 -0800
104 -+++ examples/Makefile.in 2016-01-04 13:45:02.384967830 -0800
105 -@@ -16,19 +16,19 @@
106 - #
107 - #
108 - TARGETS = all clean
109 --EXECS = decode_bufr decode_bufr_image bufr_decode_all tdexp tdexp create_bufr
110 -+EXECS = decode_bufr decode_bufr_image bufr_decode_all bufr_compress tdexp create_bufr
111 - #
112 - #
113 - all :$(EXECS)
114 -
115 --decode_bufr: decode_bufr.o
116 -+decode_bufr: decode_bufr.o
117 - $(FC) $(FFLAGS) -o $@ decode_bufr.o -L$(PLACE) -l$(LIB)$(R64)
118 -
119 --bufr_decode_all: bufr_decode_all.o
120 -- $(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
121 -+bufr_decode_all: bufr_decode_all.o
122 -+ $(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
123 -
124 --bufr_compress: bufr_compress.o
125 -- $(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
126 -+bufr_compress: bufr_compress.o
127 -+ $(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
128 -
129 - bufr2crex : bufr2crex.o
130 - $(FC) $(FFLAGS) -o $@ bufr2crex.o -L$(PLACE) -l$(LIB)$(R64) -lcrex$(R64)
131 -@@ -48,4 +48,4 @@
132 - clean :
133 - @for name in $(EXECS); do\
134 - (rm -f $$name *.o ); \
135 -- done
136 -+ done
137 ---- bufrtables/Makefile.orig 2016-01-04 14:03:47.292850644 -0800
138 -+++ bufrtables/Makefile 2016-01-04 14:05:22.242500485 -0800
139 -@@ -25,11 +25,14 @@
140 - OBJECTS = $(OBJECTS.F) $(OBJECTS.c)
141 - #
142 - #
143 --all: links
144 -+all: pgms links
145 -
146 - links:
147 - ./clean.sh
148 - ./links.sh
149 -+
150 -+pgms: bufr2txt_tables bufr_split_tables txt2bufr_tables
151 -+
152 - bufr2txt_tables: bufr2txt_tables.f
153 - $(FC) $(FFLAGS) -o bufr2txt_tables bufr2txt_tables.f $(LIBRARY)
154 - bufr_split_tables: bufr_split_tables.f
155
156 diff --git a/sci-libs/libbufr/files/libbufr-makefile.patch b/sci-libs/libbufr/files/libbufr-makefile.patch
157 deleted file mode 100644
158 index bc61962..0000000
159 --- a/sci-libs/libbufr/files/libbufr-makefile.patch
160 +++ /dev/null
161 @@ -1,11 +0,0 @@
162 ---- Makefile.orig 2011-03-16 22:05:18.000000000 -0700
163 -+++ Makefile 2011-03-16 22:05:40.000000000 -0700
164 -@@ -10,7 +10,7 @@
165 - ( echo "*************************"; \
166 - echo "*** Make in $$name "; \
167 - echo "*************************"; \
168 -- cd $$name ; make LIB=bufr ; ) done
169 -+ $(MAKE) -C $$name LIB=bufr ; ) done
170 -
171 - clean :
172 - @for name in $(SUBDIRS); do\
173
174 diff --git a/sci-libs/libbufr/libbufr-000405.ebuild b/sci-libs/libbufr/libbufr-000405.ebuild
175 deleted file mode 100644
176 index 96df106..0000000
177 --- a/sci-libs/libbufr/libbufr-000405.ebuild
178 +++ /dev/null
179 @@ -1,199 +0,0 @@
180 -# Copyright 1999-2016 Gentoo Foundation
181 -# Distributed under the terms of the GNU General Public License v2
182 -# $Id$
183 -
184 -EAPI=5
185 -
186 -inherit eutils fortran-2 toolchain-funcs
187 -
188 -MY_P="${PN/lib/}dc_${PV}"
189 -
190 -DESCRIPTION="ECMWF BUFR library - includes both C and Fortran example utilities"
191 -HOMEPAGE="https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home"
192 -SRC_URI="https://software.ecmwf.int/wiki/download/attachments/35752466/${MY_P}.tar.gz"
193 -
194 -LICENSE="LGPL-3"
195 -SLOT="0"
196 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
197 -# needs someone to test on these: ~alpha ~hppa ~ia64 ~sparc etc ...
198 -
199 -IUSE="debug doc examples lto"
200 -
201 -RDEPEND="
202 - virtual/fortran
203 - "
204 -
205 -DEPEND="sys-apps/findutils"
206 -
207 -S=${WORKDIR}/${MY_P}
208 -
209 -if use lto; then
210 - RESTRICT="strip"
211 -fi
212 -
213 -pkg_setup() {
214 - fortran-2_pkg_setup
215 - case "$(tc-getFC)" in
216 - *gfortran)
217 - export CNAME="_gfortran"
218 - ;;
219 - *g77)
220 - export CNAME="_gnu"
221 - ;;
222 - *pgf90|*pgf77)
223 - export CNAME=""
224 - ;;
225 - ifc|ifort)
226 - export CNAME="_intel"
227 - ;;
228 - esac
229 -
230 - elog "Note non-GNU compilers are not currently supported on non-x86"
231 - elog "architectures. If you need it, please submit a patch..."
232 -
233 - export target="linux"
234 - export A64=""
235 - export R64=""
236 - case "${ARCH}" in
237 - amd64)
238 - export R64="R64"
239 - export A64="A64"
240 - ;;
241 - ppc64)
242 - export target="ppc_G5"
243 - ;;
244 - ppc)
245 - export target="ppc"
246 - ;;
247 - *)
248 - ;;
249 - esac
250 -}
251 -
252 -src_prepare() {
253 - update_configs
254 - epatch "${FILESDIR}"/${P}-makefile.patch
255 -
256 - local config="config/config.$target$CNAME$R64$A64"
257 -
258 - if [[ "${ARCH}" == "ppc" ]] ; then
259 - sed -i -e "s|= -mcpu=G4 -mtune=G4|= |" ${config}
260 - elif [[ "${ARCH}" == "ppc64" ]] ; then
261 - sed -i -e "s|= -mcpu=G5 -mtune=G5|= |" ${config}
262 - else
263 - cp ${config}.in ${config} || die "Error updating config!"
264 - fi
265 -
266 - sed -i -e "s:DEBUG = -O2:DEBUG = -g:g" ${config}
267 - use debug || sed -i -e "s:DEBUG = -g:DEBUG =:g" ${config}
268 -
269 - # add local CFLAGS to build flags
270 - sed -i -e "s|\$(DEBUG)|${CFLAGS} \$(DEBUG) -fPIC|" \
271 - -e 's|emos|/usr/share/bufrtables|g' ${config}
272 -
273 - # add local LDFLAGS to bins
274 - sed -i \
275 - -e "s|-o|${LDFLAGS} -fPIC -o|" \
276 - examples/Makefile \
277 - bufrtables/Makefile
278 -}
279 -
280 -src_compile() {
281 - export BUFR_TABLES="${S}"/bufrtables
282 - EBUILD_ARCH="${ARCH}"
283 - EBUILD_CFLAGS="${CFLAGS}"
284 - unset ARCH CFLAGS
285 -
286 - tc-export CC FC AR NM STRIP RANLIB
287 - TC_FLAGS="CC=$CC FC=$FC AR=$AR RANLIB=$RANLIB"
288 - ARFLAGS="rv"
289 -
290 - if use lto; then
291 - PLUGIN_PATH="--plugin=$(gcc -print-prog-name=liblto_plugin.so)"
292 - tc-ld-is-gold && ARFLAGS="rv ${PLUGIN_PATH}"
293 - fi
294 -
295 - # emake won't work with this fossil...
296 - BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
297 - make $TC_FLAGS ARFLAGS="${ARFLAGS}" $BUFRFLAGS || die "make failed"
298 -
299 - generate_files
300 -
301 - ARCH="${EBUILD_ARCH}"
302 - CFLAGS="${EBUILD_CFLAGS}"
303 -}
304 -
305 -src_test() {
306 - unset ARCH CFLAGS
307 - BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
308 - make $BUFRFLAGS test || die "make test failed"
309 -
310 - ARCH="${EBUILD_ARCH}"
311 - CFLAGS="${EBUILD_CFLAGS}"
312 -}
313 -
314 -src_install() {
315 - # install library
316 - dolib.a libbufr$R64.a
317 -
318 - dosbin bufrtables/{bufr2txt_tables,bufr_split_tables,txt2bufr_tables}
319 - dobin examples/{bufr_decode_all,create_bufr,decode_bufr,decode_bufr_image,tdexp}
320 -
321 - keepdir /usr/share/bufrtables
322 - insinto /usr/share/bufrtables
323 - doins -r bufrtables/{B,C,D}*.*
324 -
325 - # files generated above
326 - doenvd 20${PN}
327 -
328 - dodoc README
329 - if use doc ; then
330 - insinto /usr/share/doc/${PF}
331 - doins doc/*.pdf
332 - fi
333 -
334 - if use examples ; then
335 - newdoc examples/README README.examples
336 - insinto /usr/share/doc/${PF}/examples
337 - doins examples/{*.F,*.c,Makefile}
338 - fi
339 -}
340 -
341 -pkg_postinst() {
342 - elog
343 - elog "This is the only GPL'd BUFR decoder library written in C/Fortran"
344 - elog "but the build system is an old kluge that pre-dates the discovery"
345 - elog "of fire. File bugs as usual if you have build/runtime problems."
346 - elog ""
347 - elog "The default BUFR tables are stored in /usr/share/bufrtables, so"
348 - elog "add your local tables there if needed. Only a static lib is"
349 - elog "installed currently, as shared lib support is incomplete (feel"
350 - elog "free to submit a patch :)"
351 - elog ""
352 - elog "The installed user-land bufr utilities are just the examples;"
353 - elog "the main library is really all there is (and there are no man"
354 - elog "pages either). Install the examples and use the source, Luke..."
355 - elog
356 -}
357 -
358 -generate_files() {
359 - ## Do not remove blank lines from the response file
360 - cat <<-EOF > 20${PN}
361 - BUFR_TABLES="/usr/share/bufrtables"
362 - EOF
363 -}
364 -
365 -update_configs() {
366 - find . -type f -name \*.distinct -o -name \*.f -o -name \*.in \
367 - | xargs chmod -x
368 - cp options/options_linux options/options_ppc
369 - cp options/options_linux options/options_ppc_G5
370 - cp pbio/sources.linux pbio/sources.ppc
371 - cp pbio/sources.linux pbio/sources.ppc_G5
372 - pushd config > /dev/null
373 - cp config.ppc_gfortran.in config.ppc_gfortran
374 - cp config.ppc_gfortranR64.in config.ppc_gfortranR64
375 - cp config.ppc_gfortran_G5.in config.ppc_gfortran_G5
376 - cp config.ppc_gfortranR64_G5.in config.ppc_gfortranR64_G5
377 - popd > /dev/null
378 -}
379
380 diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
381 deleted file mode 100644
382 index d6a7bb3..0000000
383 --- a/sci-libs/libbufr/metadata.xml
384 +++ /dev/null
385 @@ -1,20 +0,0 @@
386 -<?xml version="1.0" encoding="UTF-8"?>
387 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
388 -<pkgmetadata>
389 - <maintainer type="person">
390 - <email>nerdboy@g.o</email>
391 - <name>Steve Arnold</name>
392 - </maintainer>
393 - <maintainer type="project">
394 - <email>sci-geosciences@g.o</email>
395 - <name>Gentoo Geosciences Project</name>
396 - </maintainer>
397 - <longdescription lang="en">
398 - This is mainly just an open source BUFR library from ECMWF that comes with a few example tools (some of which are built and installed).
399 - </longdescription>
400 - <use>
401 - <flag name="lto">
402 - Use gold linker and -flto (requires existing env setup)
403 - </flag>
404 - </use>
405 -</pkgmetadata>