From adb727afeb568404873e8cbc91ba93d3d49eff13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Dec 2022 14:07:48 +0000 Subject: gentoo auto-resync : 26:12:2022 - 14:07:48 --- sci-misc/Manifest.gz | Bin 2743 -> 2746 bytes sci-misc/cdfplayer/Manifest | 2 +- sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild | 89 +++++++++++++++++ sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild | 92 ----------------- sci-misc/fitsverify/Manifest | 6 +- ...erify-4.20-Wimplicit-function-declaration.patch | 75 ++++++++++++++ .../files/fitsverify-4.20-makefile.patch | 10 ++ sci-misc/fitsverify/fitsverify-4.18.ebuild | 34 ------- sci-misc/fitsverify/fitsverify-4.20.ebuild | 32 ++++++ sci-misc/nco/Manifest | 2 + sci-misc/nco/nco-5.1.3.ebuild | 55 +++++++++++ sci-misc/ncview/Manifest | 5 +- sci-misc/ncview/files/ncview-2.1.8-autotools.patch | 110 +++++++++++++++++++++ sci-misc/ncview/ncview-2.1.7.ebuild | 35 ------- sci-misc/ncview/ncview-2.1.8.ebuild | 43 ++++++++ 15 files changed, 424 insertions(+), 166 deletions(-) create mode 100644 sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild delete mode 100644 sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild create mode 100644 sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch create mode 100644 sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch delete mode 100644 sci-misc/fitsverify/fitsverify-4.18.ebuild create mode 100644 sci-misc/fitsverify/fitsverify-4.20.ebuild create mode 100644 sci-misc/nco/nco-5.1.3.ebuild create mode 100644 sci-misc/ncview/files/ncview-2.1.8-autotools.patch delete mode 100644 sci-misc/ncview/ncview-2.1.7.ebuild create mode 100644 sci-misc/ncview/ncview-2.1.8.ebuild (limited to 'sci-misc') diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz index 743b3c48b65e..c667dc6f8923 100644 Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ diff --git a/sci-misc/cdfplayer/Manifest b/sci-misc/cdfplayer/Manifest index da142f203899..fe855ff89c15 100644 --- a/sci-misc/cdfplayer/Manifest +++ b/sci-misc/cdfplayer/Manifest @@ -1,3 +1,3 @@ DIST WolframPlayer_12.2.0_LINUX.sh 1003754320 BLAKE2B b37e2500e09543efd5084b6fadd6f5d6d6f7f2b75627fc8cb3819578d41de00a8ba5f529440d64efebabcf9d26a77b51b01969135f02baca851c42811ef521b7 SHA512 dc4449836419dd7abe8590319912b07019a4f2cf542e31759c15bde0055bfc6bebc880fd6ab88809758d5723862bbbe971affa07429a660b728698d24a4c9d20 -EBUILD cdfplayer-12.2.0.ebuild 2391 BLAKE2B d2eecbdac99d10dd52b67bdebf5020f490c7934330ccc6989b24ddc1004dfd844e10ae75804cecfb303e6bd1da17698781f37045a12ea3e17586be1bfd615f9f SHA512 0f9872d1736b50f6347cb6501eda62bc248ce694f0c2c678fb9d46642c2b13aa96aedd8b81fd92f7628a85efcbc738331ff4e40a62cee7f2589ea1f417353020 +EBUILD cdfplayer-12.2.0-r1.ebuild 2415 BLAKE2B 0718c2ba7b4cfd398343ec734dae6d957a5b4d05de78227ffa785d3e917cc31bf11010ebe6cb9c5aadae6d334c793e9a9de3ee941ef7954428861e43091a0d8d SHA512 6693d79d7c06da6c8702f2106e5f32d90a3b5efaf13454957411d75e0bdd932eda4a6f5b3cd6989040bb16c3d14490d2ffd530cb71400334db3714cb4cd5f384 MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b diff --git a/sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild b/sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild new file mode 100644 index 000000000000..39c3c27587c7 --- /dev/null +++ b/sci-misc/cdfplayer/cdfplayer-12.2.0-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)" +HOMEPAGE="http://www.wolfram.com/cdf-player/" +SRC_URI="WolframPlayer_${PV}_LINUX.sh" +S="${WORKDIR}" + +LICENSE="WolframCDFPlayer" +KEYWORDS="-* ~amd64 ~x86" +SLOT="0" +RESTRICT="strip mirror bindist fetch" + +# this list comes from lsof output +# probably there are still some libraries missing +RDEPEND=" + dev-libs/expat + dev-libs/icu + dev-libs/libxml2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + sys-libs/ncurses-compat:5 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt +" + +# we need this a few times +MPN="WolframPlayer" +MPV=$(ver_cut 1-2) + +# we might as well list all files in all QA variables... +QA_PREBUILT="opt/*" + +pkg_nofetch() { + einfo "Sadly Wolfram provides no permanent link to the player files." + einfo "Please download the Wolfram CFD Player installation file ${SRC_URI} from" + einfo "${HOMEPAGE} and place it into your DISTDIR directory." +} + +src_unpack() { + ${CONFIG_SHELL:-${BASH}} "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" +} + +src_install() { + local ARCH=$(usev amd64 '-x86-64') + + # move all over + ( + insinto / + doins -r opt + ) + + # the autogenerated symlinks point into sandbox, redo + rm "${ED}"/opt/bin/* || die + dosym ../Wolfram/${MPN}/${MPV}/Executables/wolframplayer opt/bin/wolframplayer + dosym ../Wolfram/${MPN}/${MPV}/Executables/WolframPlayer opt/bin/WolframPlayer + + # fix some embedded paths and install desktop files + local filename + while IFS="" read -d $'\0' -r filename ; do + einfo "Fixing ${filename}" + sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}" || die + echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" || die + domenu "${filename}" + done < <(find "${ED}" -type f -name "wolfram-cdf12.desktop" -print0) + + # install a wrapper + newbin - ${PN} <<- _EOF_ + #!/usr/bin/env sh + LD_PRELOAD=${EPREFIX}/usr/$(get_libdir)/libfreetype.so.6:${EPREFIX}/lib/libz.so.1 ${EPREFIX}/opt/Wolfram/${MPN}/${MPV}/Executables/wolframplayer \$* + _EOF_ +} diff --git a/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild b/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild deleted file mode 100644 index 21828e52bedd..000000000000 --- a/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop eapi7-ver multilib - -DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)" -SRC_URI="WolframPlayer_${PV}_LINUX.sh" -HOMEPAGE="http://www.wolfram.com/cdf-player/" - -LICENSE="WolframCDFPlayer" -KEYWORDS="-* ~amd64 ~x86" -SLOT="0" -IUSE="" - -RESTRICT="strip mirror bindist fetch" - -DEPEND="" - -# this list comes from lsof output -# probably there are still some libraries missing -RDEPEND=" - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - media-libs/alsa-lib - dev-libs/expat - media-libs/fontconfig - dev-libs/icu - x11-libs/libxcb - dev-libs/libxml2 - sys-libs/ncurses-compat:5 - media-libs/freetype -" - -# we need this a few times -MPN="WolframPlayer" -MPV=$(ver_cut 1-2) - -# we might as well list all files in all QA variables... -QA_PREBUILT="opt/*" - -S=${WORKDIR} - -src_unpack() { - /bin/sh "${DISTDIR}/${A}" --nox11 --confirm --keep -- -auto "-targetdir=${S}/opt/Wolfram/${MPN}/${MPV}" "-execdir=${S}/opt/bin" || die -} - -src_install() { - local ARCH - if use amd64; then ARCH='-x86-64'; else ARCH=''; fi - - # move all over - mv "${S}"/opt "${D}"/opt || die - - # the autogenerated symlinks point into sandbox, redo - rm "${D}"/opt/bin/* || die - dosym ../Wolfram/${MPN}/${MPV}/Executables/wolframplayer opt/bin/wolframplayer - dosym ../Wolfram/${MPN}/${MPV}/Executables/WolframPlayer opt/bin/WolframPlayer - - # fix some embedded paths and install desktop files - local filename - for filename in $(find "${D}" -name "wolfram-cdf12.desktop") ; do - echo Fixing "${filename}" - sed -e "s:${S}::g" -e 's:^\t\t::g' -i "${filename}" - echo "Categories=Physics;Science;Engineering;2DGraphics;Graphics;" >> "${filename}" - domenu "${filename}" - done - - # install a wrapper - echo '#!/bin/sh' >> ${PN} - echo "LD_PRELOAD=/usr/$(get_libdir)/libfreetype.so.6:/lib/libz.so.1 /opt/Wolfram/${MPN}/${MPV}/Executables/wolframplayer \$*" \ - >> ${PN} - dobin ${PN} -} - -pkg_nofetch() { - einfo "Sadly Wolfram provides no permanent link to the player files." - einfo "Please download the Wolfram CFD Player installation file ${SRC_URI} from" - einfo "${HOMEPAGE} and place it into your DISTDIR directory." -} diff --git a/sci-misc/fitsverify/Manifest b/sci-misc/fitsverify/Manifest index 12f028ff2f1c..85f16c81be70 100644 --- a/sci-misc/fitsverify/Manifest +++ b/sci-misc/fitsverify/Manifest @@ -1,3 +1,5 @@ -DIST fitsverify-4.18.tar.gz 42840 BLAKE2B e02fc9d5558e31fa2fa98b155a8acabe75f1fa2dfd8924519c6117cfde4754a2f49085e77fe52c0f859310877f5927e7a17f93c458e7d5aa72cb14b313c99211 SHA512 4be82078bf328538e1b98b386aedd6b2501a25e3d17f19e0db5b82ed8f62493e51f01228653ecf769ff3c706a16c8d65fe64ebc8693e8dd406e88d0a9ffc5010 -EBUILD fitsverify-4.18.ebuild 782 BLAKE2B ab629fad58555ea8a5d71783820bab6787dc58eadfb080047e01768cf8ea4962b996afc6a8e2b491a9b76e0ff4b0cee28bde6449a49815e6015db7fc379ebd3d SHA512 a85ff09bd7d6fa9e18f677a92c0c0bc0afa857d6a23d17b07e3498f1127d07959b5fb73e07f2af7d0b4746a1e31e7d1cff4f71289cc545d027211a3f3501bb3f +AUX fitsverify-4.20-Wimplicit-function-declaration.patch 1985 BLAKE2B 1141dc2ca294fee607f24e4e0b32dd16688366ec0413d7d918630b009d857ca9292444a2a026bfb2074d5b4ec66e3325666e9ce2440da5709dc3b7f7e74dd388 SHA512 4a1a4dd3c68a790f08262a7f050a3ccbb67fa4832f606090b0033609ab6f96588fc4f15d09f2951ba63f570bf790128fabb53c7a18ffc54c9bb27e2f2f32016c +AUX fitsverify-4.20-makefile.patch 317 BLAKE2B 8bd86e11dc8ce1532cf2ca02247d13e38ed5eb5c4799e5d8eb93b955b79dc2b116466ea21beaf0e837737d2e55b5eb8232cea681988520a317be2a64698a359a SHA512 fb563634d4c15b8d3c653990d643e42d1cb9d7e2687b8770624d1d20d924fecc243926803c49fb70fad3d3f64b36f114db9c096b0a7b99badbf5be6cc515ab60 +DIST fitsverify-4.20.tar.gz 43113 BLAKE2B b449a93cc99b477b7c720f2fd460baa706235929ac87b15f18405dd507e085c6759cb9c4b76b2abc4318a4711e4db507334972cf0cf1620251df32a4cf1709fa SHA512 686940d509ffd355f7616d6348e143f91152a6f248c0fea512cd8a47cda4b93048e1e7304652af598b7cca4685437c0a0e6f170213335381c77e8ff7cd7bf49c +EBUILD fitsverify-4.20.ebuild 687 BLAKE2B c421c6960167060a0a3e8f58cfae779ecc6af7c343300775adafbfcc67d95a944cc4aaf730b0c5240ef7cf8a5e130a1fdefc974bb033e130d9df81232ab0ddb6 SHA512 1a923b039868c612d5f948b857b058b12d198410c5b8516e44babe282110aa99190bd689c43f5d6b339865c5e2b472759a7e7b709ff646b92fcdb97cef44e9cc MISC metadata.xml 511 BLAKE2B 3b832e8fee0ebe02f3cd971228687f951f67b99f2105d281e263f4f83dab7598657cff78b21a9aca0cdf749433e0d6de09c8a6acec9382cc020c325f182dc9af SHA512 58ed7a7b191fc0d7c725731d31320945f529aa68ef87b6c13e5eb68e0a5401fc897d6760beaaccf662f6004035aee044a2d7f17d3d5b3e15f6f89cd40bc54ec4 diff --git a/sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch b/sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch new file mode 100644 index 000000000000..771fb9394b73 --- /dev/null +++ b/sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch @@ -0,0 +1,75 @@ +--- a/fverify.h ++++ b/fverify.h +@@ -169,16 +169,16 @@ + int errnum; /* number of errors in this hdu */ + int wrnno; /* number of warnning in this hdu */ + }HduName; +-int get_total_warn(); +-int get_total_err(); +-void init_hduname(); ++int get_total_warn(void); ++int get_total_err(void); ++void init_hduname(void); + void set_hduname(int hdunum,int hdutype, char* extname,int extver); + void set_hduerr(int hdunum); + void set_hdubasic(int hdunum,int hdutype); + int test_hduname(int hdunum1, int hdunum2); + void total_errors (int *totalerr, int * totalwrn); + void hdus_summary(FILE *out); +-void destroy_hduname(); ++void destroy_hduname(void); + void test_end(fitsfile *infits, FILE *out); + void init_report(FILE *out, char *rootnam); + void close_report(FILE *out); +@@ -198,7 +198,7 @@ + int wrtserr(FILE *out, char* mess, int *status, int severity); + void wrtsep (FILE *out,char fill, char *title, int nchar); + void num_err_wrn(int *num_err, int *num_wrn); +-void reset_err_wrn(); ++void reset_err_wrn(void); + int compkey (const void *key1, const void *key2); + int compcol (const void *col1, const void *col2); + int compcol (const void *col1, const void *col2); +--- a/fvrf_file.c ++++ b/fvrf_file.c +@@ -3,17 +3,17 @@ + static int total_err=1; /* initialzed to 1 in case fail to open file */ + static int total_warn=0; + +-int get_total_warn() ++int get_total_warn(void) + { + return (total_warn); + } +-int get_total_err() ++int get_total_err(void) + { + return (total_err); + } + + /* Get the total hdu number and allocate the memory for hdu array */ +-void init_hduname() ++void init_hduname(void) + { + int i; + /* allocate memories for the hdu structure array */ +@@ -168,7 +168,7 @@ + + + +-void destroy_hduname() ++void destroy_hduname(void) + { + int i; + for (i=0; i < totalhdu; i++) free(hduname[i]); +--- a/fvrf_misc.c ++++ b/fvrf_misc.c +@@ -20,7 +20,7 @@ + return; + } + +-void reset_err_wrn() ++void reset_err_wrn(void) + { + nwrns = 0; + nerrs = 0; diff --git a/sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch b/sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch new file mode 100644 index 000000000000..d7d644720479 --- /dev/null +++ b/sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch @@ -0,0 +1,10 @@ +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,7 @@ ++PKG_CONFIG ?= pkg-config ++ ++CPPFLAGS += -DSTANDALONE $(shell $(PKG_CONFIG) --cflags cfitsio) ++LIBS += $(shell $(PKG_CONFIG) --libs cfitsio) ++ ++fitsverify: ftverify.o fvrf_data.o fvrf_file.o fvrf_head.o fvrf_key.o fvrf_misc.o ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) diff --git a/sci-misc/fitsverify/fitsverify-4.18.ebuild b/sci-misc/fitsverify/fitsverify-4.18.ebuild deleted file mode 100644 index 9d85f6e203cf..000000000000 --- a/sci-misc/fitsverify/fitsverify-4.18.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="FITS file format checker" -HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/" -SRC_URI="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="sci-libs/cfitsio:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}" - -src_compile() { - $(tc-getCC) ${CPPFLAGS} -DSTANDALONE ${CFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags cfitsio) \ - ftverify.c fvrf*.c \ - $($(tc-getPKG_CONFIG) --libs cfitsio) -o ${PN} \ - || die "compiled failed" -} - -src_install() { - dobin fitsverify - dodoc README -} diff --git a/sci-misc/fitsverify/fitsverify-4.20.ebuild b/sci-misc/fitsverify/fitsverify-4.20.ebuild new file mode 100644 index 000000000000..c194846beabf --- /dev/null +++ b/sci-misc/fitsverify/fitsverify-4.20.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="FITS file format checker" +HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/" +SRC_URI="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="sci-libs/cfitsio:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch +) + +src_configure() { + tc-export CC PKG_CONFIG +} + +src_install() { + dobin fitsverify + einstalldocs +} diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest index 9941449ccbdd..d0b1af9940b1 100644 --- a/sci-misc/nco/Manifest +++ b/sci-misc/nco/Manifest @@ -1,3 +1,5 @@ DIST nco-4.5.1.tar.gz 4406757 BLAKE2B f2e203f1c38f5575fe4affb9122c91c61db8a2c2604cbcf9cd1eec6330e4771b8ff4325fcc19cfa292508e9b7a3107ae20e6230397f1269441e4efb883f8e4e9 SHA512 69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485 +DIST nco-5.1.3.tar.gz 6438534 BLAKE2B 6296d881b0e0b62e18daa40db71ccca79b4cca9fa8f046a0664f53b690d8f85175676900d792a4691090662ed80ce5c4e32e4236c69c6057d292800bd9987f36 SHA512 c4819a0b3a1c431419df73250e6648e5afc55439d260d166fb4e13ca3f4ae34bdc728b921922e075c86f6bf5dbede1565741616b2b9a32bcdcfbe85617a7f8ec EBUILD nco-4.5.1-r2.ebuild 1247 BLAKE2B 0377f91eadf9b9e44f1bf4f7954e6687ffa325f99758c6f27f8a3be2d8d756707faf06692c9fc8f9391268a4b22e208b54ab7ca8824f55b4dbccce4cfcd88e4c SHA512 23d5ba5dd652afd9c7ab401bf85688aeffa73d12b51c491df37a687dea86c0e4372e6f260855174f309541cfc8205114aa40c33c1043569dd1b20f0c04f3035a +EBUILD nco-5.1.3.ebuild 1233 BLAKE2B af4a2f5cb332212232dacd5e59f2d42cae192b0232ca992563d5a50ed65561969c2c025da8d7b7833b8e92defef2c4344a5d85de7e683964249b447dffe63653 SHA512 dbdae5e66a4d766dad025901ecb94b9329e21be0c82e07b0f3fd736eb261758b43bbc237d2684e2bb9fb93abb0cb7e54c33dc99c8f24f004f08ea3c2dc65b4e7 MISC metadata.xml 1145 BLAKE2B 4f9165405e77c57feb8de2b4f128d75238039455c55f6290ff6232c7988f5bfd3fa3d420ac37645e893d7b3d47a065513eed454e84ebb007a01e4778e2f88921 SHA512 003ac5b9bddcb83a5adf70e4f1779276aeef6be1a6a1208114547924049fa43df8a71cef4e46f63f87cd2dd0fe3de8a1885457bdc71f5fcc7755a5c1a63afe31 diff --git a/sci-misc/nco/nco-5.1.3.ebuild b/sci-misc/nco/nco-5.1.3.ebuild new file mode 100644 index 000000000000..09b909e232be --- /dev/null +++ b/sci-misc/nco/nco-5.1.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Command line utilities for operating on netCDF files" +HOMEPAGE="http://nco.sourceforge.net/" +SRC_URI="http://nco.sf.net/src/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="dap gsl hdf5 ncap2 openmp test udunits" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=sci-libs/netcdf-4:=[dap=,hdf5?,tools] + gsl? ( sci-libs/gsl:= ) + ncap2? ( dev-cpp/antlr-cpp:2= ) + udunits? ( >=sci-libs/udunits-2 )" +DEPEND="${RDEPEND} + test? ( >=sci-libs/netcdf-4[tools] )" +BDEPEND="sys-apps/texinfo" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + econf \ + --disable-udunits \ + --disable-gpu \ + --enable-doc \ + $(use_enable dap) \ + $(use_enable gsl) \ + $(use_enable hdf5 netcdf4) \ + $(use_enable hdf5 netcdf-4) \ + $(use_enable ncap2) \ + $(use_enable ncap2 ncoxx) \ + $(use_enable openmp) \ + $(use_enable udunits udunits2) +} + +src_install() { + default + dodoc doc/ChangeLog + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-misc/ncview/Manifest b/sci-misc/ncview/Manifest index 6a5a16a33404..b399dc085eee 100644 --- a/sci-misc/ncview/Manifest +++ b/sci-misc/ncview/Manifest @@ -1,3 +1,4 @@ -DIST ncview-2.1.7.tar.gz 1280624 BLAKE2B a3a69ee79443bef68b51ac9e8f9693a6720eec1e1cc03c91f3cf90883f7722d0eec6b2e06e6d6f8bcc3a4e18f2403446cb9b84d9ce2a258beb8b8c7109187ed8 SHA512 c39b26e8453f91865e8483abc6ee25d804150dd03ad21469c0e22a60b41f182c108678e22eb86652b66e8ca0997b5f533b2542593f793d673eeeab73b81eaef7 -EBUILD ncview-2.1.7.ebuild 690 BLAKE2B cf8c98489ea2474163765e0f61f99711b1e9e7f947208521366deb127c670273703613dcb7e19eb6a22f5f1e13d1de9b9647dd0e45620cfdfc2b78831dec1e90 SHA512 ecd0ac72d3ad748d0004cdf75d7f33a695829898e43bf4725e7b3894af2e0cc3a2369c362d9f6b31b9131b418f305fa8c9738b35fca781fb8970e213aad96895 +AUX ncview-2.1.8-autotools.patch 4402 BLAKE2B fe0743c1556e7c9b5c9a1a9074efbb517f8cb34d3584ebad005ee68927c78c8666aa35355fb5b6ca6b24ee1073b110b2d67cbb792d35018724166d048837c87c SHA512 93ff400d314c528d56ae14dabae845ed6d7f700a0a9ef938075465fd1cb7594d8a266d91b04b85d2f48cc3a184fa590365742809c266daf268d7096db396dfd6 +DIST ncview-2.1.8.tar.gz 1267792 BLAKE2B 16d0cf4ef827d41a2f1773292839b1795934b346d2f52a6c3a8eeb50260e836822fbbc7245342664629cf256b4270426d4c89c0f848e95fddcf3de043c53cde3 SHA512 2567aa361b365c3788069d81bb7f890d5f244c387fa3ce70c78bcf4487c852d4ac4f93f0b0e3d821f8ae5816073cef654b659c8a3856f1d12fb0d80dfba92fc4 +EBUILD ncview-2.1.8.ebuild 779 BLAKE2B faac4b671dc55e8bc800ea9c0b895a9e910e999ac9c684a852cceeceb8ecec8ec3c1e05b931c61b6912330181367fe23048c4325939b38b4f3244678d84d241c SHA512 0a953705bb69671dd465d13ce2f06cf393adb0b93e84dbc27ee60a49447231529990aed9842924dfef251333979334341cf4efee2ca24f80d3aeea025bfe80cb MISC metadata.xml 596 BLAKE2B 1ae485a3847a461d03bf85e3e41bb333854722b38776ceefd7c9f74a07a1fac55f9d8753fc9df6c4df0ee859d4cf6e9fa1b14339dafb23f9c13699b02fe2885e SHA512 ddcb54f08bb3a59fddb6d1a4e1c176b15ff1e663e6cdb873a87a63fa876e893ca3db54a21cdf822c256b0bdf4ca7b0a050a90cdb4737df2538f709810e0c9beb diff --git a/sci-misc/ncview/files/ncview-2.1.8-autotools.patch b/sci-misc/ncview/files/ncview-2.1.8-autotools.patch new file mode 100644 index 000000000000..9a8fef2f7136 --- /dev/null +++ b/sci-misc/ncview/files/ncview-2.1.8-autotools.patch @@ -0,0 +1,110 @@ +--- a/configure.in ++++ b/configure.in +@@ -8,6 +8,7 @@ + m4_define([ncview_release_date],[15 Feb 2010]) + + AC_INIT([ncview],[ncview_version],[dpierce@ucsd.edu]) ++AC_CONFIG_MACRO_DIR([m4macros]) + + # Handle netcdf + AC_PATH_NETCDF +@@ -30,13 +31,11 @@ + # we have to specifically check if the same compiler used to compile the + # netcdf library exists. + #------------------------------------------------------------------------ +-AC_PROG_CC( $NETCDF_CC ) +-AC_ISC_POSIX +-AC_HEADER_STDC ++AC_PROG_CC + + +-AC_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE([ncview],[ncview_version]) ++AC_CONFIG_HEADERS(config.h) ++AM_INIT_AUTOMAKE + + AC_PATH_X + if test "x$no_x" == "xyes"; then +@@ -206,82 +205,6 @@ + AC_SUBST(X_INCLUDES) + + +-#---------------------------------------------------------------------------- +-# We want to test if the same compiler was used for the netcdf library as for +-# ncview. This might be complicated by the fact that often "gcc" and "cc" +-# end up invoking the same compiler. Use an ugly hack that I have no idea +-# if it generally works or not. Probably not. +-#---------------------------------------------------------------------------- +-CC_TEST_SAME=$CC +-#----------------------------------------------------------------------- +-# Point of following obscure manipulations is that $CC can have multiple +-# words, for example, it could be "gcc -fPIC -lm". We want to keep only +-# the first word, so use 'set' and then take the first arg ($1). +-#----------------------------------------------------------------------- +-set $CC_TEST_SAME +-CC_TEST_SAME=$1 +-if test x$CC_TEST_SAME = xcc; then +- CC_TEST_SAME=gcc +-fi +-NETCDF_CC_TEST_SAME=$NETCDF_CC +-set $NETCDF_CC_TEST_SAME +-NETCDF_CC_TEST_SAME=$1 +-if test x$NETCDF_CC_TEST_SAME = xcc; then +- NETCDF_CC_TEST_SAME=gcc +-fi +-if test x$CC_TEST_SAME != x$NETCDF_CC_TEST_SAME; then +- echo "======================================================================" +- echo "Configuration error: You specified that the \"$CC\" C compiler should be" +- echo "used to build ncview, but the netcdf library was compiled with the \"$NETCDF_CC\"" +- echo "compiler. Here is the path where I found the netcdf library:" +- echo " $NETCDF_LDFLAGS" +- echo "You must use the same compiler for ncview as was used to build the netcdf library!" +- echo " " +- echo "There are two possible ways to fix this." +- echo " " +- echo "1) Download the netcdf library and compile it with the $CC compiler," +- echo "install it, and try again to build ncview. NOTE that if you do this," +- echo "you might have more than one version of the netcdf library on your system," +- echo "built with differnt compilers, which can get confusing. If you do this," +- echo "you will have to specify the path to the (new) version of nc-config" +- echo "that was compiled using the $CC compiler by configuring ncview in a " +- echo "way similar to this:" +- echo " " +- echo " ./configure --with-nc-config=/path/to/newly/compiled/nc-config" +- echo " " +- echo "2) Configure ncview to use the $NETCDF_CC compiler." +- echo "To do this, set environmental variable CC to $NETCDF_CC" +- echo "and run ./configure again" +- echo "===================================================================" +- exit -1 +-fi +- +-#---------------------------------------------------------------------------------- +-# Construct our RPATH flags. Idea here is that we have LDFLAGS that might look, +-# for example, something like this: +-# LIBS="-L/usr/local/lib -lnetcdf -L/home/pierce/lib -ludunits" +-# We want to convert this to -rpath flags suitable for the compiler, which would +-# have this format: +-# "-Wl,-rpath,/usr/local/lib -Wl,-rpath,/home/pierce/lib" +-# +-# As a safety check, I only do this for the GNU compiler, as I don't know if this +-# is anything like correct syntax for other compilers. Note that this *does* work +-# for the Intel icc compiler, but also that the icc compiler sets $ac_compiler_gnu +-# to "yes". Go figure. +-#---------------------------------------------------------------------------------- +-echo "ac_computer_gnu: $ac_compiler_gnu" +-if test x$ac_compiler_gnu = xyes; then +- RPATH_FLAGS="" +- for word in $UDUNITS2_LDFLAGS $NETCDF_LDFLAGS; do +- if test `expr $word : -L/` -eq 3; then +- #RPDIR=`expr substr $word 3 999`; +- RPDIR=${word:2} +- RPATH_FLAGS="$RPATH_FLAGS -Wl,-rpath,$RPDIR" +- fi +- done +- AC_SUBST(RPATH_FLAGS) +-fi +- + AC_CONFIG_FILES([Makefile src/Makefile]) + AC_OUTPUT + diff --git a/sci-misc/ncview/ncview-2.1.7.ebuild b/sci-misc/ncview/ncview-2.1.7.ebuild deleted file mode 100644 index 9a3bb737c9b5..000000000000 --- a/sci-misc/ncview/ncview-2.1.7.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="X-based viewer for netCDF files" -HOMEPAGE="http://meteora.ucsd.edu/~pierce/ncview_home_page.html" -SRC_URI="ftp://cirrus.ucsd.edu/pub/ncview/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND="media-libs/libpng:0= - >=sci-libs/netcdf-4.1[hdf5] - x11-libs/libXaw - sci-libs/udunits" -DEPEND="${RDEPEND}" - -src_install() { - default - - doman data/${PN}.1 - - insinto /usr/share/X11/app-defaults - newins Ncview-appdefaults Ncview - - insinto /usr/share/${PN} - doins *.ncmap - - make_desktop_entry ${PN} -} diff --git a/sci-misc/ncview/ncview-2.1.8.ebuild b/sci-misc/ncview/ncview-2.1.8.ebuild new file mode 100644 index 000000000000..f85dbe848aa1 --- /dev/null +++ b/sci-misc/ncview/ncview-2.1.8.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="X-based viewer for netCDF files" +HOMEPAGE="http://meteora.ucsd.edu/~pierce/ncview_home_page.html" +SRC_URI="ftp://cirrus.ucsd.edu/pub/ncview/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + media-libs/libpng:0= + sci-libs/netcdf[hdf5] + sci-libs/udunits + x11-libs/libXaw +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-autotools.patch ) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + doman data/ncview.1 + + insinto /usr/share/X11/app-defaults + newins Ncview-appdefaults Ncview + + insinto /usr/share/ncview + doins *.ncmap + + make_desktop_entry ncview +} -- cgit v1.2.3