From ebac931cc23ca55abe982e67b9a4f06f748d0bef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Jul 2023 22:35:23 +0100 Subject: gentoo auto-resync : 27:07:2023 - 22:35:23 --- sci-libs/Manifest.gz | Bin 44819 -> 44814 bytes sci-libs/armadillo/Manifest | 4 - sci-libs/armadillo/armadillo-10.8.2.ebuild | 150 -------------------- sci-libs/armadillo/armadillo-12.0.1.ebuild | 156 --------------------- sci-libs/netcdf/Manifest | 6 +- .../files/netcdf-4.8.1-big-endian-build.patch | 24 ---- sci-libs/netcdf/metadata.xml | 1 - sci-libs/netcdf/netcdf-4.8.1-r1.ebuild | 76 ---------- sci-libs/netcdf/netcdf-4.8.1-r2.ebuild | 83 ----------- 9 files changed, 1 insertion(+), 499 deletions(-) delete mode 100644 sci-libs/armadillo/armadillo-10.8.2.ebuild delete mode 100644 sci-libs/armadillo/armadillo-12.0.1.ebuild delete mode 100644 sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch delete mode 100644 sci-libs/netcdf/netcdf-4.8.1-r1.ebuild delete mode 100644 sci-libs/netcdf/netcdf-4.8.1-r2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index a2a1c4ae5555..f4f57d27dedd 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index a3c1a19178ce..4123795dcaa4 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,13 +1,9 @@ AUX armadillo-11.4.0-extratests.patch 720 BLAKE2B 0024513a1ffa752d4cd32de926f1702aaf35f32ffebad8d1b859cab96819dd57075f0ff36e9917b91d10a408215aa815af5fa14adfa8449656d4a6333d9f7154 SHA512 b13fb2d2bd6b3de2c7d0ab423f1569302bcaa8fecc52a7f999068d445842f81ff9da846c9008c5abebe3613ccdc791e201eec0bfc931ce82664213bd06371241 AUX armadillo-12.0.1-extratests.patch 743 BLAKE2B bd8bf0a2fd9ec52875804b92a86f2fe8a24e92008208071cd65bd78eb6fe92aac7add687be9455f276f8fd84f50208e2b6846f8c40cd521dd18e623284af94dd SHA512 de804fc620454ba41b859b4cc90583f25e82670f4f9c49dab27ac803529e024293e6254824eadafeb0b9c13a90696b9717aea338a672101c123e1f88493da113 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd -DIST armadillo-10.8.2.tar.xz 6262832 BLAKE2B f8a5a66464614661bcccffb8138434d117ad07dcea5f89ddde45df293df5dd4f10def2085b85d37386337fd8bd0152914a957e0b1b7919a47ec8b1a79e92b90b SHA512 720fadad491dfeeb894544b0305cd64a0e0402e66fc788949ecd54c0b1a3b9c3ede9f75b081f832931d59d2bd59529cebb9d5b57b8582df869765cac01c2979b DIST armadillo-11.4.0.tar.xz 6804388 BLAKE2B cb44d248cf817f66cc0b6aa968535e266282775b20035f46f3158687100c0f49c6cf4fad8d1f2ec1741f9bceb06c5a841f20f3b7e59146f2fe57c86d00741434 SHA512 21d58b383229f55bf6a3b217c04901982b484b6d806dd3c4a72ebe5a9614f63f9429ca31ea7cfc26672b70e01a0b9263a9d4edf69a0080706ade87852f94970c -DIST armadillo-12.0.1.tar.xz 6802568 BLAKE2B c6025fe3bcabfa6d08efd864c4b9b129c84e8941b7cb237b76ed83f74062c06cdbb98bdf09796f3340fbdbb37a36f82826a53e778dbc589af9e868a2348bd7f3 SHA512 b1b9fbce6bdacc3340ab190605aba77e821629e0a51e0c6277840eaf803d037a778b9243c02c5b55d67976c203808a5fc34894f3928b707685f6d8695ef0bc0d DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195 EBUILD armadillo-10.2.0-r1.ebuild 3486 BLAKE2B 1e0881133134ee033ee0a853687d57faa8dfd4ad487f73253d6f1565e9756fc4ab0c08036d7c973c499a76762413e05cd782e051fad11608b75012940d86947e SHA512 56f72e40cf88c609f40b68e2ba51b29c669f7a81844348b5fa664c985e115874c8fff4949c1345f876bbe49a83225a0ffd8f56428a74971a6e2c804f26ddea95 -EBUILD armadillo-10.8.2.ebuild 3498 BLAKE2B 592ca8f284e12eb260363a66d2b5ed5e5cfeca6545a4235c08a7e77393c47cbc803e98123d1d80a57e3db789e4d023923ab9a02e9a3f822f77e7d5a73fd260ec SHA512 66870c2c6e892f89edc5c07ba7d2d9a04698948a057e58f14f50d641b04b98922c63c16a569b24f22cce8324a790d1a1876a033edb51a9a20d05e5c948aed3ce EBUILD armadillo-11.4.0.ebuild 3582 BLAKE2B 64863be8a2e2d291db4bad9721946f75797a7aaa3d5ee51b586b92c567c523355f5657cf4bfdf96a636a15a95036fb84905c0aac2c90756ea9d8ec1ed25aef50 SHA512 e741698e48fc3c7ca97a38fe072fa5d1736122afcff8b6f574fceb0491b25e10030b649061278918593c0be7e7396294c128222886d5d35f24cffb14b374204e -EBUILD armadillo-12.0.1.ebuild 3583 BLAKE2B 4ebac0def757818a94be154546afd2987e78cfaa7fc1b016c74a52dd23323a3c49e1fd6b8f2afa0d8304f5c7164f8f434ee054ba69863412de076d87a0d433d4 SHA512 8fc47ab9a6aec9a504c5d512f102c915995c58daa192fbbef50b514ddde4660bc1a820277d598f7f996cf9e271928ff684f2dbbb4dc8a62953d8ff3f0a36c0c9 EBUILD armadillo-12.4.0.ebuild 3355 BLAKE2B 82f0f66a16ff9132876da8d40b0c875f222dc466571b8022941aa8ef39f21caa90abbaa54dc04add765867594dfe20089d9749ebdfe5579b69ff2fabda5a30df SHA512 965bf00799c20307cf64142571b246d02481fa5b9c909f156dccd266a5717818569b72eba61a325ae402412f7b700ff7b0df18eff66c7a1e833d11f1f4a51c80 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0 diff --git a/sci-libs/armadillo/armadillo-10.8.2.ebuild b/sci-libs/armadillo/armadillo-10.8.2.ebuild deleted file mode 100644 index 5f6bd3b57605..000000000000 --- a/sci-libs/armadillo/armadillo-10.8.2.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake toolchain-funcs multilib - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="https://arma.sourceforge.net" -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0/10" -KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( lapack )" - -# atlas? ( sci-libs/atlas[lapack] ) - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - superlu? ( >=sci-libs/superlu-5.2 ) -" - -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5:= ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5:= ) - mkl? ( sci-libs/mkl ) -" - -src_prepare() { - # avoid the automagic cmake macros... - sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die - - # ... except for mkl, since without a license it's hard to figure out what to do there - if use mkl; then - sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - ) - if use arpack; then - mycmakeargs+=( - -DARPACK_FOUND=ON - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" - ) - else - mycmakeargs+=( - -DARPACK_FOUND=OFF - ) - fi -# if use atlas; then -# local c=atlas-cblas l=atlas-clapack -# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads -# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads -# mycmakeargs+=( -# -DCBLAS_FOUND=ON -# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" -# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" -# -DCLAPACK_FOUND=ON -# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" -# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" -# ) -# fi - if use blas; then - mycmakeargs+=( - -DBLAS_FOUND=ON - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" - ) - else - mycmakeargs+=( - -DBLAS_FOUND=OFF - ) - fi - if use hdf5; then - mycmakeargs+=( - -DDETECT_HDF5=ON - -DHDF5_LIBRARIES="-lhdf5" - -DHDF5_INCLUDE_DIRS=/usr/include - ) - else - mycmakeargs+=( - -DDETECT_HDF5=OFF - ) - fi - if use lapack; then - mycmakeargs+=( - -DLAPACK_FOUND=ON - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - else - mycmakeargs+=( - -DLAPACK_FOUND=OFF - ) - fi - if use superlu; then - mycmakeargs+=( - -DSuperLU_FOUND=ON - -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" - ) - else - mycmakeargs+=( - -DSuperLU_FOUND=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - pushd examples > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die - emake clean - popd > /dev/null -} - -src_install() { - cmake_src_install - - dodoc README.md - use doc && dodoc *pdf *html - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sci-libs/armadillo/armadillo-12.0.1.ebuild b/sci-libs/armadillo/armadillo-12.0.1.ebuild deleted file mode 100644 index a1399cb8445a..000000000000 --- a/sci-libs/armadillo/armadillo-12.0.1.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake toolchain-funcs multilib - -DESCRIPTION="Streamlined C++ linear algebra library" -HOMEPAGE="https://arma.sourceforge.net" -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0/12" -KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( arpack lapack superlu )" - -# atlas? ( sci-libs/atlas[lapack] ) - -RDEPEND=" - dev-libs/boost - arpack? ( sci-libs/arpack ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - superlu? ( >=sci-libs/superlu-5.2 ) -" - -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5:= ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5:= ) - mkl? ( sci-libs/mkl ) -" - -PATCHES=( - "${FILESDIR}/${P}-extratests.patch" -) - -src_prepare() { - # avoid the automagic cmake macros... - sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die - - # ... except for mkl, since without a license it's hard to figure out what to do there - if use mkl; then - sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - ) - if use arpack; then - mycmakeargs+=( - -DARPACK_FOUND=ON - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" - ) - else - mycmakeargs+=( - -DARPACK_FOUND=OFF - ) - fi -# if use atlas; then -# local c=atlas-cblas l=atlas-clapack -# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads -# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads -# mycmakeargs+=( -# -DCBLAS_FOUND=ON -# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" -# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" -# -DCLAPACK_FOUND=ON -# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" -# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" -# ) -# fi - if use blas; then - mycmakeargs+=( - -DBLAS_FOUND=ON - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" - ) - else - mycmakeargs+=( - -DBLAS_FOUND=OFF - ) - fi - if use hdf5; then - mycmakeargs+=( - -DDETECT_HDF5=ON - -DHDF5_LIBRARIES="-lhdf5" - -DHDF5_INCLUDE_DIRS=/usr/include - ) - else - mycmakeargs+=( - -DDETECT_HDF5=OFF - ) - fi - if use lapack; then - mycmakeargs+=( - -DLAPACK_FOUND=ON - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - else - mycmakeargs+=( - -DLAPACK_FOUND=OFF - ) - fi - if use superlu; then - mycmakeargs+=( - -DSuperLU_FOUND=ON - -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" - ) - else - mycmakeargs+=( - -DSuperLU_FOUND=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - cmake_src_test || die - - pushd tests2 > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXX_FLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./main || die - emake clean - popd > /dev/null -} - -src_install() { - cmake_src_install - - dodoc README.md - use doc && dodoc *pdf *html - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest index c53f923d8d54..4dbfca6f78ce 100644 --- a/sci-libs/netcdf/Manifest +++ b/sci-libs/netcdf/Manifest @@ -1,8 +1,4 @@ AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee -AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e -DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42 DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d -EBUILD netcdf-4.8.1-r1.ebuild 1812 BLAKE2B a7237f15cae06791b447a84e6c30d24594df1b73ed035c94e2d8ca7cd60c2757688da0253fc007ea20b4f0aa47c03d8c1a40e00857fa2c32cd524f6222ba0980 SHA512 8616293c70ae60bfd64cda75459fc9f6ff6b09aece9ff06c0bf6113e44e683c0d85d9b3d40ed49ca5fea8eec718be36430798e57cccbaa6e68067e0697ad61aa -EBUILD netcdf-4.8.1-r2.ebuild 2005 BLAKE2B 27ddd0dfc01e7ba32d889efb9085c9b16f4cdd076e860c2734ad78397d562c3eb2e1a231449983b5817968efe211ced789f0624d621d257c565ca362a02b1a3d SHA512 3672c96fca8d1d60f1757192d4d39cb0d0a5f57fe8e102de1a4bfc16449c478ae9c7fb2aeb42b669241c269d9dbd1cdba6712cfbcd52d595cc7bbdf733b0eedd EBUILD netcdf-4.9.2.ebuild 1653 BLAKE2B 655ad723ceafa31b0fef856fe1f697cbbde9d677bc6be38a12629f94fbdf6eadedfb3f7703db7cd7398b27d500707d43f5777216620d64b87866b322d6685866 SHA512 016c81f6780b93a7622950699ce3a7f5a5e93f0411e65cdac83a6a25cc0b8232e7eb354fdc99c79c18828a3f7d146c4c215c4ffa4c227e19d20ade87361cf266 -MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b +MISC metadata.xml 990 BLAKE2B 17406dcf87f633cd22c32a239799a5e3bb2e89d3d7669cc1d066c137ea06a3bc2f07478d434ad0776a6843339f181623dd2e9a8cbf9d24d325e4d9d7ec66fe6f SHA512 209a76790a7ad18447cb27d880e0d741763415567ce43c05ee6551544a673a86c9e8d7ed337f08f153681b23827958b1ada462524d0c66279ad1ef55f26310ba diff --git a/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch b/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch deleted file mode 100644 index afeff7e3fbd0..000000000000 --- a/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -Later version for 4.8.1 grabbed from Debian: -https://sources.debian.org/patches/netcdf/1:4.8.1-1/byteswap.patch/ - -Earlier version used: -https://github.com/DennisHeimbigner/netcdf-c/commit/6f86660da86f279cad1f2804cf3242767de27630.patch -https://github.com/Unidata/netcdf-c/issues/1687 -https://bugs.gentoo.org/772863 - -Description: Add forward declarations for byteswap8 & byteswap4. -Author: Dennis Heimbigner -Bug: https://github.com/Unidata/netcdf-c/issues/1687 - ---- a/libdispatch/dfilter.c -+++ b/libdispatch/dfilter.c -@@ -20,6 +20,9 @@ - #include "hdf5internal.h" - #endif - -+static void byteswap8(unsigned char*); -+static void byteswap4(unsigned char*); -+ - /* - Unified filter related code - */ diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml index acecc3ab2966..710afdc8ff08 100644 --- a/sci-libs/netcdf/metadata.xml +++ b/sci-libs/netcdf/metadata.xml @@ -16,7 +16,6 @@ Support for remote data access with the built-in OPeNDAP client Add support for the Hierarchical Data Format v.4 sci-libs/hdf - Build the utilities nccopy, ncgen and ncdump Unidata/netcdf-c diff --git a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild deleted file mode 100644 index 003e1303571f..000000000000 --- a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Scientific library and interface for array oriented data access" -HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" -SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-c-${PV}" - -LICENSE="UCAR-Unidata" -# SONAME of libnetcdf.so -SLOT="0/19" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="+dap doc examples hdf +hdf5 mpi szip test tools" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/libxml2 - dap? ( net-misc/curl:0= ) - hdf? ( - sci-libs/hdf:0= - sci-libs/hdf5:0= - virtual/jpeg - ) - hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -REQUIRED_USE=" - test? ( tools ) - szip? ( hdf5 ) - mpi? ( hdf5 )" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.1-big-endian-build.patch" - "${FILESDIR}/${PN}-4.7.4-big-endian-test.patch" -) - -src_prepare() { - # skip test that requires network - sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - use mpi && export CC=mpicc - - # Temporary workaround for test breakage - # https://github.com/Unidata/netcdf-c/issues/1983 - # bug #827042 - append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DENABLE_DAP_REMOTE_TESTS=OFF - # Enable for >4.8.1 (not yet in a release) - #-DENABLE_LIBXML2=ON - -DBUILD_UTILITIES=$(usex tools) - -DENABLE_DAP=$(usex dap) - -DENABLE_DOXYGEN=$(usex doc) - -DENABLE_EXAMPLES=$(usex examples) - -DENABLE_HDF4=$(usex hdf) - -DENABLE_NETCDF_4=$(usex hdf5) - -DENABLE_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - # fails parallel tests: bug #621486 - cmake_src_test -j1 -} diff --git a/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild deleted file mode 100644 index d4e17743df68..000000000000 --- a/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Scientific library and interface for array oriented data access" -HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" -SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-c-${PV}" - -LICENSE="UCAR-Unidata" -# SONAME of libnetcdf.so -SLOT="0/19" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="+dap doc examples hdf +hdf5 mpi szip test tools" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/libxml2 - dap? ( net-misc/curl:0= ) - hdf? ( - media-libs/libjpeg-turbo:= - sci-libs/hdf:0= - sci-libs/hdf5:0= - ) - hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -REQUIRED_USE=" - test? ( tools ) - szip? ( hdf5 ) - mpi? ( hdf5 )" - -PATCHES=( - "${FILESDIR}/${PN}-4.8.1-big-endian-build.patch" - "${FILESDIR}/${PN}-4.7.4-big-endian-test.patch" -) - -src_prepare() { - # skip test that requires network - sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - use mpi && export CC=mpicc - - # Temporary workaround for test breakage - # https://github.com/Unidata/netcdf-c/issues/1983 - # bug #827042 - append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DENABLE_DAP_REMOTE_TESTS=OFF - # Enable for >4.8.1 (not yet in a release) - #-DENABLE_LIBXML2=ON - -DBUILD_UTILITIES=$(usex tools) - -DENABLE_DAP=$(usex dap) - -DENABLE_DOXYGEN=$(usex doc) - -DENABLE_EXAMPLES=$(usex examples) - -DENABLE_HDF4=$(usex hdf) - -DENABLE_NETCDF_4=$(usex hdf5) - -DENABLE_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - # fails parallel tests: bug #621486 - cmake_src_test -j1 -} - -src_install() { - cmake_src_install - - # bug #827188 - sed -i -e "s:${EPREFIX}/usr/$(get_libdir)/libdl.so;:dl;:" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die -} -- cgit v1.2.3