* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cdf/, sci-libs/cdf/files/
@ 2021-02-18 18:57 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-02-18 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 60fb7a454f6e50852d2519cea5d89b7ad57842de
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 18 18:55:40 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 18:55:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fb7a45
sci-libs/cdf: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/cdf/Manifest | 8 --
sci-libs/cdf/cdf-3.4.1.ebuild | 122 ------------------------------
sci-libs/cdf/files/cdf-3.4-Makefile.patch | 102 -------------------------
3 files changed, 232 deletions(-)
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index bbdc085f6fb..96f0d78594e 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,11 +1,3 @@
-DIST cdf34_1-dist-cdf.tar.gz 1045465 BLAKE2B f6889584e6c1d26c66d0c17d1e44d63ae2b966ec97e6c1d40fe3ef819225f96c9bad1d000529a9f91f88f6dbcbbf6043bf432203f0d60d48c57941224ca25ec0 SHA512 d68e39b521402256205196f09ec9742b7fdcd1d59fb3251b5eb50812fee52f9ae193c39d342b3dcc467d03911972e4e19f1cf157ac102eae6cc77cb6abacac44
-DIST cdf34_1-dist-java.tar.gz 713180 BLAKE2B c5c8aabb7c3a9a7f3fee3cb9205b4c66d147c5862d0b1f415d8de56f44a06b6b1e00a89bb143ca8868fe65a58423792ae89fdf0a40635bfa49c0b9a05233b573 SHA512 1b95110e6ff455cb379370a74b4160098b5dbd3bef8a3854634caad40d93fde9bc804e4f10187cfeb232f9b9a28a69ce6de6caba969c64dc21b89b339e01e112
-DIST cdf34crm.pdf 1693915 BLAKE2B 77869347ff02105a104d3762118103e9bc5edaf931f1228e3a79f70c8f30b0eaefc091c7c61d0868fa735e987941f8d11200ef9717a77e4649b846ba8de02192 SHA512 cbc8a4b6237632147de24c0eecaaff0f7fa6551eec08f68ebc72c79aff71a99608c309874bd07e9dca6203868171159556a29a7669ecb7e45e60a5cef8d81cb4
-DIST cdf34frm.pdf 1968381 BLAKE2B 163f091927702e3ce72c8ca8d24c19a80e995daec21ef8a7a4906570939234f0576de3269a7b02c8023a3a165016084ad2e3d69684eef1b55e98a0e56d0cbde0 SHA512 c5402db80c05192430e1ca7142d356a8224c52f128fe8c1be937767623c12a7ed55d7afaa0955a00e9ebcace87ba5fed977fc8020a71cdac40fb44326c5f8f65
-DIST cdf34ifd.pdf 415359 BLAKE2B dd928ca68fcfa0239af12e08196293406cda14f87fd1647e48900b9a61cdc13855ac554340c7d3cf3a50fdb7ff03e5957fb9fc966256b7ed27007b97a859cc6f SHA512 1ab42f8677fbbb7cb477c6cbbfe632a8569c6a78fee07dd32c42f549b7d451faaf0ca61ba03f2ea5ba4de2a3a71cc40e4de6ca3dcf86b7caef7594cefc9f2246
-DIST cdf34jrm.pdf 3505200 BLAKE2B 9ae6029f702cc06f4b1fae2d288378a5e7cdee47ef6c1c4d0d24071bead3d94a9d964d39e759eaaeeeb09fe010aede00feb5d9339b6a554f64de92a1df98db35 SHA512 1609f609f7f455bb4749f5f948183f066bc7b6a1367082fccfed669a9768d8c6d8e46f39680e0e99b4accd030c262af92deff9f832e2789ea191874c107df94c
-DIST cdf34prm.pdf 1062987 BLAKE2B 5dc0d5e70d6ae802cf80fab6082d8f77ae1c957c236d133930ccb0c08179889c3011cc6cafe7253df795eb66f08e6be65631bbc10fc4385a9097e7b0d8e9e9ea SHA512 f4e95ce93c896147e4c3074caa8a4d564aadebc8e741c6e593a9377fc0fb0e6f3225c2cd9962900a144418a5b445f462fe12d1178857c3f229f2650da4030587
-DIST cdf34ug.pdf 1307731 BLAKE2B 365711a1d8384dea8017826e753460a5d93295e893540ebf5e300ced8b253316f721edb10effae24a24c857a301edb080da2977d5482f5f6ae540b39fc89a14d SHA512 78c4891690494131f1a8793e1e0dbb9aa0d021b88d04489385156dcc25a218555acad3ec727265aa2b749e24c9a66601ad0698ad201bc6f16b74c9266aae4a0f
DIST cdf350crm.pdf 2139671 BLAKE2B fbfcc12d919ca07beb1df621f967bbe69b33d0c403613e1b12c01354e53e86f93920104d24dab4f3d1260d72f5e6de663ae3a87ef310dfabf46af2c216424f07 SHA512 382c3cfd73b7c75a017f0c563c61473fccc11ca344f33f4f5a543f4c339a52879400532dbff9956ae8c2b7706f63223132666c3154ad7ada281cd4418e48b4dd
DIST cdf350frm.pdf 2194293 BLAKE2B 40b269a7987a1522ec7f92eae8efba1117993e459df574afe89d5325d21c3e685a5ed09216bfa56e22f40e831c99bf6d69faa14b9d3a1014d1cbceba43dc3bc9 SHA512 1c1db067f42b56ddb01399821103ced7207da1dc191f62f7acf6776a05c15a992f7be060790233e1b94444724aedb6f83ba687f60b7a20b4988f9d591b40d481
DIST cdf350jrm.pdf 4009791 BLAKE2B 5b0ea4fcfe2237b4105707d2a3a9945e13333c4ee073d7d9a5a2b839a250308697aa9291aa1e224b886f821235b4d6c4f5f5304a1ad61d45436e1dc4f2b0425a SHA512 cf42de6d94168337936403fc2e504b03fdd676ae8daf8020186d3261bc7331822d47b7c509c804ca5fd637af3696308d09c5db102aaa546138d0630c3df999c3
diff --git a/sci-libs/cdf/cdf-3.4.1.ebuild b/sci-libs/cdf/cdf-3.4.1.ebuild
deleted file mode 100644
index fcc6e3d4c3d..00000000000
--- a/sci-libs/cdf/cdf-3.4.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-opt-2 multilib toolchain-funcs versionator
-
-MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
-MY_P="${MY_DP}_$(get_version_component_range 3)"
-
-DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
-HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="ftp://cdaweb.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix"
-
-SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
- java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
- doc? (
- ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}crm.pdf
- ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}frm.pdf
- ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
- ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}prm.pdf
- ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ug.pdf
- java? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}jrm.pdf )
- )"
-
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples java ncurses static-libs"
-
-RDEPEND="
- java? ( >=virtual/jre-1.5:= )
- ncurses? ( sys-libs/ncurses:0= )
- "
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}-dist"
-
-src_prepare() {
- # respect cflags, remove useless scripts
- epatch \
- "${FILESDIR}"/${PN}-3.4-Makefile.patch \
- "${FILESDIR}"/${PN}-3.2-soname.patch
- # use proper lib dir
- sed -i \
- -e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
- Makefile || die "sed failed"
-}
-
-src_compile() {
- PV_SO=${PV:0:1}
- emake \
- OS=linux \
- CC=$(tc-getCC) \
- ENV=gnu \
- SHARED=yes \
- SHAREDEXT_linux=so.${PV_SO} \
- CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
- CURSES=$(usex ncurses) \
- ${myconf} \
- all
-
- if use java; then
- export CDF_BASE="${S}"
- export CDF_LIB="${S}/src/lib"
- cd cdfjava/jni
- $(tc-getCC) \
- ${CFLAGS} -fPIC \
- -I${CDF_BASE}/src/include \
- -I$(java-config -O)/include \
- -I$(java-config -O)/include/linux \
- -c cdfNativeLibrary.c \
- -o cdfNativeLibrary.o \
- || die "compiling java lib failed"
- $(tc-getCC) \
- ${LDFLAGS} \
- -shared cdfNativeLibrary.o \
- -Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
- -L${CDF_LIB} -lcdf -lm \
- -o libcdfNativeLibrary.so.${PV_SO} \
- || die "linking java lib failed"
- fi
-}
-
-src_test() {
- emake -j1 test
-}
-
-src_install() {
- dodir /usr/bin /usr/$(get_libdir)
- # -j1 (fragile non-autotooled make)
- emake -j1 \
- INSTALLDIR="${ED}/usr" \
- SHAREDEXT=so.${PV_SO} \
- install
- dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
- use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
- dodoc Release.notes CHANGES.txt Welcome.txt
- doenvd "${FILESDIR}"/50cdf
-
- if use doc; then
- dodoc "${DISTDIR}"/${MY_DP}{crm,frm,ifd,prm,ug}.pdf
- use java && dodoc "${DISTDIR}"/${MY_DP}jrm.pdf
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins samples/*
- fi
-
- if use java; then
- cd cdfjava || die
- dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
- dosym libcdfNativeLibrary.so.${PV_SO} \
- /usr/$(get_libdir)/libcdfNativeLibrary.so
- java-pkg_dojar */*.jar
- if use examples; then
- insinto /usr/share/doc/${PF}/examples/java
- doins examples/*
- fi
- fi
-}
diff --git a/sci-libs/cdf/files/cdf-3.4-Makefile.patch b/sci-libs/cdf/files/cdf-3.4-Makefile.patch
deleted file mode 100644
index 4a6c0a0ef26..00000000000
--- a/sci-libs/cdf/files/cdf-3.4-Makefile.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Nur cdf34_1-dist.orig/Makefile cdf34_1-dist/Makefile
---- cdf34_1-dist.orig/Makefile 2012-06-19 06:05:21.000000000 -0700
-+++ cdf34_1-dist/Makefile 2012-08-03 10:11:38.672992055 -0700
-@@ -715,17 +715,17 @@
- "PIC=$(PIC_$(OS)_$(ENV))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "LDx=$(LD_$(OS)_$(ENV))" \
--"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
--"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
-+"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
- "AROPTIONS=$(AROPTIONS_$(OS))" \
- "RANLIB=$(RANLIB_$(OS))" \
- all
- @cd $(TOOLSsrcDIR); $(MAKE) \
- "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
-@@ -735,9 +735,9 @@
- "FCx=$(FC_$(OS))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
--"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
-+"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
- "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
-@@ -773,12 +773,17 @@
- install.all: install.definitions install.include install.lib \
- install.tools install.help_ notify.user copy.leapseconds
-
--install.definitions: create.bin copy.definitions change.definitions
-+install.definitions: create.bin
- install.include: create.include copy.include
- install.tools: create.bin copy.tools
- install.help_: create.help copy.help
-
- install.lib: create.lib copy.lib.a
-+ @if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
-+ $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
-+ else \
-+ $(NULL) ; \
-+ fi
- @if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
- $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
- else \
-@@ -884,8 +889,8 @@
- cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
-
- copy.lib.so:
-- @echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
-- cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
-+ @echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
-+ cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
-
- copy.lib.sl:
- @echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
-@@ -1964,15 +1969,15 @@
- show.supported:
- @echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
- @echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
-- @echo FOPTIONS=$(FOPTIONS_$(OS))
-+ @echo FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS))
- @echo FOPTIONSld=$(FOPTIONSld_$(OS))
- @echo SHAREDEXT=$(SHAREDEXT_$(OS))
-- @echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
-+ @echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
- @echo RANLIB=$(RANLIB_$(OS))
- @echo FCx=$(FC_$(OS))
- @echo CCx=$(CC_$(OS)_$(ENV))
- @echo PIC=$(PIC_$(OS)_$(ENV))
-- @echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
-+ @echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
- @echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
- @echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
- @echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
-diff -Nur cdf34_1-dist.orig/src/tools/Makefile cdf34_1-dist/src/tools/Makefile
---- cdf34_1-dist.orig/src/tools/Makefile 2012-06-15 09:22:16.000000000 -0700
-+++ cdf34_1-dist/src/tools/Makefile 2012-08-03 10:11:38.685992724 -0700
-@@ -35,10 +35,10 @@
- INCLUDEcdf= ../include
-
- CC=$(CCx)
--CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
--CFLAGSld=$(COPTIONSld)
-+CFLAGS:=$(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
-+CFLAGSld=$(LDFLAGS) $(COPTIONSld)
-
--LIBCDFa=../lib/libcdf.a
-+LIBCDFa=../lib/libcdf.so.3
- LIBs1=$(LIBCDFa) $(SYSLIBS)
- LIBs2=$(LIBCDFa) $(CURSESLIB) $(SYSLIBS)
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cdf/, sci-libs/cdf/files/
@ 2021-05-29 15:52 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2021-05-29 15:52 UTC (permalink / raw
To: gentoo-commits
commit: a33ab5b83c948af447f85eeb1cd0ac21d517b66d
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 15:42:42 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat May 29 15:52:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33ab5b8
sci-libs/cdf: add version 3.8.0
- bumped java version
- no longer installs into /usr/CDFLeapSeconds.txt
- no longer calls CC directly
- restricted bindist
Closes: https://bugs.gentoo.org/786708
Closes: https://bugs.gentoo.org/773076
Closes: https://bugs.gentoo.org/633438
Closes: https://bugs.gentoo.org/544588
Closes: https://bugs.gentoo.org/544588
Closes: https://bugs.gentoo.org/731932
Closes: https://bugs.gentoo.org/695390
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/cdf/Manifest | 9 ++
sci-libs/cdf/cdf-3.5.0.2.ebuild | 1 +
.../cdf/{cdf-3.5.0.2.ebuild => cdf-3.8.0.ebuild} | 46 ++++++-----
sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch | 96 ++++++++++++++++++++++
4 files changed, 133 insertions(+), 19 deletions(-)
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 96f0d78594e..9e3f6128d7d 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -6,3 +6,12 @@ DIST cdf350ug.pdf 1396156 BLAKE2B 39f3e3b0441ef103c9131b3c5523c5a387eb785d545c68
DIST cdf35_0-dist-cdf.tar.gz 1137065 BLAKE2B df3235338e63686dd0446663b8738618c45c4e86c858b4f41d3326ebf14d391ecce43309cf5d6a3db4a9f9e53820bf8a73acb77549a0432594859b24acb7eb84 SHA512 f26bd1e298494563cb30c52751bd175124814dca2fe2c05ae056d6c2ad905fb5ddc7da35888c6a07d69914f52481cb4e9fcab9684c9a8a0ca4b80ca449ad3406
DIST cdf35_0-dist-java.tar.gz 724055 BLAKE2B 563542821106b040bb0eaefa303cbda46ace5a127cda1936c55e5eaf3b395eb67073a622e84d1bfc33cb65faa4b51710008cfbae86fd680e5cca2c80dbc5162b SHA512 2e69447e9c36ced39a6bfcd1f2a5dfa7c36c04e9a5acac12952c1b415c5191471efbf2cc432b5b31eb37c8ee31bda3e27bce0fa266c5549fb1b0ab86c4dd6c4f
DIST cdf35ifd.pdf 560458 BLAKE2B c44722d30c4217b492fe140833ae9c58721040b629cf414fe8d9d7d44433b3f62241d621d4b6d634f54e4f0ecb4c026b66a1e752a1d868b0861eed54d4a95bee SHA512 018a524f7fc8dc5b8b3512ed8bdea42bae141eb65d24b4fbbdac6ecebaeac5c458caf3a476fc4b7c0313b17441cbe7dce32d1002f9344d056cd46853ee3cd438
+DIST cdf380crm.pdf 2671048 BLAKE2B 2605d6465c744b57f11d08605aa888ead724b7553a0efd8830dae759eb54c6d0df807cca1c6611fd40b4c5eb9327fbfcd66f0f7cf82b69bf7619385928ebc6dd SHA512 fc1eef589ff0f3cd989d8743cc1d6cfeb5946cf9ae8e4a328ba746b33fe0f6a286cf7b7b7e7cab5e0231bef566c03d7b68afe6c0879e5fb32fc1e6c980f7e081
+DIST cdf380csrm.pdf 2409166 BLAKE2B 7e97e61865531b788553ca9747513ec32bc5e1a743e10e5bad5f62980a883d00cfeede975b83826ad72327071062080cd1db611fd40c4e5b3d22caf7d4dd3d0f SHA512 d669f032722e270d3f16f8d9a8920d4536430bd83a509591cf82b447770d16a9c6d9aba17e096f78445c4f0b7f4ab85082cf2480bc9384b46677a2325be0f163
+DIST cdf380frm.pdf 2570409 BLAKE2B c8fb1444c7e02297af0c3bffbf58c048077e0d69c4aca8cb3e48331f496dba1551289d2e2b95f9f2d9fabe8048bd56f73a72bab58a52772cae22f184a6b39745 SHA512 de90e4893b976ab9e77f1e9512b2f310b043b8dc921ca43cf1d37e767bf5cbae5d06f91388ff5f4fb1258db5a1149712fa9a5dbc1c2d18f78705021fc31087bb
+DIST cdf380prm.pdf 1521804 BLAKE2B 4afa792f3b5f2bda7e896e10ccb6b2b073e127fca9ece229bb3dbe3b8e8920ef5b8cce5a45a15fa648525c8241fbcc678c8eea0a32a3dabad4cd3b9e959e0913 SHA512 413ce06f36d151cc5380884111376fb54108fcf692ac56ed4d96204f56d4d434ca695d42114e1e89626288802cb4d5d48097664e8e0411a041950aff8199fea0
+DIST cdf380ug.pdf 1716882 BLAKE2B e36f0a9624756d6d5bf71fcc0958d33d060b7f32dd7bbb93fcf6a58a33a5154017fd0ba8a598fe652919785398d306e84fe7a89b5c4aa0d305ee0bc2fbf20b8f SHA512 f2e865b55d293a17a5d85c36e04d14050b7f17adc97dfc284d95db36ae1b94678e31b107cbab32ad690630bbde0f3f0caf558ecdb4e1d0e60cd5f53b30faa0fc
+DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a787bcdb9d179d334f4cb79f2b5c6d98427ab9a6451b44e333f48932c152674ce7c9229291b3b714e0f70 SHA512 8552d1f1a83a0f327bc20e8dc03f8728aad132e5765084839ee02900d19c93f9c7f67a1e3f4429cc01d51d75ab00b666d18a247522da2b4fda529cf6333889b5
+DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce
+DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be
+DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.5.0.2.ebuild
index 1bdd8d2b12b..2942136cd5f 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.5.0.2.ebuild
@@ -27,6 +27,7 @@ LICENSE="CDF"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples java ncurses static-libs"
+RESTRICT="bindist"
RDEPEND="
java? ( >=virtual/jre-1.5:= )
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.8.0.ebuild
similarity index 74%
copy from sci-libs/cdf/cdf-3.5.0.2.ebuild
copy to sci-libs/cdf/cdf-3.8.0.ebuild
index 1bdd8d2b12b..4350f3e58cc 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.8.0.ebuild
@@ -1,35 +1,37 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit epatch java-pkg-opt-2 multilib toolchain-funcs versionator
+inherit java-pkg-opt-2 multilib toolchain-funcs
-MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
-MY_P="${MY_DP}_$(get_version_component_range 3)"
+MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)"
+MY_P="${MY_DP}_$(ver_cut 3)"
DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="http://cdaweb.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
+SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
doc? (
+ ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
+ ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf
${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
- ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
- java? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0jrm.pdf )
+ ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf
)"
LICENSE="CDF"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples java ncurses static-libs"
+RESTRICT="bindist"
RDEPEND="
- java? ( >=virtual/jre-1.5:= )
+ java? ( >=virtual/jre-1.8:= )
ncurses? ( sys-libs/ncurses:0= )
"
DEPEND="
@@ -39,11 +41,14 @@ DEPEND="
S="${WORKDIR}/${MY_P}-dist"
+# respect cflags, ldflags, soname
+PATCHES=(
+ "${FILESDIR}"/${P}-respect-flags.patch
+)
+
src_prepare() {
- # respect cflags, remove useless scripts
- epatch \
- "${FILESDIR}"/${P}-Makefile.patch \
- "${FILESDIR}"/${PN}-3.2-soname.patch
+ default
+
# use proper lib dir
sed -i \
-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
@@ -102,13 +107,12 @@ src_install() {
doenvd "${FILESDIR}"/50cdf
if use doc; then
- dodoc "${DISTDIR}"/${MY_DP}{0{crm,frm,prm,ug},ifd}.pdf
- use java && dodoc "${DISTDIR}"/${MY_DP}jrm.pdf
+ dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf
fi
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins samples/*
+ docinto /usr/share/doc/${PF}/examples
+ dodoc samples/*
fi
if use java; then
@@ -118,8 +122,12 @@ src_install() {
/usr/$(get_libdir)/libcdfNativeLibrary.so
java-pkg_dojar */*.jar
if use examples; then
- insinto /usr/share/doc/${PF}/examples/java
- doins examples/*
+ docinto /usr/share/doc/${PF}/examples/java
+ dodoc examples/*
fi
fi
+
+ # move this to a better location
+ dodir "/usr/share/${PF}"
+ mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die
}
diff --git a/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch b/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch
new file mode 100644
index 00000000000..8ffd226a1ed
--- /dev/null
+++ b/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch
@@ -0,0 +1,96 @@
+diff --git a/Makefile b/Makefile
+index 9857fa9..6dc0953 100644
+--- a/Makefile
++++ b/Makefile
+@@ -896,7 +896,7 @@ install.tools: create.bin copy.tools
+ install.help_: create.help copy.help
+
+ install.lib: create.lib copy.lib.a
+- @if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
++ @if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
+ $(MAKE) MAKE=$(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
+ else \
+ $(NULL) ; \
+@@ -1010,10 +1010,10 @@ copy.include:
+ cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
+
+ copy.lib.so:
+- @echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
+- cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib/libcdf.$(VERSION).so
+- rm -f $(INSTALLDIR)/lib/libcdf.so
+- cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.so
++ @echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
++ cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib/libcdf.$(VERSION).so
++ rm -f $(INSTALLDIR)/lib/libcdf.$(SHAREDEXT)
++ cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.$(SHAREDEXT)
+
+ copy.lib.sl:
+ @echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
+diff --git a/src/lib/Makefile b/src/lib/Makefile
+index 2017c46..b666ce3 100644
+--- a/src/lib/Makefile
++++ b/src/lib/Makefile
+@@ -62,9 +62,9 @@ AR=ar
+ RANLIBcmd=ranlib
+ MACos=Darwin
+
+-CFLAGS=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR)
++CFLAGS+=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR)
+ CFLAGS2=-DZ_PREFIX
+-LDFLAGS=$(LDOPTIONS)
++LDFLAGS+=$(LDOPTIONS)
+ ARFLAGS=$(AROPTIONS)
+ ZLIB=zlib
+
+@@ -120,13 +120,13 @@ ranlib.yes:
+
+ shared.yes: libcdf.$(SHAREDEXT)
+
+-libcdf.so \
++libcdf.$(SHAREDEXT) \
+ libcdf.dylib \
+ libcdf.dll \
+ libcdf.sl: $(OBJs)
+ @if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
+- @echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+- $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
++ @echo $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS)
++ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS)
+ # @if [ $(MACVERSION) -gt 0 ]; then \
+ # rm -f $(MACLIB)/$@; \
+ # cp $@ $(MACLIB)/libcdf.$(VERSION).dylib; \
+@@ -134,8 +134,8 @@ libcdf.sl: $(OBJs)
+ # fi
+
+ libcdf.o: $(OBJs)
+- @echo $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+- $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
++ @echo $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
+
+ .c.o:
+ @if [ "$<" = "cdfgzip.c" ] || [ "$<" = "cdfgzip64.c" ] ; then \
+diff --git a/src/tools/Makefile b/src/tools/Makefile
+index bac4ca0..ef44264 100644
+--- a/src/tools/Makefile
++++ b/src/tools/Makefile
+@@ -33,7 +33,7 @@
+ SHELL=/bin/sh
+
+ CURSES=yes
+-CCx=gcc
++CCx=$(CC)
+ COPTIONS=-I/usr/include/ncurses -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -O2
+ COPTIONSld=
+ SYSLIBS=-lgcc
+@@ -43,8 +43,8 @@ MAKE=make
+ INCLUDEcdf= ../include
+
+ CC=$(CCx)
+-CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
+-CFLAGSld=$(COPTIONSld)
++CFLAGS+=$(COPTIONS) -I$(INCLUDEcdf)
++CFLAGSld=$(COPTIONSld) $(LDFLAGS)
+
+ WHICHOS=$(shell uname -a | cut -f1 -d" ")
+ ifeq ("$(WHICHOS)","Darwin")
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-29 15:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-18 18:57 [gentoo-commits] repo/gentoo:master commit in: sci-libs/cdf/, sci-libs/cdf/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-05-29 15:52 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox