summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/ViSP/metadata.xml2
-rw-r--r--sci-libs/adolc/Manifest1
-rw-r--r--sci-libs/adolc/adolc-2.7.2.ebuild14
-rw-r--r--sci-libs/adolc/adolc-9999.ebuild17
-rw-r--r--sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch57
-rw-r--r--sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch9
-rw-r--r--sci-libs/adolc/files/adolc-2.6.2-dash.patch146
-rw-r--r--sci-libs/adolc/files/adolc-2.7.2-swig-python-configure.patch391
-rw-r--r--sci-libs/adolc/metadata.xml2
-rw-r--r--sci-libs/alglib/metadata.xml2
-rw-r--r--sci-libs/amd/amd-2.4.6-r1.ebuild2
-rw-r--r--sci-libs/amd/amd-2.4.6.ebuild35
-rw-r--r--sci-libs/amd/metadata.xml2
-rw-r--r--sci-libs/armadillo/Manifest1
-rw-r--r--sci-libs/armadillo/armadillo-10.3.0-r1.ebuild2
-rw-r--r--sci-libs/armadillo/armadillo-10.7.1.ebuild150
-rw-r--r--sci-libs/armadillo/metadata.xml2
-rw-r--r--sci-libs/arpack/metadata.xml2
-rw-r--r--sci-libs/arprec/metadata.xml2
-rw-r--r--sci-libs/atlas/metadata.xml2
-rw-r--r--sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild7
-rw-r--r--sci-libs/avogadrolibs/metadata.xml2
-rw-r--r--sci-libs/beagle/metadata.xml2
-rw-r--r--sci-libs/blis/metadata.xml2
-rw-r--r--sci-libs/bliss/metadata.xml2
-rw-r--r--sci-libs/bmrblib/metadata.xml2
-rw-r--r--sci-libs/branca/Manifest1
-rw-r--r--sci-libs/branca/branca-0.4.2-r1.ebuild35
-rw-r--r--sci-libs/branca/files/branca-0.4.2-setup.patch11
-rw-r--r--sci-libs/branca/files/branca-0.4.2-test.patch14
-rw-r--r--sci-libs/branca/metadata.xml16
-rw-r--r--sci-libs/brial/metadata.xml2
-rw-r--r--sci-libs/btf/metadata.xml2
-rw-r--r--sci-libs/buddy/metadata.xml2
-rw-r--r--sci-libs/camd/camd-2.4.6-r1.ebuild2
-rw-r--r--sci-libs/camd/camd-2.4.6.ebuild31
-rw-r--r--sci-libs/camd/metadata.xml2
-rw-r--r--sci-libs/cantera/metadata.xml2
-rw-r--r--sci-libs/cartopy/Manifest1
-rw-r--r--sci-libs/cartopy/cartopy-0.18.0.ebuild4
-rw-r--r--sci-libs/cartopy/cartopy-0.19.0.ebuild69
-rw-r--r--sci-libs/cartopy/metadata.xml2
-rw-r--r--sci-libs/ccfits/metadata.xml2
-rw-r--r--sci-libs/ccolamd/metadata.xml2
-rw-r--r--sci-libs/cdd+/cdd+-077a.ebuild24
-rw-r--r--sci-libs/cdd+/files/cdd+-077a-gcc-5.patch4
-rw-r--r--sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch71
-rw-r--r--sci-libs/cdd+/files/cdd+-077a-gentoo.patch4
-rw-r--r--sci-libs/cdd+/files/cdd+-077a-headers.patch36
-rw-r--r--sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch8
-rw-r--r--sci-libs/cdd+/metadata.xml23
-rw-r--r--sci-libs/cddlib/metadata.xml2
-rw-r--r--sci-libs/cdf/metadata.xml2
-rw-r--r--sci-libs/ceres-solver/Manifest1
-rw-r--r--sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild104
-rw-r--r--sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch10
-rw-r--r--sci-libs/ceres-solver/metadata.xml2
-rw-r--r--sci-libs/cfitsio/cfitsio-3.490.ebuild7
-rw-r--r--sci-libs/cfitsio/metadata.xml2
-rw-r--r--sci-libs/cgcode/cgcode-1.0-r2.ebuild20
-rw-r--r--sci-libs/cgcode/files/1.0-gentoo.patch6
-rw-r--r--sci-libs/cgcode/metadata.xml2
-rw-r--r--sci-libs/cgnslib/metadata.xml2
-rw-r--r--sci-libs/cholmod/metadata.xml2
-rw-r--r--sci-libs/cifparse-obj/metadata.xml2
-rw-r--r--sci-libs/clapack/metadata.xml2
-rw-r--r--sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild (renamed from sci-libs/clashscore-db/clashscore-db-3.17.ebuild)10
-rw-r--r--sci-libs/clashscore-db/metadata.xml2
-rw-r--r--sci-libs/clblas/metadata.xml2
-rw-r--r--sci-libs/clblast/metadata.xml2
-rw-r--r--sci-libs/cln/cln-1.3.6.ebuild4
-rw-r--r--sci-libs/cln/metadata.xml2
-rw-r--r--sci-libs/cminpack/metadata.xml2
-rw-r--r--sci-libs/cmpfit/metadata.xml2
-rw-r--r--sci-libs/coinhsl/metadata.xml2
-rw-r--r--sci-libs/coinor-alps/metadata.xml2
-rw-r--r--sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild4
-rw-r--r--sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch36
-rw-r--r--sci-libs/coinor-bcp/metadata.xml2
-rw-r--r--sci-libs/coinor-bcps/metadata.xml2
-rw-r--r--sci-libs/coinor-blis/metadata.xml2
-rw-r--r--sci-libs/coinor-bonmin/metadata.xml2
-rw-r--r--sci-libs/coinor-cbc/metadata.xml2
-rw-r--r--sci-libs/coinor-cgl/metadata.xml2
-rw-r--r--sci-libs/coinor-clp/metadata.xml2
-rw-r--r--sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch3
-rw-r--r--sci-libs/coinor-couenne/metadata.xml2
-rw-r--r--sci-libs/coinor-cppad/metadata.xml2
-rw-r--r--sci-libs/coinor-csdp/metadata.xml2
-rw-r--r--sci-libs/coinor-dip/metadata.xml2
-rw-r--r--sci-libs/coinor-dylp/metadata.xml2
-rw-r--r--sci-libs/coinor-flopcpp/metadata.xml2
-rw-r--r--sci-libs/coinor-mp/metadata.xml2
-rw-r--r--sci-libs/coinor-netlib/metadata.xml2
-rw-r--r--sci-libs/coinor-os/coinor-os-2.10.1.ebuild14
-rw-r--r--sci-libs/coinor-os/metadata.xml2
-rw-r--r--sci-libs/coinor-osi/metadata.xml2
-rw-r--r--sci-libs/coinor-sample/metadata.xml2
-rw-r--r--sci-libs/coinor-smi/metadata.xml2
-rw-r--r--sci-libs/coinor-symphony/metadata.xml2
-rw-r--r--sci-libs/coinor-utils/metadata.xml2
-rw-r--r--sci-libs/coinor-vol/metadata.xml2
-rw-r--r--sci-libs/colamd/metadata.xml2
-rw-r--r--sci-libs/colpack/colpack-1.0.10.ebuild2
-rw-r--r--sci-libs/colpack/metadata.xml2
-rw-r--r--sci-libs/cqrlib/metadata.xml2
-rw-r--r--sci-libs/cxsparse/cxsparse-3.2.0.ebuild2
-rw-r--r--sci-libs/cxsparse/metadata.xml2
-rw-r--r--sci-libs/dcmtk/metadata.xml2
-rw-r--r--sci-libs/dealii/Manifest2
-rw-r--r--sci-libs/dealii/dealii-9.2.0-r1.ebuild160
-rw-r--r--sci-libs/dealii/dealii-9.3.0-r1.ebuild4
-rw-r--r--sci-libs/dealii/dealii-9.3.1.ebuild4
-rw-r--r--sci-libs/dealii/dealii-9999.ebuild4
-rw-r--r--sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch25
-rw-r--r--sci-libs/dealii/metadata.xml4
-rw-r--r--sci-libs/djbfft/djbfft-0.76-r3.ebuild (renamed from sci-libs/djbfft/djbfft-0.76-r2.ebuild)33
-rw-r--r--sci-libs/djbfft/files/djbfft-0.76-headers.patch20
-rw-r--r--sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch22
-rw-r--r--sci-libs/djbfft/metadata.xml2
-rw-r--r--sci-libs/dlib/metadata.xml2
-rw-r--r--sci-libs/dmlc-core/metadata.xml2
-rw-r--r--sci-libs/dsdp/metadata.xml2
-rw-r--r--sci-libs/eccodes/metadata.xml2
-rw-r--r--sci-libs/exodusii/metadata.xml2
-rw-r--r--sci-libs/fcl/metadata.xml2
-rw-r--r--sci-libs/fetk/fetk-1.5.ebuild11
-rw-r--r--sci-libs/fetk/metadata.xml2
-rw-r--r--sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild (renamed from sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild)11
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch70
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch31
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch39
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch37
-rw-r--r--sci-libs/fflas-ffpack/metadata.xml2
-rw-r--r--sci-libs/fftw/Manifest1
-rw-r--r--sci-libs/fftw/fftw-3.3.10.ebuild163
-rw-r--r--sci-libs/fftw/fftw-3.3.9.ebuild4
-rw-r--r--sci-libs/fftw/fftw-9999.ebuild31
-rw-r--r--sci-libs/fftw/metadata.xml2
-rw-r--r--sci-libs/flann/metadata.xml2
-rw-r--r--sci-libs/fplll/Manifest1
-rw-r--r--sci-libs/fplll/fplll-5.3.2.ebuild29
-rw-r--r--sci-libs/fplll/fplll-5.4.0.ebuild2
-rw-r--r--sci-libs/fplll/metadata.xml2
-rw-r--r--sci-libs/galib/metadata.xml2
-rw-r--r--sci-libs/gamer/metadata.xml2
-rw-r--r--sci-libs/gaul-devel/metadata.xml2
-rw-r--r--sci-libs/gdal/Manifest1
-rw-r--r--sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch32
-rw-r--r--sci-libs/gdal/gdal-3.3.1.ebuild4
-rw-r--r--sci-libs/gdal/gdal-3.3.2-r1.ebuild315
-rw-r--r--sci-libs/gdal/metadata.xml3
-rw-r--r--sci-libs/geos/Manifest1
-rw-r--r--sci-libs/geos/geos-3.10.0.ebuild43
-rw-r--r--sci-libs/geos/geos-3.9.1.ebuild2
-rw-r--r--sci-libs/geos/metadata.xml2
-rw-r--r--sci-libs/gerris/metadata.xml2
-rw-r--r--sci-libs/getdata/metadata.xml2
-rw-r--r--sci-libs/ginkgo/Manifest2
-rw-r--r--sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch14
-rw-r--r--sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild59
-rw-r--r--sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild (renamed from sci-libs/ginkgo/ginkgo-9999.ebuild)20
-rw-r--r--sci-libs/ginkgo/metadata.xml2
-rw-r--r--sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch36
-rw-r--r--sci-libs/givaro/givaro-4.1.1-r2.ebuild56
-rw-r--r--sci-libs/givaro/metadata.xml2
-rw-r--r--sci-libs/gmsh/Manifest1
-rw-r--r--sci-libs/gmsh/gmsh-4.6.0.ebuild76
-rw-r--r--sci-libs/gmsh/metadata.xml2
-rw-r--r--sci-libs/gsl/Manifest4
-rw-r--r--sci-libs/gsl/files/cblas.pc.in12
-rw-r--r--sci-libs/gsl/files/eselect.cblas.gsl5
-rw-r--r--sci-libs/gsl/gsl-1.16.ebuild108
-rw-r--r--sci-libs/gsl/gsl-2.5-r1.ebuild59
-rw-r--r--sci-libs/gsl/gsl-2.7.ebuild2
-rw-r--r--sci-libs/gsl/metadata.xml2
-rw-r--r--sci-libs/gts/gts-20121130.ebuild2
-rw-r--r--sci-libs/gts/metadata.xml2
-rw-r--r--sci-libs/h5hut/h5hut-1.99.13-r1.ebuild (renamed from sci-libs/h5hut/h5hut-1.99.13.ebuild)6
-rw-r--r--sci-libs/h5hut/metadata.xml2
-rw-r--r--sci-libs/h5part/metadata.xml2
-rw-r--r--sci-libs/hdf/hdf-4.2.15.ebuild2
-rw-r--r--sci-libs/hdf/metadata.xml2
-rw-r--r--sci-libs/hdf5/Manifest1
-rw-r--r--sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch103
-rw-r--r--sci-libs/hdf5/hdf5-1.10.5-r1.ebuild2
-rw-r--r--sci-libs/hdf5/hdf5-1.12.1-r1.ebuild127
-rw-r--r--sci-libs/hdf5/hdf5-1.12.1.ebuild118
-rw-r--r--sci-libs/hdf5/metadata.xml13
-rw-r--r--sci-libs/hipCUB/metadata.xml2
-rw-r--r--sci-libs/hipSPARSE/metadata.xml2
-rw-r--r--sci-libs/htslib/Manifest2
-rw-r--r--sci-libs/htslib/htslib-1.13.ebuild (renamed from sci-libs/htslib/htslib-1.10.2.ebuild)9
-rw-r--r--sci-libs/htslib/metadata.xml2
-rw-r--r--sci-libs/hypre/metadata.xml2
-rw-r--r--sci-libs/idlcoyote/metadata.xml2
-rw-r--r--sci-libs/idlmarkwardt/metadata.xml2
-rw-r--r--sci-libs/ignition-common/Manifest2
-rw-r--r--sci-libs/ignition-common/ignition-common-3.11.1.ebuild (renamed from sci-libs/ignition-common/ignition-common-3.5.0.ebuild)15
-rw-r--r--sci-libs/ignition-common/metadata.xml2
-rw-r--r--sci-libs/ignition-fuel-tools/Manifest2
-rw-r--r--sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild (renamed from sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild)8
-rw-r--r--sci-libs/ignition-fuel-tools/metadata.xml2
-rw-r--r--sci-libs/ignition-math/Manifest2
-rw-r--r--sci-libs/ignition-math/ignition-math-6.8.0.ebuild (renamed from sci-libs/ignition-math/ignition-math-6.5.0.ebuild)4
-rw-r--r--sci-libs/ignition-math/metadata.xml2
-rw-r--r--sci-libs/iml/metadata.xml2
-rw-r--r--sci-libs/inchi/metadata.xml2
-rw-r--r--sci-libs/indilib/Manifest4
-rw-r--r--sci-libs/indilib/indilib-1.8.8.ebuild56
-rw-r--r--sci-libs/indilib/indilib-1.9.0.ebuild56
-rw-r--r--sci-libs/indilib/indilib-1.9.1-r1.ebuild2
-rw-r--r--sci-libs/indilib/indilib-1.9.2.ebuild (renamed from sci-libs/indilib/indilib-1.8.9.ebuild)17
-rw-r--r--sci-libs/indilib/metadata.xml2
-rw-r--r--sci-libs/io_lib/Manifest1
-rw-r--r--sci-libs/io_lib/io_lib-1.14.14.ebuild37
-rw-r--r--sci-libs/io_lib/metadata.xml2
-rw-r--r--sci-libs/ipopt/metadata.xml2
-rw-r--r--sci-libs/itpp/metadata.xml2
-rw-r--r--sci-libs/jama/metadata.xml2
-rw-r--r--sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild4
-rw-r--r--sci-libs/keras-applications/metadata.xml2
-rw-r--r--sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild2
-rw-r--r--sci-libs/keras-preprocessing/metadata.xml2
-rw-r--r--sci-libs/kim-api/metadata.xml2
-rw-r--r--sci-libs/kissfft/metadata.xml2
-rw-r--r--sci-libs/klu/klu-1.3.9-r2.ebuild2
-rw-r--r--sci-libs/klu/klu-1.3.9.ebuild27
-rw-r--r--sci-libs/klu/metadata.xml2
-rw-r--r--sci-libs/lapack/metadata.xml2
-rw-r--r--sci-libs/ldl/metadata.xml2
-rw-r--r--sci-libs/lemon/metadata.xml2
-rw-r--r--sci-libs/levmar/metadata.xml2
-rw-r--r--sci-libs/libaec/metadata.xml2
-rw-r--r--sci-libs/libbraiding/metadata.xml2
-rw-r--r--sci-libs/libbufr/metadata.xml2
-rw-r--r--sci-libs/libccd/metadata.xml2
-rw-r--r--sci-libs/libcerf/Manifest1
-rw-r--r--sci-libs/libcerf/libcerf-1.17.ebuild16
-rw-r--r--sci-libs/libcerf/libcerf-1.5.ebuild2
-rw-r--r--sci-libs/libcerf/metadata.xml2
-rw-r--r--sci-libs/libcifpp/Manifest6
-rw-r--r--sci-libs/libcifpp/libcifpp-1.1.1.ebuild37
-rw-r--r--sci-libs/libcifpp/libcifpp-2.0.0.ebuild37
-rw-r--r--sci-libs/libcifpp/libcifpp-2.0.3.ebuild35
-rw-r--r--sci-libs/libcifpp/metadata.xml7
-rw-r--r--sci-libs/libcmatrix/metadata.xml2
-rw-r--r--sci-libs/libdap/metadata.xml2
-rw-r--r--sci-libs/libecpint/metadata.xml2
-rw-r--r--sci-libs/libexcelformat/metadata.xml2
-rw-r--r--sci-libs/libgenome/metadata.xml2
-rw-r--r--sci-libs/libgeodecomp/metadata.xml2
-rw-r--r--sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild2
-rw-r--r--sci-libs/libgeotiff/metadata.xml2
-rw-r--r--sci-libs/libghemical/metadata.xml2
-rw-r--r--sci-libs/libh2o/metadata.xml2
-rw-r--r--sci-libs/libh2oxx/metadata.xml2
-rw-r--r--sci-libs/libhomfly/metadata.xml2
-rw-r--r--sci-libs/libigl/metadata.xml2
-rw-r--r--sci-libs/libint/libint-2.6.0-r3.ebuild63
-rw-r--r--sci-libs/libint/libint-2.6.0-r5.ebuild2
-rw-r--r--sci-libs/libint/metadata.xml2
-rw-r--r--sci-libs/libmems/metadata.xml2
-rw-r--r--sci-libs/libmuscle/metadata.xml2
-rw-r--r--sci-libs/libnova/metadata.xml2
-rw-r--r--sci-libs/liborigin/Manifest1
-rw-r--r--sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch166
-rw-r--r--sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch38
-rw-r--r--sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch89
-rw-r--r--sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch210
-rw-r--r--sci-libs/liborigin/liborigin-3.0.0.ebuild55
-rw-r--r--sci-libs/liborigin/metadata.xml2
-rw-r--r--sci-libs/libpdb++/metadata.xml2
-rw-r--r--sci-libs/libpdb/metadata.xml2
-rw-r--r--sci-libs/libqalculate/Manifest4
-rw-r--r--sci-libs/libqalculate/libqalculate-3.17.0.ebuild65
-rw-r--r--sci-libs/libqalculate/libqalculate-3.18.0.ebuild65
-rw-r--r--sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild2
-rw-r--r--sci-libs/libqalculate/libqalculate-3.21.0.ebuild (renamed from sci-libs/libqalculate/libqalculate-3.19.0.ebuild)10
-rw-r--r--sci-libs/libqalculate/metadata.xml2
-rw-r--r--sci-libs/libsc/Manifest1
-rw-r--r--sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch51
-rw-r--r--sci-libs/libsc/libsc-2.2-r100.ebuild100
-rw-r--r--sci-libs/libsc/libsc-2.3.1-r1.ebuild (renamed from sci-libs/libsc/libsc-2.3.1.ebuild)37
-rw-r--r--sci-libs/libsc/libsc-9999.ebuild37
-rw-r--r--sci-libs/libsc/metadata.xml2
-rw-r--r--sci-libs/libsigrok/metadata.xml2
-rw-r--r--sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild (renamed from sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild)20
-rw-r--r--sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild18
-rw-r--r--sci-libs/libsigrokdecode/metadata.xml2
-rw-r--r--sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild2
-rw-r--r--sci-libs/libspatialindex/metadata.xml2
-rw-r--r--sci-libs/libsvm/Manifest1
-rw-r--r--sci-libs/libsvm/libsvm-3.24.ebuild118
-rw-r--r--sci-libs/libsvm/metadata.xml2
-rw-r--r--sci-libs/libticables2/metadata.xml2
-rw-r--r--sci-libs/libticalcs2/metadata.xml2
-rw-r--r--sci-libs/libticonv/metadata.xml2
-rw-r--r--sci-libs/libtifiles2/metadata.xml2
-rw-r--r--sci-libs/libxc/Manifest1
-rw-r--r--sci-libs/libxc/libxc-5.1.4.ebuild2
-rw-r--r--sci-libs/libxc/libxc-5.1.6.ebuild40
-rw-r--r--sci-libs/libxc/metadata.xml2
-rw-r--r--sci-libs/linbox/metadata.xml2
-rw-r--r--sci-libs/linux-gpib-modules/metadata.xml2
-rw-r--r--sci-libs/linux-gpib/metadata.xml2
-rw-r--r--sci-libs/lis/metadata.xml2
-rw-r--r--sci-libs/lmfit/Manifest1
-rw-r--r--sci-libs/lmfit/files/lmfit-9.0-cmake.patch50
-rw-r--r--sci-libs/lmfit/lmfit-9.0-r1.ebuild20
-rw-r--r--sci-libs/lmfit/metadata.xml2
-rw-r--r--sci-libs/lrslib/Manifest1
-rw-r--r--sci-libs/lrslib/files/lrslib-071b-makefile-cflags.patch100
-rw-r--r--sci-libs/lrslib/files/lrslib-071b-makefile-ldflags.patch184
-rw-r--r--sci-libs/lrslib/lrslib-071b-r1.ebuild61
-rw-r--r--sci-libs/lrslib/lrslib-071b.ebuild58
-rw-r--r--sci-libs/lrslib/metadata.xml2
-rw-r--r--sci-libs/m4ri/metadata.xml2
-rw-r--r--sci-libs/m4rie/metadata.xml2
-rw-r--r--sci-libs/mathgl/metadata.xml2
-rw-r--r--sci-libs/matio/metadata.xml2
-rw-r--r--sci-libs/mc/metadata.xml2
-rw-r--r--sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch117
-rw-r--r--sci-libs/med/med-4.1.0.ebuild6
-rw-r--r--sci-libs/med/metadata.xml2
-rw-r--r--sci-libs/metadata.xml2
-rw-r--r--sci-libs/metis/files/metis-5.1.0-datatype.patch12
-rw-r--r--sci-libs/metis/metadata.xml2
-rw-r--r--sci-libs/metis/metis-5.1.0-r4.ebuild64
-rw-r--r--sci-libs/metis/metis-5.1.0-r5.ebuild2
-rw-r--r--sci-libs/minuit/metadata.xml2
-rw-r--r--sci-libs/mkl/metadata.xml2
-rw-r--r--sci-libs/mpfi/metadata.xml2
-rw-r--r--sci-libs/mpir/metadata.xml2
-rw-r--r--sci-libs/mumps/metadata.xml2
-rw-r--r--sci-libs/mumps/mumps-5.3.5-r1.ebuild (renamed from sci-libs/mumps/mumps-5.3.5.ebuild)4
-rw-r--r--sci-libs/nanoflann/metadata.xml2
-rw-r--r--sci-libs/neartree/metadata.xml2
-rw-r--r--sci-libs/nemesis/metadata.xml2
-rw-r--r--sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch42
-rw-r--r--sci-libs/netcdf-cxx/metadata.xml2
-rw-r--r--sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild6
-rw-r--r--sci-libs/netcdf-fortran/metadata.xml2
-rw-r--r--sci-libs/netcdf/metadata.xml2
-rw-r--r--sci-libs/netcdf/netcdf-4.7.4.ebuild2
-rw-r--r--sci-libs/nfft/metadata.xml2
-rw-r--r--sci-libs/nlopt/metadata.xml2
-rw-r--r--sci-libs/nlopt/nlopt-2.6.2-r1.ebuild4
-rw-r--r--sci-libs/numkit/metadata.xml2
-rw-r--r--sci-libs/o2scl/metadata.xml2
-rw-r--r--sci-libs/oc/metadata.xml2
-rw-r--r--sci-libs/oce/metadata.xml2
-rw-r--r--sci-libs/octomap/metadata.xml2
-rw-r--r--sci-libs/ogdi/metadata.xml2
-rw-r--r--sci-libs/ogdi/ogdi-4.1.0.ebuild4
-rw-r--r--sci-libs/openblas/Manifest5
-rw-r--r--sci-libs/openblas/metadata.xml2
-rw-r--r--sci-libs/openblas/openblas-0.3.12-r1.ebuild198
-rw-r--r--sci-libs/openblas/openblas-0.3.14.ebuild198
-rw-r--r--sci-libs/openblas/openblas-0.3.15.ebuild198
-rw-r--r--sci-libs/openblas/openblas-0.3.17.ebuild2
-rw-r--r--sci-libs/openblas/openblas-0.3.18.ebuild (renamed from sci-libs/openblas/openblas-0.3.13.ebuild)1
-rw-r--r--sci-libs/opencascade/Manifest1
-rw-r--r--sci-libs/opencascade/metadata.xml2
-rw-r--r--sci-libs/opencascade/opencascade-7.5.3.ebuild171
-rw-r--r--sci-libs/openlibm/Manifest1
-rw-r--r--sci-libs/openlibm/metadata.xml2
-rw-r--r--sci-libs/openlibm/openlibm-0.8.0.ebuild33
-rw-r--r--sci-libs/orocos-bfl/metadata.xml2
-rw-r--r--sci-libs/orocos_kdl/Manifest2
-rw-r--r--sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch22
-rw-r--r--sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch27
-rw-r--r--sci-libs/orocos_kdl/metadata.xml2
-rw-r--r--sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild (renamed from sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild)13
-rw-r--r--sci-libs/orocos_kdl/orocos_kdl-9999.ebuild12
-rw-r--r--sci-libs/p4est/Manifest2
-rw-r--r--sci-libs/p4est/metadata.xml2
-rw-r--r--sci-libs/p4est/p4est-2.2-r100.ebuild120
-rw-r--r--sci-libs/p4est/p4est-2.3.1-r1.ebuild (renamed from sci-libs/p4est/p4est-2.3.1.ebuild)34
-rw-r--r--sci-libs/p4est/p4est-9999.ebuild40
-rw-r--r--sci-libs/parmetis/metadata.xml2
-rw-r--r--sci-libs/pastix/Manifest1
-rw-r--r--sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch47
-rw-r--r--sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch15
-rw-r--r--sci-libs/pastix/metadata.xml2
-rw-r--r--sci-libs/pastix/pastix-5.2.2.22-r1.ebuild127
-rw-r--r--sci-libs/pastix/pastix-5.2.3.ebuild2
-rw-r--r--sci-libs/pastix/pastix-6.0.3.ebuild2
-rw-r--r--sci-libs/pcl/Manifest2
-rw-r--r--sci-libs/pcl/metadata.xml2
-rw-r--r--sci-libs/pcl/pcl-1.12.0.ebuild (renamed from sci-libs/pcl/pcl-1.11.1-r1.ebuild)6
-rw-r--r--sci-libs/pcl/pcl-9999.ebuild6
-rw-r--r--sci-libs/pgplot/metadata.xml2
-rw-r--r--sci-libs/plplot/metadata.xml2
-rw-r--r--sci-libs/primegen/metadata.xml2
-rw-r--r--sci-libs/profnet/metadata.xml2
-rw-r--r--sci-libs/profnet/profnet-1.0.22.ebuild14
-rw-r--r--sci-libs/profphd-utils/metadata.xml2
-rw-r--r--sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild10
-rw-r--r--sci-libs/proj/Manifest2
-rw-r--r--sci-libs/proj/metadata.xml2
-rw-r--r--sci-libs/proj/proj-7.2.1.ebuild2
-rw-r--r--sci-libs/proj/proj-8.1.0-r1.ebuild2
-rw-r--r--sci-libs/proj/proj-8.1.1.ebuild61
-rw-r--r--sci-libs/punc/metadata.xml2
-rw-r--r--sci-libs/pyshp/metadata.xml2
-rw-r--r--sci-libs/qd/Manifest2
-rw-r--r--sci-libs/qd/files/qd-2.3.22-fix-build-system.patch177
-rw-r--r--sci-libs/qd/metadata.xml2
-rw-r--r--sci-libs/qd/qd-2.3.23.ebuild (renamed from sci-libs/qd/qd-2.3.22.ebuild)24
-rw-r--r--sci-libs/qfits/metadata.xml2
-rw-r--r--sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch29
-rw-r--r--sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch4
-rw-r--r--sci-libs/qrupdate/metadata.xml2
-rw-r--r--sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild50
-rw-r--r--sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild50
-rw-r--r--sci-libs/rocBLAS/Manifest2
-rw-r--r--sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch96
-rw-r--r--sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch23
-rw-r--r--sci-libs/rocBLAS/files/rocBLAS-4.3.0-change-default-Tensile-library-dir.patch39
-rw-r--r--sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch25
-rw-r--r--sci-libs/rocBLAS/files/rocBLAS-4.3.0-link-system-blas.patch24
-rw-r--r--sci-libs/rocBLAS/metadata.xml19
-rw-r--r--sci-libs/rocBLAS/rocBLAS-4.3.0.ebuild139
-rw-r--r--sci-libs/rocFFT/metadata.xml2
-rw-r--r--sci-libs/rocPRIM/Manifest1
-rw-r--r--sci-libs/rocPRIM/metadata.xml5
-rw-r--r--sci-libs/rocPRIM/rocPRIM-4.3.0.ebuild77
-rw-r--r--sci-libs/rocRAND/Manifest1
-rw-r--r--sci-libs/rocRAND/metadata.xml5
-rw-r--r--sci-libs/rocRAND/rocRAND-4.3.0.ebuild72
-rw-r--r--sci-libs/rocSPARSE/Manifest25
-rw-r--r--sci-libs/rocSPARSE/files/rocSPARSE-4.3.0-remove-matrices-unpacking.patch36
-rw-r--r--sci-libs/rocSPARSE/metadata.xml5
-rw-r--r--sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild138
-rw-r--r--sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild122
-rw-r--r--sci-libs/rocThrust/metadata.xml2
-rw-r--r--sci-libs/rosetta-db/metadata.xml2
-rw-r--r--sci-libs/rosetta-fragments/Manifest1
-rw-r--r--sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-chemshift.patch62
-rw-r--r--sci-libs/rosetta-fragments/files/rosetta-fragments-3.1-nnmake.patch153
-rw-r--r--sci-libs/rosetta-fragments/metadata.xml8
-rw-r--r--sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild62
-rw-r--r--sci-libs/rtabmap/Manifest2
-rw-r--r--sci-libs/rtabmap/files/pcl.patch22
-rw-r--r--sci-libs/rtabmap/files/yamlcpp.patch21
-rw-r--r--sci-libs/rtabmap/metadata.xml2
-rw-r--r--sci-libs/rtabmap/rtabmap-0.20.13-r1.ebuild (renamed from sci-libs/rtabmap/rtabmap-0.20.3.ebuild)16
-rw-r--r--sci-libs/rtabmap/rtabmap-9999.ebuild15
-rw-r--r--sci-libs/rtree/metadata.xml2
-rw-r--r--sci-libs/scalapack/metadata.xml2
-rw-r--r--sci-libs/scikit-image/metadata.xml3
-rw-r--r--sci-libs/scikit-image/scikit-image-0.17.2.ebuild3
-rw-r--r--sci-libs/scikit-learn/metadata.xml2
-rw-r--r--sci-libs/scikit-learn/scikit-learn-0.24.2.ebuild4
-rw-r--r--sci-libs/scikit-optimize/metadata.xml2
-rw-r--r--sci-libs/scotch/Manifest1
-rw-r--r--sci-libs/scotch/metadata.xml2
-rw-r--r--sci-libs/scotch/scotch-6.0.4-r2.ebuild2
-rw-r--r--sci-libs/scotch/scotch-6.1.1.ebuild174
-rw-r--r--sci-libs/shapelib/metadata.xml2
-rw-r--r--sci-libs/shapelib/shapelib-1.5.0.ebuild4
-rw-r--r--sci-libs/shapely/metadata.xml2
-rw-r--r--sci-libs/shapely/shapely-1.7.1-r1.ebuild28
-rw-r--r--sci-libs/silo/metadata.xml2
-rw-r--r--sci-libs/sktime/Manifest1
-rw-r--r--sci-libs/sktime/metadata.xml16
-rw-r--r--sci-libs/sktime/sktime-0.4.2.ebuild34
-rw-r--r--sci-libs/spglib/metadata.xml2
-rw-r--r--sci-libs/spqr/metadata.xml2
-rw-r--r--sci-libs/spqr/spqr-2.0.9.ebuild2
-rw-r--r--sci-libs/spr/metadata.xml2
-rw-r--r--sci-libs/stellarsolver/Manifest2
-rw-r--r--sci-libs/stellarsolver/metadata.xml2
-rw-r--r--sci-libs/stellarsolver/stellarsolver-1.8.ebuild (renamed from sci-libs/stellarsolver/stellarsolver-1.5.ebuild)2
-rw-r--r--sci-libs/suitesparse/metadata.xml2
-rw-r--r--sci-libs/suitesparseconfig/metadata.xml2
-rw-r--r--sci-libs/sundials/Manifest3
-rw-r--r--sci-libs/sundials/files/sundials-3.2.1-fix-license-install-path.patch9
-rw-r--r--sci-libs/sundials/files/sundials-5.7.0-fix-license-install-path.patch17
-rw-r--r--sci-libs/sundials/files/sundials-5.8.0-fix-license-install-path.patch29
-rw-r--r--sci-libs/sundials/metadata.xml3
-rw-r--r--sci-libs/sundials/sundials-3.2.1.ebuild77
-rw-r--r--sci-libs/sundials/sundials-5.7.0.ebuild77
-rw-r--r--sci-libs/sundials/sundials-5.8.0.ebuild115
-rw-r--r--sci-libs/superlu/Manifest1
-rw-r--r--sci-libs/superlu/metadata.xml2
-rw-r--r--sci-libs/superlu/superlu-4.3-r2.ebuild4
-rw-r--r--sci-libs/superlu/superlu-5.2.2.ebuild2
-rw-r--r--sci-libs/superlu/superlu-5.3.0.ebuild55
-rw-r--r--sci-libs/superlu_mt/metadata.xml2
-rw-r--r--sci-libs/superlu_mt/superlu_mt-3.1.ebuild32
-rw-r--r--sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch19
-rw-r--r--sci-libs/symengine/metadata.xml2
-rw-r--r--sci-libs/symengine/symengine-0.7.0.ebuild1
-rw-r--r--sci-libs/symmetrica/metadata.xml2
-rw-r--r--sci-libs/szip/Manifest1
-rw-r--r--sci-libs/szip/metadata.xml2
-rw-r--r--sci-libs/szip/szip-2.1-r2.ebuild30
-rw-r--r--sci-libs/szip/szip-2.1.1.ebuild2
-rw-r--r--sci-libs/ta-lib/metadata.xml2
-rw-r--r--sci-libs/tamu_anova/metadata.xml2
-rw-r--r--sci-libs/taucs/metadata.xml2
-rw-r--r--sci-libs/tensorflow-estimator/metadata.xml2
-rw-r--r--sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild2
-rw-r--r--sci-libs/tensorflow/Manifest11
-rw-r--r--sci-libs/tensorflow/metadata.xml2
-rw-r--r--sci-libs/tensorflow/tensorflow-2.4.0.ebuild401
-rw-r--r--sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild (renamed from sci-libs/tensorflow/tensorflow-2.5.0.ebuild)13
-rw-r--r--sci-libs/tnt/metadata.xml2
-rw-r--r--sci-libs/trilinos/metadata.xml2
-rw-r--r--sci-libs/udunits/metadata.xml2
-rw-r--r--sci-libs/ufconfig/metadata.xml2
-rw-r--r--sci-libs/umfpack/metadata.xml2
-rw-r--r--sci-libs/volk/metadata.xml2
-rw-r--r--sci-libs/voro++/metadata.xml2
-rw-r--r--sci-libs/votca-tools/Manifest1
-rw-r--r--sci-libs/votca-tools/metadata.xml2
-rw-r--r--sci-libs/votca-tools/votca-tools-2021.2.ebuild45
-rw-r--r--sci-libs/vtk/Manifest8
-rw-r--r--sci-libs/vtk/metadata.xml2
-rw-r--r--sci-libs/vtk/vtk-9.0.3.ebuild (renamed from sci-libs/vtk/vtk-9.0.1.ebuild)38
-rw-r--r--sci-libs/xdmf2/metadata.xml2
-rw-r--r--sci-libs/xdrfile/metadata.xml2
-rw-r--r--sci-libs/xgks-pmel/metadata.xml2
-rw-r--r--sci-libs/xylib/metadata.xml2
526 files changed, 4943 insertions, 5427 deletions
diff --git a/sci-libs/ViSP/metadata.xml b/sci-libs/ViSP/metadata.xml
index 15ed30656d8..db83f034312 100644
--- a/sci-libs/ViSP/metadata.xml
+++ b/sci-libs/ViSP/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index d392825b3a0..2fa163cefb0 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -1 +1,2 @@
+DIST adolc-2.7.2-patches.tar.bz2 6227 BLAKE2B 6ed9ca3c3128233308b6f4a57d839ac668a031a4d48e612b79929541b496dff67e463197c3c5233bda459fba17422827df6c81fba986ea7fe2affbee2cb8cbf0 SHA512 b468753efbde773c5c7d7f0211abee049193d9b64405ae57a4a902a93a4c06e4f205f531aeee9f30d7dddef19243e1a76b77a8e8727d8e36ee3867f5990e2fbb
DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
index 0f101d7e1fb..3a94424b311 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -13,7 +13,8 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/coin-or/ADOL-C"
else
SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/ADOL-C-releases-${PV}"
fi
@@ -28,10 +29,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
- "${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
- "${FILESDIR}"/${PN}-2.6.2-dash.patch
- "${FILESDIR}"/${P}-swig-python-configure.patch
+ "${WORKDIR}"/${PN}-2.5.0-no-colpack.patch
+ "${WORKDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
+ "${WORKDIR}"/${PN}-2.6.2-dash.patch
+ "${WORKDIR}"/${P}-swig-python-configure.patch
)
src_prepare() {
@@ -44,7 +45,8 @@ src_configure() {
# needs work. Revisit with >=2.7.3.
# https://bugs.gentoo.org/730750
# https://github.com/coin-or/ADOL-C/issues/20
- econf \
+ # Can drop CONFIG_SHELL once fixed up dash/bashisms patch
+ CONFIG_SHELL="${BROOT}/bin/bash" econf \
--disable-python \
--disable-static \
--enable-advanced-branching \
diff --git a/sci-libs/adolc/adolc-9999.ebuild b/sci-libs/adolc/adolc-9999.ebuild
index eeaa03bdcee..b4eaac107e7 100644
--- a/sci-libs/adolc/adolc-9999.ebuild
+++ b/sci-libs/adolc/adolc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,6 +11,7 @@ HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/coin-or/ADOL-C"
+ SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2"
else
SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -28,18 +29,24 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
- "${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
- "${FILESDIR}"/${PN}-2.6.2-dash.patch
+ "${WORKDIR}"/${PN}-2.5.0-no-colpack.patch
+ "${WORKDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
+ "${WORKDIR}"/${PN}-2.6.2-dash.patch
)
+src_unpack() {
+ git-r3_src_unpack
+ default
+}
+
src_prepare() {
default
eautoreconf
}
src_configure() {
- econf \
+ # Can drop CONFIG_SHELL once fixed up dash/bashisms patch
+ CONFIG_SHELL="${BROOT}/bin/bash" econf \
--disable-python \
--disable-static \
--enable-advanced-branching \
diff --git a/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch b/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch
deleted file mode 100644
index 779890c8cf2..00000000000
--- a/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch
+++ /dev/null
@@ -1,57 +0,0 @@
- autoconf/colpack.m4 | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/autoconf/colpack.m4 b/autoconf/colpack.m4
-index 9792786..bd4ba5e 100644
---- a/autoconf/colpack.m4
-+++ b/autoconf/colpack.m4
-@@ -8,20 +8,20 @@ AC_ARG_WITH(colpack,
- AS_HELP_STRING([--with-colpack=DIR],[path to the colpack library and headers [default=system libraries]])],
- [
- colpack=$withval
--COLPACK_CFLAGS="-I$colpack/include"
--if test x${_lib} != xlib ; then
-- D[[0]]="$colpack/${_lib}"
-- D[[1]]="$colpack/lib"
--else
-- D[[0]]="$colpack/${_lib}"
--fi
- ],
- [
- COLPACK_CFLAGS=""
- COLPACK_LIBS="-lColPack"
- D[[0]]=""
- ])
--
-+if test x$colpack != xno; then
-+COLPACK_CFLAGS="-I$colpack/include"
-+if test x${_lib} != xlib ; then
-+ D[[0]]="$colpack/${_lib}"
-+ D[[1]]="$colpack/lib"
-+else
-+ D[[0]]="$colpack/${_lib}"
-+fi
- AC_LANG_PUSH([C++])
- save_CXXFLAGS="$CXXFLAGS"
- save_CPPFLAGS="$CPPFLAGS"
-@@ -33,8 +33,8 @@ have_colpackheaders=no
- CPPFLAGS="$save_CPPFLAGS"
- CXXFLAGS="$save_CXXFLAGS"
- ])
--for ((i=0; i < ${#D[@]} ; i++)); do
--COLPACK_LIBDIR="${D[[$i]]}"
-+for i in ${D[@]}; do
-+COLPACK_LIBDIR="${i}"
- if test -n "$COLPACK_LIBDIR" ; then
- COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
- fi
-@@ -56,6 +56,9 @@ else
- fi
- done
- AC_LANG_POP([C++])
-+else
-+ have_colpack=no
-+fi
-
- AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
- if test x$have_colpack = xyes; then
diff --git a/sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch b/sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch
deleted file mode 100644
index 258f835ca9e..00000000000
--- a/sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/adolclib.pc.in 2014-05-21 09:09:10.060824555 -0700
-+++ b/adolclib.pc.in 2014-05-21 09:09:10.060824555 -0700
-@@ -7,5 +7,5 @@
- Version: @PACKAGE_VERSION@
- Description: Algorithmic Differentiation Library for C/C++
- Requires:
--Libs: -L${libdir} -l@adolclib@ -Wl,-rpath,${libdir} @LDFLAGS@ @LIBS@
-+Libs: -L${libdir} -l@adolclib@ @LIBS@
- Cflags: -I${includedir}
diff --git a/sci-libs/adolc/files/adolc-2.6.2-dash.patch b/sci-libs/adolc/files/adolc-2.6.2-dash.patch
deleted file mode 100644
index b8d4fe5ad64..00000000000
--- a/sci-libs/adolc/files/adolc-2.6.2-dash.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/configure.ac 2016-08-31 12:49:35.000000000 +0000
-+++ b/configure.ac 2017-03-04 00:58:02.354372332 +0000
-@@ -29,12 +29,12 @@
-
- adolclib=adolc
-
--if test "x$CFLAGS" == x ; then
-+if test "x$CFLAGS" = x ; then
- ac_shell_cflags="not_set"
- else
- ac_shell_cflags="$CFLAGS"
- fi
--if test "x$CXXFLAGS" == x ; then
-+if test "x$CXXFLAGS" = x ; then
- ac_shell_cxxflags="not_set"
- else
- ac_shell_cxxflags="$CXXFLAGS"
-@@ -231,12 +231,12 @@
- AC_MSG_RESULT(no)
- ])
-
--if test x$adolc_harddebug == xyes ; then
-+if test x$adolc_harddebug = xyes ; then
- adolc_debug=yes
- AC_DEFINE(ADOLC_HARDDEBUG,1,[ADOL-C hard debug mode])
- fi
-
--if test x$adolc_debug == xyes ; then
-+if test x$adolc_debug = xyes ; then
- AC_DEFINE(ADOLC_DEBUG,1,[ADOL-C debug mode])
- fi
-
-@@ -254,7 +254,7 @@
- AC_MSG_RESULT(yes)
- ])
-
--if test x$adolc_stdczero == xyes; then
-+if test x$adolc_stdczero = xyes; then
- AC_DEFINE(ADOLC_ADOUBLE_STDCZERO,1,[ADOL-C adouble zeroing mode])
- fi
-
-@@ -271,7 +271,7 @@
- AC_MSG_RESULT(no)
- ])
-
--if test x$adolc_late_init == xyes; then
-+if test x$adolc_late_init = xyes; then
- AC_DEFINE(ADOLC_ADOUBLE_LATEINIT,1,[ADOL-C adouble late initialization mode])
- fi
-
-@@ -288,7 +288,7 @@
- AC_MSG_RESULT(no)
- ])
-
--if test x$adolc_tserrno == xyes ; then
-+if test x$adolc_tserrno = xyes ; then
- AC_DEFINE(ADOLC_THREADSAVE_ERRNO,1,[ADOL-C thread save errno mode])
- fi
-
-@@ -376,8 +376,8 @@
- [AS_HELP_STRING([--with-cflags=FLAGS],
- [use CFLAGS=FLAGS (default: -O2)])],
- [ac_adolc_cflags="$withval"
-- if test x${adolc_debug} == xyes ||
-- test x${adolc_harddebug} == xyes ; then
-+ if test "x${adolc_debug}" = xyes ||
-+ test "x${adolc_harddebug}" = xyes ; then
- ac_adolc_cflags="$ac_adolc_cflags -g -O0"
- fi
- ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
-@@ -385,8 +385,8 @@
- AC_MSG_RESULT($ac_adolc_cflags)],
- [if test "$ac_shell_cflags" = "not_set"; then
- ac_adolc_cflags="-O2"
-- if test x${adolc_debug} == xyes ||
-- test x${adolc_harddebug} == xyes ; then
-+ if test "x${adolc_debug}" = xyes ||
-+ test "x${adolc_harddebug}" = xyes ; then
- ac_adolc_cflags="-g -O0 -Wall -ansi"
- fi
- else
-@@ -402,8 +402,8 @@
- [AS_HELP_STRING([--with-cxxflags=FLAGS],
- [use CXXFLAGS=FLAGS (default: -O2)])],
- [ac_adolc_cxxflags="$withval"
-- if test x${adolc_debug} == xyes ||
-- test x${adolc_harddebug} == xyes ; then
-+ if test x${adolc_debug} = xyes ||
-+ test x${adolc_harddebug} = xyes ; then
- ac_adolc_cxxflags="$ac_adolc_cxxflags -g -O0"
- fi
- ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
-@@ -411,8 +411,8 @@
- AC_MSG_RESULT($ac_adolc_cxxflags)],
- [if test "$ac_shell_cxxflags" = "not_set"; then
- ac_adolc_cxxflags="-O2"
-- if test x${adolc_debug} == xyes ||
-- test x${adolc_harddebug} == xyes ; then
-+ if test x${adolc_debug} = xyes ||
-+ test x${adolc_harddebug} = xyes ; then
- ac_adolc_cxxflags="-g -O0 -Wall"
- fi
- else
-@@ -445,7 +445,7 @@
- ])
- AC_MSG_RESULT($tapedoc_values)
-
--if test x$tapedoc_values == xyes; then
-+if test x$tapedoc_values = xyes; then
- AC_DEFINE(ADOLC_TAPE_DOC_VALUES,1,[ADOL-C tape_doc routine computes values])
- fi
-
-@@ -614,7 +614,7 @@
- break
- fi
- done
--if test "x${pdir}" == "x/" ; then
-+if test "x${pdir}" = "x/" ; then
- writable=false
- fi
- if ! ${writable} ; then
-@@ -626,15 +626,6 @@
- warn=true
- fi
-
--case ${prefix} in
-- ${HOME}|${HOME}/*)
--if $warn ; then
-- for (( i=5; i>0; i-- )); do
-- echo -ne "\rPlease read the above messages carefully, continuing in ${i} seconds"
-- sleep 1
-- done
-- echo -e "\rPlease read the above messages carefully "
--fi
- echo \
- "
- *****************************************************************************
-@@ -660,8 +651,6 @@
-
- *****************************************************************************
- "
--;;
--esac
- if test "x$enable_static" != "xno" ; then
- echo \
- " Linking a user program with a static ADOL-C library will always result
diff --git a/sci-libs/adolc/files/adolc-2.7.2-swig-python-configure.patch b/sci-libs/adolc/files/adolc-2.7.2-swig-python-configure.patch
deleted file mode 100644
index c434f655683..00000000000
--- a/sci-libs/adolc/files/adolc-2.7.2-swig-python-configure.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-https://bugs.gentoo.org/730750
-https://github.com/coin-or/ADOL-C/commit/8b53408d08f41ddaba2dea5655d332b13fc4c78b.patch
-https://github.com/coin-or/ADOL-C/commit/06b3b665fc0253ee17f0208bd06cdc130e103741.patch
-https://github.com/coin-or/ADOL-C/commit/25a69c486829ddaa19c115afc05cb7cf3b4e2410.patch
-https://github.com/coin-or/ADOL-C/commit/e41d32ba6dab09a3e58b22f1f042e49cd5ee917f.patch
-https://github.com/coin-or/ADOL-C/commit/0787a350cc181192cfd203b0f75941bcbd9c3e3a.patch
-https://github.com/coin-or/ADOL-C/commit/0b3dd1747f90f68b17dc5f1bd3a5d898e3bc77fb.patch
-----
-From e41d32ba6dab09a3e58b22f1f042e49cd5ee917f Mon Sep 17 00:00:00 2001
-From: Andrea Walther <walthand@math55020.mathematik.hu-berlin.de>
-Date: Tue, 22 Sep 2020 10:47:27 +0200
-Subject: [PATCH] fix prefix and provide --enable-python
-
----
- configure.ac | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6c2c88f9..b6aaeaa7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,6 +71,17 @@ if test x"${adolc_medipack_support}" = xyes ; then
- AC_DEFINE(ADOLC_MEDIPACK_SUPPORT,1,[defined if MeDiPack support is to be compiled in])
- fi
-
-+
-+AC_MSG_CHECKING(whether to build ADOL-C with python/swig support)
-+AC_ARG_ENABLE(python,
-+ [AS_HELP_STRING([--enable-python],[build ADOL-C with python/swig support [default=disabled]])],
-+ [adolc_python_support=$enableval],[adolc_python_support=no])
-+AC_MSG_RESULT($adolc_python_support)
-+AM_CONDITIONAL(BUILD_ADOLC_python_SUPPORT,[test x${adolc_python_support} = xyes])
-+if test x"${adolc_python_support}" = xyes ; then
-+AC_DEFINE(ADOLC_python_SUPPORT,1,[defined if python/swig support is to be compiled in])
-+fi
-+
- LT_PREREQ([2.2.6])
- # checks for programs
- AC_PROG_CXX
-@@ -651,6 +662,10 @@ if test x$sparse = xyes && test x$have_colpack = xno; then
- Only sparsity patterns can be computed\033@<:@0m"
- warn=true
- fi
-+echo \
-+" Build with python: ${adolc_python_support}"
-+
-+if test x$adolc_python_support = xyes ; then
- if test x$sparse = xyes && test x$python_found = xyes && test x$SWIG != xno; then
- echo \
- " Build with python swig module: yes"
-@@ -660,7 +675,7 @@ else
- if test x$sparse = xno && test x$python_found = xyes && test x$SWIG != xno; then
- echo \
- "(due to sparse drivers disabled)"
-- elif test x$sparse = xyes && ( $test x$python_found = xno || test x$SWIG = xno ); then
-+ elif test x$sparse = xyes && ( test x$python_found = xno || test x$SWIG = xno ); then
- echo \
- "(due to python/swig missing)"
- else
-@@ -668,6 +683,8 @@ else
- "(due to sparse drivers disabled and python/swig missing)"
- fi
- fi
-+fi
-+
- echo
-
- echo \
-From 8b53408d08f41ddaba2dea5655d332b13fc4c78b Mon Sep 17 00:00:00 2001
-From: Kshitij Kulshreshtha <kkhere.geo@gmail.com>
-Date: Tue, 31 Mar 2020 22:42:23 +0200
-Subject: [PATCH] Fix out-of-tree build for swig
-
----
- ADOL-C/swig/Makefile.am | 4 +--
- ADOL-C/swig/setup.py | 65 +++++++++++++++++++++++++++-----------
- ADOL-C/swig/swigprocess.py | 34 +++++++++++---------
- Makefile.am | 3 +-
- configure.ac | 6 ++++
- 5 files changed, 75 insertions(+), 37 deletions(-)
-
-diff --git a/ADOL-C/swig/Makefile.am b/ADOL-C/swig/Makefile.am
-index 04a52cd0..b1d5569b 100644
---- a/ADOL-C/swig/Makefile.am
-+++ b/ADOL-C/swig/Makefile.am
-@@ -12,7 +12,7 @@
-
- ACLOCAL_AMFLAGS = -I autoconf
-
--EXTRA_DIST = swigprocess.py adolc-r.i adolc-python.i adubswigfuncs.h adolc_all_in.hpp matrixmemory.hpp pyedfclasses.hpp
-+EXTRA_DIST = swigprocess.py adolc-r.i adolc-python.i adubswigfuncs.hpp adolc_all_in.hpp matrixmemory.hpp pyedfclasses.hpp
-
- clean-local:
- -rm -rf python R *.cpp *.cxx *.o *.h include
-@@ -20,6 +20,6 @@ clean-local:
- if PYTHONFOUND
- if SPARSE
- install:
-- CXX=${CXX} ${PYTHON} setup.py install --prefix=${prefix} --only-swig
-+ CXX=${CXX} ${PYTHON} ${srcdir}/setup.py build --only-swig --lib-prefix=${prefix} @python_srcbase@ install --prefix=${prefix}
- endif
- endif
-diff --git a/ADOL-C/swig/setup.py b/ADOL-C/swig/setup.py
-index 7a9a25c4..5bd98c3a 100644
---- a/ADOL-C/swig/setup.py
-+++ b/ADOL-C/swig/setup.py
-@@ -11,6 +11,10 @@
- ##############################################################################
-
- from __future__ import print_function
-+import sys, os
-+
-+sys.path = [ os.path.dirname(os.path.abspath(__file__)) ] + sys.path
-+
- from swigprocess import prepare_flat_header
- from numpy.distutils import misc_util as np_dist
- from distutils.core import setup, Extension
-@@ -18,7 +22,6 @@
- from distutils.command.build_ext import build_ext
- from distutils.command.build import build
- from distutils.command.install import install
--import os
- import subprocess
-
- def compile_dynlib(prefix,colpackdir,boostdir):
-@@ -88,14 +91,34 @@ def finalize_options(self):
- prefix = self.lib_prefix
- print('prefix = ', prefix)
- self.include_dirs.append(os.path.join(prefix,'include'))
-- self.library_dirs.append(os.path.join(prefix,'lib64'))
-- self.rpath.append(os.path.join(prefix,'lib64'))
-- prepare_flat_header()
-+ import ctypes as c
-+ plen = c.sizeof(c.c_void_p(0))
-+ if plen == 8:
-+ self.library_dirs.append(os.path.join(prefix,'lib64'))
-+ self.rpath.append(os.path.join(prefix,'lib64'))
-+ else:
-+ self.library_dirs.append(os.path.join(prefix,'lib'))
-+ self.rpath.append(os.path.join(prefix,'lib'))
-+ buildobj = self.get_finalized_command('build')
-+ self.src = buildobj.src
-+ prepare_flat_header(self.src)
-+ self.swig_opts = ['-c++', '-I' + self.src]
-+ self.finalized = 1
-
-+ def build_extension(self, ext):
-+ if self.src != '.':
-+ import shutil
-+ sources = ext.sources
-+ newSrc = []
-+ for s in iter(sources):
-+ shutil.copy(self.src + '/' + s, '.')
-+ ext.include_dirs.append(self.src)
-+ super(build_swigadolc,self).build_extension(ext)
-
- class buildthis(build,object):
- command_name = 'build'
- user_options = build.user_options + [
-+ ('src=', None, 'path of the source directory of swig module'),
- ('lib-prefix=', None, 'prefix to install adolc library'),
- ('colpack-dir=', None, 'directory in which colpack is installed'),
- ('boost-dir=', None, 'directory in which boost is installed'),
-@@ -111,11 +134,26 @@ def lib_doesnot_exist(self):
-
- def initialize_options(self):
- super(buildthis,self).initialize_options()
-+ self.src = None
- self.lib_prefix = None
- self.colpack_dir = None
- self.boost_dir = None
- self.only_swig = None
-
-+ def finalize_options(self):
-+ super(buildthis,self).finalize_options()
-+ if self.src is None:
-+ self.src = '.'
-+ if self.lib_prefix is None:
-+ self.lib_prefix = os.path.join(os.environ['HOME'],'adolc_base')
-+ if self.colpack_dir is None:
-+ self.colpack_dir = os.path.join(os.environ['HOME'],'adolc_base')
-+ if self.boost_dir is None:
-+ self.boost_dir = '/usr'
-+ if self.only_swig is None:
-+ self.only_swig = False
-+ self.finalized = 1
-+
- #sub_commands = [ ('build_lib', lib_doesnot_exist),
- # ('build_ext', None) ]
- sub_commands = [ ('build_lib', None),
-@@ -137,22 +175,13 @@ def initialize_options(self):
- super(installthis,self).initialize_options()
-
- def finalize_options(self):
-+ self.set_undefined_options('build',
-+ ('lib_prefix','lib_prefix'),
-+ ('colpack_dir', 'colpack_dir'),
-+ ('boost_dir', 'boost_dir'),
-+ ('only_swig', 'only_swig'))
- super(installthis,self).finalize_options()
-- if self.lib_prefix is None:
-- self.lib_prefix = os.path.join(os.environ['HOME'],'adolc_base')
-- if self.colpack_dir is None:
-- self.colpack_dir = os.path.join(os.environ['HOME'],'adolc_base')
-- if self.boost_dir is None:
-- self.boost_dir = '/usr'
-- if self.only_swig is None:
-- self.only_swig = False
- self.finalized = 1
-- buildobj = self.distribution.get_command_obj('build')
-- buildobj.set_undefined_options('install',
-- ('lib_prefix','lib_prefix'),
-- ('colpack_dir', 'colpack_dir'),
-- ('boost_dir', 'boost_dir'),
-- ('only_swig', 'only_swig'))
-
- incdirs = np_dist.get_numpy_include_dirs()
- #python_ldflags = subprocess.check_output(['python-config','--ldflags'],universal_newlines=True)
-diff --git a/ADOL-C/swig/swigprocess.py b/ADOL-C/swig/swigprocess.py
-index bd5fe03d..f9de5551 100644
---- a/ADOL-C/swig/swigprocess.py
-+++ b/ADOL-C/swig/swigprocess.py
-@@ -10,6 +10,7 @@
- ##
- ##############################################################################
-
-+from __future__ import print_function
- import re
- import os.path
- import sys
-@@ -191,22 +192,25 @@ def finalClean(headfile,outfiles):
- for f in glob.glob('*.o'):
- os.remove(f)
-
--def prepare_flat_header():
-- sys.path = [ os.getcwd() ] + sys.path
-- p = os.getcwd() + '/../include/adolc'
-- for (dp, dn, fn) in os.walk(p):
-- ndp = re.sub(r'\.\./',r'',dp)
-- for f in iter(fn):
-- lines = readFile(dp + "/" + f)
-- lines = comment_all_includes(lines)
-- lines = uncomment_local_includes(lines)
-- try:
-- os.makedirs(ndp)
-- except:
-- pass
-- writeOutput(lines, ndp + "/" + f)
-+def prepare_flat_header(src_base='.'):
-+ pl = [ os.getcwd() + '/../include/adolc' ]
-+ print('src_base = ', src_base)
-+ if src_base != '.':
-+ pl = [ src_base + '/../include/adolc' ] + pl
-+ for p in iter(pl):
-+ for (dp, dn, fn) in os.walk(p):
-+ ndp = re.sub(r'^.*\.\./',r'',dp)
-+ for f in iter(fn):
-+ lines = readFile(dp + "/" + f)
-+ lines = comment_all_includes(lines)
-+ lines = uncomment_local_includes(lines)
-+ try:
-+ os.makedirs(ndp)
-+ except:
-+ pass
-+ writeOutput(lines, ndp + "/" + f)
-
-- invoke_cpp('adolc_all_in.hpp', 'adolc_all_pre.hpp')
-+ invoke_cpp(src_base + '/' + 'adolc_all_in.hpp', 'adolc_all_pre.hpp')
- lines = readFile('adolc_all_pre.hpp')
- lines = reinstate_nonlocal_include(lines)
- writeOutput(lines,'adolc_all.hpp')
-diff --git a/Makefile.am b/Makefile.am
-index fb66e9f3..123ac905 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,13 +24,12 @@ EXTRA_DIST = TODO BUGS LICENSE update_versions.sh \
- ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
- ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
- MSVisualStudio/v14/adolc.sln MSVisualStudio/v14/adolc.vcxproj \
-- MSVisualStudio/v14/ColPack_Readme_VC++.txt \
- MSVisualStudio/v14/ColPack.vcxproj \
- MSVisualStudio/v14/sparse/config.h.in MSVisualStudio/v14/nosparse/config.h.in \
- MSVisualStudio/v14/x64/sparse/config.h.in MSVisualStudio/v14/x64/nosparse/config.h.in \
- MSVisualStudio/v14/sparse/config.h MSVisualStudio/v14/nosparse/config.h \
- MSVisualStudio/v14/x64/sparse/config.h MSVisualStudio/v14/x64/nosparse/config.h \
-- MSVisualStudio/v14/Readme_VC++.txt \
-+ MSVisualStudio/v14/README_VC++.md \
- MSVisualStudio/v14/installer.sh \
- adolc.spec.in adolc.spec \
- update_versions.sh
-diff --git a/configure.ac b/configure.ac
-index ddb08de1..6c2c88f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -501,6 +501,12 @@ fi
- AM_PATH_PYTHON([2.7],[python_found=yes],[python_found=no])
- AC_PATH_PROG(SWIG, swig, [no])
- AM_CONDITIONAL(PYTHONFOUND, [test x$python_found = xyes && test x$SWIG != xno])
-+if test ${abs_top_srcdir} != ${abs_top_builddir} ; then
-+ python_srcbase='--src=${abs_srcdir}'
-+else
-+ python_srcbase=''
-+fi
-+AC_SUBST(python_srcbase)
- ###########################################################################
- # COIN_PATCH_LIBTOOL_CYGWIN #
- ###########################################################################
-
-From 25a69c486829ddaa19c115afc05cb7cf3b4e2410 Mon Sep 17 00:00:00 2001
-From: Kshitij Kulshreshtha <kkhere.geo@gmail.com>
-Date: Wed, 1 Apr 2020 02:36:12 +0200
-Subject: [PATCH] another small fix for swig, this time for in-tree check
-
----
- ADOL-C/swig/setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ADOL-C/swig/setup.py b/ADOL-C/swig/setup.py
-index e6023679..4ec9a7cc 100644
---- a/ADOL-C/swig/setup.py
-+++ b/ADOL-C/swig/setup.py
-@@ -105,7 +105,7 @@ def finalize_options(self):
- self.finalized = 1
-
- def build_extension(self, ext):
-- if self.src != '.':
-+ if os.path.abspath(os.path.realpath(self.src)) != os.path.abspath('.'):
- import shutil
- sources = ext.sources
- newSrc = []
-From 0787a350cc181192cfd203b0f75941bcbd9c3e3a Mon Sep 17 00:00:00 2001
-From: Andrea Walther <walthand@math55020.mathematik.hu-berlin.de>
-Date: Tue, 22 Sep 2020 11:58:09 +0200
-Subject: [PATCH] small change in configure.ac for swig module
-
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index b6aaeaa7..58380e55 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -509,6 +509,7 @@ if test x$tapedoc_values == xyes; then
- AC_DEFINE(ADOLC_TAPE_DOC_VALUES,1,[ADOL-C tape_doc routine computes values])
- fi
-
-+if test x$adolc_python_support == xyes; then
- AM_PATH_PYTHON([2.7],[python_found=yes],[python_found=no])
- AC_PATH_PROG(SWIG, swig, [no])
- AM_CONDITIONAL(PYTHONFOUND, [test x$python_found = xyes && test x$SWIG != xno])
-@@ -517,7 +518,12 @@ if test ${abs_top_srcdir} != ${abs_top_builddir} ; then
- else
- python_srcbase=''
- fi
-+else
-+ AM_CONDITIONAL(PYTHONFOUND, [test x$adolc_python_support])
-+ python_srcbase=''
-+fi
- AC_SUBST(python_srcbase)
-+end
- ###########################################################################
- # COIN_PATCH_LIBTOOL_CYGWIN #
- ###########################################################################
-From 0b3dd1747f90f68b17dc5f1bd3a5d898e3bc77fb Mon Sep 17 00:00:00 2001
-From: Andrea Walther <walthand@math55020.mathematik.hu-berlin.de>
-Date: Wed, 23 Sep 2020 08:54:54 +0200
-Subject: [PATCH] small fixes in configure.ac
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 58380e55..88671274 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -519,11 +519,11 @@ else
- python_srcbase=''
- fi
- else
-- AM_CONDITIONAL(PYTHONFOUND, [test x$adolc_python_support])
-+ AM_CONDITIONAL(PYTHONFOUND, [test x$adolc_python_support = xyes])
- python_srcbase=''
- fi
- AC_SUBST(python_srcbase)
--end
-+
- ###########################################################################
- # COIN_PATCH_LIBTOOL_CYGWIN #
- ###########################################################################
diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml
index a8f7848ccb6..35349ad8507 100644
--- a/sci-libs/adolc/metadata.xml
+++ b/sci-libs/adolc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/alglib/metadata.xml b/sci-libs/alglib/metadata.xml
index dc39a23a79e..8b20dc66d96 100644
--- a/sci-libs/alglib/metadata.xml
+++ b/sci-libs/alglib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
index abd35c1a71a..a080f8979ac 100644
--- a/sci-libs/amd/amd-2.4.6-r1.ebuild
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc fortran"
BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
deleted file mode 100644
index 06a5de3d6c8..00000000000
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-inherit fortran-2
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
-SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran"
-
-BDEPEND="virtual/pkgconfig
- doc? ( virtual/latex-base )"
-DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --disable-static \
- $(use_enable fortran) \
- $(use_with doc)
-}
-
-src_install() {
- default
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/amd/metadata.xml b/sci-libs/amd/metadata.xml
index 353c2f00738..83c70170dba 100644
--- a/sci-libs/amd/metadata.xml
+++ b/sci-libs/amd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index b087495c86e..df22bca2b6b 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,2 +1,3 @@
DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
DIST armadillo-10.3.0.tar.xz 6214388 BLAKE2B 212d543e8d1845c974cf11302a944a151f63c7f301046910da6b2f27684080df520e5be10f8490a1cc27071ec84b1a91a2431e33960b561c56b291575bb003e8 SHA512 99877ff6581d3effea282d1c4e258883618f4107d84cfe85ed877afc62ba445793e760693c0c6c2113a1822881160cb10adb90087e97b4e31d3a1e64344a6353
+DIST armadillo-10.7.1.tar.xz 6258792 BLAKE2B cc820638dd7b571b5654e14bb82ced3586cb2950b1fb5aebf6bdd9439151353c4750296aaa4d15144ade6ed13e52743ac41e3cf34b824809931c3c031804bddf SHA512 b9be6a38165a4d23a61715a3c3f970dcb9b813bebd51b7372a4e8349ab2c351cd5c74f662d860911b30b2b816f2eb1255768fab1497ec087a63a07f56f74327f
diff --git a/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild b/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
index b7abebcf9b1..d85588ffb61 100644
--- a/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/sci-libs/armadillo/armadillo-10.7.1.ebuild b/sci-libs/armadillo/armadillo-10.7.1.ebuild
new file mode 100644
index 00000000000..d85588ffb61
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-10.7.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 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="http://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/metadata.xml b/sci-libs/armadillo/metadata.xml
index 3daa0eb9658..08c60223686 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/sci-libs/arpack/metadata.xml b/sci-libs/arpack/metadata.xml
index f9395d1b28a..881f489f25e 100644
--- a/sci-libs/arpack/metadata.xml
+++ b/sci-libs/arpack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/arprec/metadata.xml b/sci-libs/arprec/metadata.xml
index 467aaebf1fb..45204a1f324 100644
--- a/sci-libs/arprec/metadata.xml
+++ b/sci-libs/arprec/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
index ac115a04948..d13459d3cf6 100644
--- a/sci-libs/atlas/metadata.xml
+++ b/sci-libs/atlas/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
index a2872894639..4db9d9a0c2b 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -62,6 +62,11 @@ src_unpack() {
}
src_configure() {
+ # Seems to be what upstream are using too. Apply the old hdf5lib workaround.
+ # https://github.com/OpenChemistry/avogadrolibs/commit/32e3dd8ce9f48f74e3960dc9afcc614496d87c7f
+ # bug #810505
+ append-cppflags -DH5_USE_110_API
+
# -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
local mycmakeargs=(
-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index b1ec1f75eb7..672fc1a0504 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/sci-libs/beagle/metadata.xml b/sci-libs/beagle/metadata.xml
index ee5ba5812c3..61308c44d1d 100644
--- a/sci-libs/beagle/metadata.xml
+++ b/sci-libs/beagle/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/blis/metadata.xml b/sci-libs/blis/metadata.xml
index 3d3415f6ffa..0793096590b 100644
--- a/sci-libs/blis/metadata.xml
+++ b/sci-libs/blis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<upstream>
<bugs-to>https://github.com/flame/blis/issues/</bugs-to>
diff --git a/sci-libs/bliss/metadata.xml b/sci-libs/bliss/metadata.xml
index 9b3cd6685a1..9dea1469538 100644
--- a/sci-libs/bliss/metadata.xml
+++ b/sci-libs/bliss/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/bmrblib/metadata.xml b/sci-libs/bmrblib/metadata.xml
index 22a1302e812..3883641649b 100644
--- a/sci-libs/bmrblib/metadata.xml
+++ b/sci-libs/bmrblib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest
new file mode 100644
index 00000000000..ee2664a8317
--- /dev/null
+++ b/sci-libs/branca/Manifest
@@ -0,0 +1 @@
+DIST branca-0.4.2.tar.gz 59337 BLAKE2B 7d7f101a3dcc07c0210f968da2ed41f4a75177b625ce46252024da7dbba82618dbe60886c615c9461c724af76b45c7710f631bc65d5743cee7f18a2052f9db49 SHA512 cefb3b0f41d515492902ef4046cf7f10b638aca8409f5b08f201550ed5a971a441d13243b1ce38ac0b8c0f76cde1329955d26c1856e1f3c25014a6ce0d805fd6
diff --git a/sci-libs/branca/branca-0.4.2-r1.ebuild b/sci-libs/branca/branca-0.4.2-r1.ebuild
new file mode 100644
index 00000000000..84668d2004a
--- /dev/null
+++ b/sci-libs/branca/branca-0.4.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1
+
+DESCRIPTION="spinoff from folium, host the non-map-specific features."
+HOMEPAGE="https://github.com/python-visualization/branca"
+SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-test.patch
+ "${FILESDIR}"/${P}-setup.patch
+)
+
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/selenium[${PYTHON_USEDEP}]
+ dev-python/nbconvert[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ )"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_test() {
+ epytest -m 'not headless'
+}
diff --git a/sci-libs/branca/files/branca-0.4.2-setup.patch b/sci-libs/branca/files/branca-0.4.2-setup.patch
new file mode 100644
index 00000000000..6ceea6b252b
--- /dev/null
+++ b/sci-libs/branca/files/branca-0.4.2-setup.patch
@@ -0,0 +1,11 @@
+--- a/setup.cfg 2021-08-28 16:51:20.436726385 +0200
++++ b/setup.cfg 2021-08-28 16:51:34.275526771 +0200
+@@ -20,7 +20,7 @@
+ headless: mark headless tests (deselect with '-m "not headless"')
+
+ [metadata]
+-description-file = README.rst
++description_file = README.rst
+ license_file = LICENSE.txt
+
+ [check-manifest]
diff --git a/sci-libs/branca/files/branca-0.4.2-test.patch b/sci-libs/branca/files/branca-0.4.2-test.patch
new file mode 100644
index 00000000000..8c1525d69bf
--- /dev/null
+++ b/sci-libs/branca/files/branca-0.4.2-test.patch
@@ -0,0 +1,14 @@
+--- a/setup.cfg 2021-07-30 21:13:41.303271681 +0200
++++ b/setup.cfg 2021-07-30 21:13:49.133164898 +0200
+@@ -11,11 +11,6 @@
+ parentdir_prefix =
+
+ [tool:pytest]
+-flake8-max-line-length = 105
+-flake8-ignore =
+- docs/* ALL
+- versioneer.py ALL
+- branca/_version.py ALL
+ markers =
+ headless: mark headless tests (deselect with '-m "not headless"')
+
diff --git a/sci-libs/branca/metadata.xml b/sci-libs/branca/metadata.xml
new file mode 100644
index 00000000000..cd3cdb1c212
--- /dev/null
+++ b/sci-libs/branca/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+ This library is a spinoff from folium, that would host the non-map-specific features.
+ It may become a HTML+JS generation library in the future.
+ It is based on Jinja2 only.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">python-visualization/branca</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-libs/brial/metadata.xml b/sci-libs/brial/metadata.xml
index 4e680968fce..e5158b9ea3e 100644
--- a/sci-libs/brial/metadata.xml
+++ b/sci-libs/brial/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/btf/metadata.xml b/sci-libs/btf/metadata.xml
index 979bbfcfd49..f1584893995 100644
--- a/sci-libs/btf/metadata.xml
+++ b/sci-libs/btf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/buddy/metadata.xml b/sci-libs/buddy/metadata.xml
index 2cbfbe4b7bf..5b9bcadddb1 100644
--- a/sci-libs/buddy/metadata.xml
+++ b/sci-libs/buddy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
index 30c89c640f8..74e08719447 100644
--- a/sci-libs/camd/camd-2.4.6-r1.ebuild
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
deleted file mode 100644
index 78e60674346..00000000000
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
-SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="virtual/pkgconfig
- doc? ( virtual/latex-base )"
-DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --disable-static \
- $(use_with doc)
-}
-
-src_install() {
- default
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/camd/metadata.xml b/sci-libs/camd/metadata.xml
index f543de2655d..820889737a2 100644
--- a/sci-libs/camd/metadata.xml
+++ b/sci-libs/camd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cantera/metadata.xml b/sci-libs/cantera/metadata.xml
index 689eb1c44d0..919e8bf0ad4 100644
--- a/sci-libs/cantera/metadata.xml
+++ b/sci-libs/cantera/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>torokhov-s-a@yandex.ru</email>
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 15559100d5e..0417f6eb7b5 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1 +1,2 @@
DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
+DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f SHA512 5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index fbbee50514c..ffeef0d9070 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
inherit distutils-r1 virtualx
MY_PV=${PV/_beta/b}
diff --git a/sci-libs/cartopy/cartopy-0.19.0.ebuild b/sci-libs/cartopy/cartopy-0.19.0.ebuild
new file mode 100644
index 00000000000..613c5da6a59
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.19.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python package for geospatial data processing and analysis"
+HOMEPAGE="https://scitools.org.uk/cartopy"
+SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ sci-libs/pyshp[${PYTHON_USEDEP}]
+ sci-libs/shapely[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+ sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ sci-libs/geos
+ <sci-libs/proj-8
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+ dev-python/filelock[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/flufl-lock[$PYTHON_USEDEP]
+ )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+ # drop test file requiring network access, which got not covered by markers
+ rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
+ rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.py || die
+ # prepare matplotlib backend for test suite
+ export MPLCONFIGDIR="${T}"
+ echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ cd "${BUILD_DIR}"
+ # drop all tests needing network access
+ virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
+}
diff --git a/sci-libs/cartopy/metadata.xml b/sci-libs/cartopy/metadata.xml
index 5bffb905015..54adce33ba1 100644
--- a/sci-libs/cartopy/metadata.xml
+++ b/sci-libs/cartopy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tomjbe@gentoo.org</email>
diff --git a/sci-libs/ccfits/metadata.xml b/sci-libs/ccfits/metadata.xml
index e4f684da791..6e2d138841a 100644
--- a/sci-libs/ccfits/metadata.xml
+++ b/sci-libs/ccfits/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-astronomy@gentoo.org</email>
diff --git a/sci-libs/ccolamd/metadata.xml b/sci-libs/ccolamd/metadata.xml
index 23373de57a2..4054b1ae658 100644
--- a/sci-libs/ccolamd/metadata.xml
+++ b/sci-libs/ccolamd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild
index b0f5d66efdd..12930c685ab 100644
--- a/sci-libs/cdd+/cdd+-077a.ebuild
+++ b/sci-libs/cdd+/cdd+-077a.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit epatch multilib toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Another implementation of the double description method"
HOMEPAGE="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/"
@@ -12,27 +12,25 @@ SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
-IUSE=""
DEPEND="dev-libs/gmp:0="
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-headers.patch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-gcc-5.patch \
- "${FILESDIR}"/${P}-qa-const-char.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-headers.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-gcc-5.patch
+ "${FILESDIR}"/${P}-qa-const-char.patch
+ "${FILESDIR}"/${P}-gcc11-dynamic-exceptions.patch
+)
src_compile() {
emake \
CC="$(tc-getCC)" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- GMPLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- GMPINCLUDE="${EPREFIX}/usr/include" \
+ GMPLIBDIR="${ESYSROOT}/usr/$(get_libdir)" \
+ GMPINCLUDE="${ESYSROOT}/usr/include" \
all
-
}
src_install() {
diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch
index cd2d32a8a31..94018d6da2a 100644
--- a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch
@@ -1,8 +1,8 @@
Fix check for GCC version beyond major version 4.
Gentoo bug #569222
---- cdd+-077a/gmp_init.cc
-+++ cdd+-077a/gmp_init.cc
+--- a/gmp_init.cc
++++ b/gmp_init.cc
@@ -31,7 +31,7 @@
# define pm_gmp_reallocate std::__alloc::reallocate
#endif // gcc 3.3
diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch
new file mode 100644
index 00000000000..1ac5a0cef32
--- /dev/null
+++ b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch
@@ -0,0 +1,71 @@
+https://bugs.gentoo.org/787941
+
+From 46d95aeac2d3951d79291def284bb610e7cb033f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 5 Aug 2021 02:00:33 +0100
+Subject: [PATCH] Drop deprecated C++17 dynamic exceptions
+
+---
+ Integer.h | 6 +++---
+ Rational.cc | 2 +-
+ Rational.h | 2 +-
+ cddio.o | Bin 0 -> 154584 bytes
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+ create mode 100644 cddio.o
+
+diff --git a/Integer.h b/Integer.h
+index 8b7f04e..d4a1bdd 100644
+--- a/Integer.h
++++ b/Integer.h
+@@ -179,7 +179,7 @@ public:
+ }
+
+ /// Recognizes automatically number base 10, 8, or 16.
+- Integer& set(const char *s) throw(gmp_error)
++ Integer& set(const char *s)
+ {
+ if (mpz_set_str(rep, s, 0) < 0)
+ throw gmp_error("Integer: syntax error in string");
+@@ -195,14 +195,14 @@ public:
+
+ operator double() const { return mpz_get_d(rep); }
+
+- operator long() const throw(gmp_error)
++ operator long() const
+ {
+ if (!mpz_fits_slong_p(rep))
+ throw gmp_error("Integer: value too big");
+ return mpz_get_si(rep);
+ }
+
+- operator int() const throw(gmp_error)
++ operator int() const
+ {
+ if (!mpz_fits_sint_p(rep))
+ throw gmp_error("Integer: value too big");
+diff --git a/Rational.cc b/Rational.cc
+index f1b86a4..c679671 100644
+--- a/Rational.cc
++++ b/Rational.cc
+@@ -19,7 +19,7 @@
+ #include "Rational.h"
+ #include <cstring>
+
+-Rational& Rational::set(const char* s) throw (gmp_error)
++Rational& Rational::set(const char* s)
+ {
+ const char* digit=s;
+ while (*digit && *digit!='/') ++digit;
+diff --git a/Rational.h b/Rational.h
+index acaba13..eb30578 100644
+--- a/Rational.h
++++ b/Rational.h
+@@ -421,7 +421,7 @@ public:
+ Numerator and denominator are expected delimited by `/'.
+ Omitted denominator assumed equal to 1.
+ */
+- Rational& set(const char *s) throw(gmp_error);
++ Rational& set(const char *s);
+
+ Rational& operator= (const Rational& b)
+ {
diff --git a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch
index efe6d7035e9..b61b8ab42a0 100644
--- a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch
@@ -1,5 +1,5 @@
---- makefile.orig 2010-01-19 20:22:59.000000000 +0100
-+++ makefile 2010-01-19 20:52:01.000000000 +0100
+--- a/makefile
++++ b/makefile
@@ -6,21 +6,21 @@
#CC = /bin/cc
diff --git a/sci-libs/cdd+/files/cdd+-077a-headers.patch b/sci-libs/cdd+/files/cdd+-077a-headers.patch
index c6ceb93bfaa..4df6f05871c 100644
--- a/sci-libs/cdd+/files/cdd+-077a-headers.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-headers.patch
@@ -1,10 +1,5 @@
-Index: Integer.h
-===================================================================
-RCS file: /home/imocvs/cdd+/Integer.h,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 Integer.h
---- Integer.h 2008/12/15 01:19:52 1.1.1.1
-+++ Integer.h 2008/12/15 01:24:04
+--- a/Integer.h
++++ b/Integer.h
@@ -23,6 +23,7 @@
#include <gmp_init.h>
#include <cctype>
@@ -13,13 +8,8 @@ diff -u -p -r1.1.1.1 Integer.h
class Integer; class Rational;
-Index: Rational.cc
-===================================================================
-RCS file: /home/imocvs/cdd+/Rational.cc,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 Rational.cc
---- Rational.cc 2008/12/15 01:19:52 1.1.1.1
-+++ Rational.cc 2008/12/15 01:25:14
+--- a/Rational.cc
++++ b/Rational.cc
@@ -17,6 +17,7 @@
#include <cctype>
@@ -28,13 +18,8 @@ diff -u -p -r1.1.1.1 Rational.cc
Rational& Rational::set(const char* s) throw (gmp_error)
{
-Index: Rational.h
-===================================================================
-RCS file: /home/imocvs/cdd+/Rational.h,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 Rational.h
---- Rational.h 2008/12/15 01:19:52 1.1.1.1
-+++ Rational.h 2008/12/15 01:27:08
+--- a/Rational.h
++++ b/Rational.h
@@ -17,6 +17,7 @@
#define _POLYMAKE_GMP_RATIONAL_H "$Project: polymake $$Id$
@@ -52,13 +37,8 @@ diff -u -p -r1.1.1.1 Rational.h
*den_buf++ = '/';
denominator(a).putstr(os.flags(), den_buf);
}
-Index: gmp_init.cc
-===================================================================
-RCS file: /home/imocvs/cdd+/gmp_init.cc,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 gmp_init.cc
---- gmp_init.cc 2008/12/15 01:19:52 1.1.1.1
-+++ gmp_init.cc 2008/12/15 01:23:45
+--- a/gmp_init.cc
++++ b/gmp_init.cc
@@ -16,6 +16,7 @@
#ident "$Project: polymake $$Id$
diff --git a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch
index a2304725990..883b6bf809b 100644
--- a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch
@@ -4,8 +4,8 @@ cddio.C: In function ‘void SetWriteFileName(char*, char, char*)’:
cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings]
extension=".ine"; break; /* output file for ine data */
---- cdd+-077a/cdd.h
-+++ cdd+-077a/cdd.h
+--- a/cdd.h
++++ b/cdd.h
@@ -185,8 +185,8 @@
extern int output_digits; /* Float digits for output. Does not affect the computation. */
@@ -17,8 +17,8 @@ cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*
myTYPE FABS(myTYPE);
void SetNumberType(string);
---- cdd+-077a/cddio.C
-+++ cdd+-077a/cddio.C
+--- a/cddio.C
++++ b/cddio.C
@@ -90,10 +90,10 @@
}
}
diff --git a/sci-libs/cdd+/metadata.xml b/sci-libs/cdd+/metadata.xml
index 1745610437d..16f304a6e4a 100644
--- a/sci-libs/cdd+/metadata.xml
+++ b/sci-libs/cdd+/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>sci-mathematics@gentoo.org</email>
- <name>Gentoo Mathematics Project</name>
- </maintainer>
- <longdescription>
- The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all
- vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear
- inequalities: P = { x : A x &lt;= b } where A is an m x d real matrix and b is a real m dimensional vector.
- </longdescription>
+ <maintainer type="project">
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+ </maintainer>
+ <longdescription>
+ The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all
+ vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear
+ inequalities: P = { x : A x &lt;= b } where A is an m x d real matrix and b is a real m dimensional vector.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">cddlib/cddplus</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sci-libs/cddlib/metadata.xml b/sci-libs/cddlib/metadata.xml
index 25012d0da04..91e71ecbd13 100644
--- a/sci-libs/cddlib/metadata.xml
+++ b/sci-libs/cddlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/cdf/metadata.xml b/sci-libs/cdf/metadata.xml
index 1021bdd389c..4114747d94a 100644
--- a/sci-libs/cdf/metadata.xml
+++ b/sci-libs/cdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 941bf4bbf4f..3a08363f7ed 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1 +1,2 @@
DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
+DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0 SHA512 843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9
diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
new file mode 100644
index 00000000000..771ac309e41
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DIR="docs/source"
+inherit cmake-multilib python-any-r1 docs toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/"
+SRC_URI="http://ceres-solver.org/${P}.tar.gz"
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+ >=dev-cpp/eigen-3.3.4:3
+ lapack? ( virtual/pkgconfig )
+ doc? ( dev-libs/mathjax )
+"
+RDEPEND="
+ dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+ cxsparse? ( sci-libs/cxsparse )
+ lapack? ( virtual/lapack )
+ sparse? (
+ sci-libs/amd
+ sci-libs/camd
+ sci-libs/ccolamd
+ sci-libs/cholmod[metis(+)]
+ sci-libs/colamd
+ sci-libs/spqr
+ )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md VERSION )
+
+PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" )
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+ fi
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # search paths work for prefix
+ sed -e "s:/usr:${EPREFIX}/usr:g" \
+ -i cmake/*.cmake || die
+
+ # remove Werror
+ sed -e 's/-Werror=(all|extra)//g' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+ local mycmakeargs=(
+ -DBUILD_BENCHMARKS=OFF
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DBUILD_TESTING=$(usex test)
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DGFLAGS=$(usex gflags)
+ -DLAPACK=$(usex lapack)
+ -DSCHUR_SPECIALIZATIONS=$(usex schur)
+ -DCXSPARSE=$(usex cxsparse)
+ -DSUITESPARSE=$(usex sparse)
+ -DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3
+ -DCERES_THREADING_MODEL=$(usex openmp OPENMP CXX_THREADS)
+ )
+ use doc && mycmakeargs+=(
+ -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+ )
+ use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
+ cmake-multilib_src_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples data
+ fi
+}
diff --git a/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch b/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch
new file mode 100644
index 00000000000..61e0f000f26
--- /dev/null
+++ b/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch
@@ -0,0 +1,10 @@
+diff -urN a/docs/source/conf.py b/docs/source/conf.py
+--- a/docs/source/conf.py 2020-10-25 22:25:47.000000000 -0500
++++ b/docs/source/conf.py 2021-07-29 09:44:35.488893188 -0500
+@@ -252,3 +252,6 @@
+ 'scale' : 90
+ }
+ }
++
++# Use system MathJax
++mathjax_path = "/usr/share/mathjax/MathJax.js?config=TeX-MML-AM_CHTML"
diff --git a/sci-libs/ceres-solver/metadata.xml b/sci-libs/ceres-solver/metadata.xml
index 57c1a1394e0..731dd91a4d4 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild
index d3052d10eec..3df858d19d9 100644
--- a/sci-libs/cfitsio/cfitsio-3.490.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild
@@ -8,12 +8,12 @@ inherit fortran-2 multilib-minimal
DESCRIPTION="C and Fortran library for manipulating FITS files"
HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz"
+SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
LICENSE="ISC"
SLOT="0/9"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
BDEPEND="
@@ -25,8 +25,9 @@ RDEPEND="
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
"
+# Bug #803350
DEPEND="${RDEPEND}
- dev-lang/cfortran
+ <dev-lang/cfortran-20110621
"
PATCHES=(
diff --git a/sci-libs/cfitsio/metadata.xml b/sci-libs/cfitsio/metadata.xml
index c25c3510d3a..7524e3a9504 100644
--- a/sci-libs/cfitsio/metadata.xml
+++ b/sci-libs/cfitsio/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-astronomy@gentoo.org</email>
diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
index dbb7d0622da..6fe1ddee3b2 100644
--- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild
+++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
@@ -1,33 +1,35 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
-inherit epatch fortran-2 flag-o-matic toolchain-funcs
+inherit fortran-2 flag-o-matic toolchain-funcs
DESCRIPTION="Conjugate gradient Codes for large sparse linear systems"
HOMEPAGE="http://fetk.org/codes/cgcode/index.html"
SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE=""
RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}"/${PN}
+PATCHES=(
+ "${FILESDIR}"/${PV}-gentoo.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${PV}-gentoo.patch
+ default
# GCC 10 workaround
# bug #722000
append-fflags $(test-flags-FC -fallow-argument-mismatch)
- cat >> make.inc <<- EOF
+ cat >> make.inc <<- EOF || die
F77 = $(tc-getFC)
FFLAGS = ${FFLAGS}
BLASLIBS = $($(tc-getPKG_CONFIG) --libs blas)
diff --git a/sci-libs/cgcode/files/1.0-gentoo.patch b/sci-libs/cgcode/files/1.0-gentoo.patch
index 612ca9e0649..449f1f18dde 100644
--- a/sci-libs/cgcode/files/1.0-gentoo.patch
+++ b/sci-libs/cgcode/files/1.0-gentoo.patch
@@ -1,5 +1,3 @@
-diff --git a/makefile b/makefile
-index 4813b55..f20af02 100644
--- a/makefile
+++ b/makefile
@@ -1,21 +1,23 @@
@@ -33,8 +31,6 @@ index 4813b55..f20af02 100644
clean :
rm -f *.o goos good
-diff --git a/src/makefile b/src/makefile
-index 10cf6c3..1dfd02d 100644
--- a/src/makefile
+++ b/src/makefile
@@ -1,16 +1,17 @@
@@ -60,8 +56,6 @@ index 10cf6c3..1dfd02d 100644
clean :
rm -f *.o $(THISLIB)
-diff --git a/util/makefile b/util/makefile
-index 6dad0d1..5c9d24f 100644
--- a/util/makefile
+++ b/util/makefile
@@ -6,11 +6,12 @@ SOBJLIB = saxpy.o scopy.o sdot.o snrm2.o sscal.o
diff --git a/sci-libs/cgcode/metadata.xml b/sci-libs/cgcode/metadata.xml
index 8425c0d53cb..7d3acaf5d25 100644
--- a/sci-libs/cgcode/metadata.xml
+++ b/sci-libs/cgcode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cgnslib/metadata.xml b/sci-libs/cgnslib/metadata.xml
index 855392f824c..c797f2727eb 100644
--- a/sci-libs/cgnslib/metadata.xml
+++ b/sci-libs/cgnslib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription lang="en">
The Computational Fluid Dynamics General Notation System (CGNS) provides a
diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml
index 655cf27be61..9ba80d3ef6c 100644
--- a/sci-libs/cholmod/metadata.xml
+++ b/sci-libs/cholmod/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cifparse-obj/metadata.xml b/sci-libs/cifparse-obj/metadata.xml
index 8937bad0b17..e490bcb8aa8 100644
--- a/sci-libs/cifparse-obj/metadata.xml
+++ b/sci-libs/cifparse-obj/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/sci-libs/clapack/metadata.xml b/sci-libs/clapack/metadata.xml
index 5f899e3c221..e78328f6b6a 100644
--- a/sci-libs/clapack/metadata.xml
+++ b/sci-libs/clapack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/clashscore-db/clashscore-db-3.17.ebuild b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
index bad0582b716..41bea4a55af 100644
--- a/sci-libs/clashscore-db/clashscore-db-3.17.ebuild
+++ b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
DESCRIPTION="Clashscore-db for clashlist"
HOMEPAGE="http://kinemage.biochem.duke.edu/"
SRC_URI="mirror://gentoo/molprobity-${PV}.tgz"
+S="${WORKDIR}"
-SLOT="0"
LICENSE="richardson"
+SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
RESTRICT="binchecks strip"
-S="${WORKDIR}"
-
src_install() {
insinto /usr/share/clashscore
doins molprobity3/lib/clashscore.db.tab
diff --git a/sci-libs/clashscore-db/metadata.xml b/sci-libs/clashscore-db/metadata.xml
index 8937bad0b17..e490bcb8aa8 100644
--- a/sci-libs/clashscore-db/metadata.xml
+++ b/sci-libs/clashscore-db/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/sci-libs/clblas/metadata.xml b/sci-libs/clblas/metadata.xml
index cad01ed8bce..20731f32a8e 100644
--- a/sci-libs/clblas/metadata.xml
+++ b/sci-libs/clblas/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/clblast/metadata.xml b/sci-libs/clblast/metadata.xml
index d5ff3a6625c..e02c949bf65 100644
--- a/sci-libs/clblast/metadata.xml
+++ b/sci-libs/clblast/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 88ac5650e97..bb01f5560a4 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cln/metadata.xml b/sci-libs/cln/metadata.xml
index 3e1bd9fcb04..9e3c48a1e46 100644
--- a/sci-libs/cln/metadata.xml
+++ b/sci-libs/cln/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-mathematics@gentoo.org</email>
diff --git a/sci-libs/cminpack/metadata.xml b/sci-libs/cminpack/metadata.xml
index c80cc08e331..00b08788bed 100644
--- a/sci-libs/cminpack/metadata.xml
+++ b/sci-libs/cminpack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cmpfit/metadata.xml b/sci-libs/cmpfit/metadata.xml
index 11136c85eee..df8582d0bfc 100644
--- a/sci-libs/cmpfit/metadata.xml
+++ b/sci-libs/cmpfit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinhsl/metadata.xml b/sci-libs/coinhsl/metadata.xml
index be3aa6566c4..8225fda14e4 100644
--- a/sci-libs/coinhsl/metadata.xml
+++ b/sci-libs/coinhsl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-alps/metadata.xml b/sci-libs/coinor-alps/metadata.xml
index 6034b7e66d9..1bb91f86131 100644
--- a/sci-libs/coinor-alps/metadata.xml
+++ b/sci-libs/coinor-alps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
index b4b5f58fbe9..a904acfd133 100644
--- a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
+++ b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
@@ -25,6 +25,10 @@ BDEPEND="
doc? ( app-doc/doxygen[dot] )
test? ( sci-libs/coinor-sample )"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc11-exceptions.patch
+)
+
src_prepare() {
default
# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
diff --git a/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch b/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch
new file mode 100644
index 00000000000..d37e8b02439
--- /dev/null
+++ b/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch
@@ -0,0 +1,36 @@
+https://github.com/coin-or/Bcp/commit/e581a2dd4b55352eb318c15e8281b3cc9d8abe23.patch
+https://bugs.gentoo.org/786306
+
+From e581a2dd4b55352eb318c15e8281b3cc9d8abe23 Mon Sep 17 00:00:00 2001
+From: Julien Schueller <schueller@phimeca.com>
+Date: Fri, 14 Aug 2020 09:58:47 +0200
+Subject: [PATCH] Fix deprecated dynamic exception warning
+
+warning: dynamic exception specifications are deprecated in C++11
+--- a/src/include/BCP_buffer.hpp
++++ b/src/include/BCP_buffer.hpp
+@@ -101,13 +101,13 @@ class BCP_buffer{
+ /**@name Modifying methods */
+ /*@{*/
+ /** Position the read head in the buffer. Must be between 0 and size(). */
+- inline void set_position(const int pos) throw(BCP_fatal_error) {
++ inline void set_position(const int pos) {
+ if (pos < 0 || pos > size())
+ throw BCP_fatal_error("Incorrest buffer position setting.\n");
+ _pos = pos;
+ }
+ /** Cut off the end of the buffer. Must be between 0 and size(). */
+- inline void set_size(const int s) throw(BCP_fatal_error) {
++ inline void set_size(const int s) {
+ if (s < 0 || s > size())
+ throw BCP_fatal_error("Incorrest buffer position setting.\n");
+ _size = s;
+@@ -221,7 +221,7 @@ class BCP_buffer{
+ */
+ template <class T> BCP_buffer& unpack(T*& values, int& length,
+ bool allocate = true)
+- throw(BCP_fatal_error) {
++ {
+ if (allocate) {
+ #ifdef PARANOID
+ if (_pos + sizeof(int) > _size)
diff --git a/sci-libs/coinor-bcp/metadata.xml b/sci-libs/coinor-bcp/metadata.xml
index c3a5ce296e0..d88846c101e 100644
--- a/sci-libs/coinor-bcp/metadata.xml
+++ b/sci-libs/coinor-bcp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-bcps/metadata.xml b/sci-libs/coinor-bcps/metadata.xml
index e489508d975..7fee4eba84f 100644
--- a/sci-libs/coinor-bcps/metadata.xml
+++ b/sci-libs/coinor-bcps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-blis/metadata.xml b/sci-libs/coinor-blis/metadata.xml
index 545a08d9a3c..65866c853be 100644
--- a/sci-libs/coinor-blis/metadata.xml
+++ b/sci-libs/coinor-blis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-bonmin/metadata.xml b/sci-libs/coinor-bonmin/metadata.xml
index 8f8219cb431..98d7158cc33 100644
--- a/sci-libs/coinor-bonmin/metadata.xml
+++ b/sci-libs/coinor-bonmin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-cbc/metadata.xml b/sci-libs/coinor-cbc/metadata.xml
index 24b280f305a..68443e3b8b1 100644
--- a/sci-libs/coinor-cbc/metadata.xml
+++ b/sci-libs/coinor-cbc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-cgl/metadata.xml b/sci-libs/coinor-cgl/metadata.xml
index d3478ff5d45..fb5abb11ea4 100644
--- a/sci-libs/coinor-cgl/metadata.xml
+++ b/sci-libs/coinor-cgl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-clp/metadata.xml b/sci-libs/coinor-clp/metadata.xml
index 00d23848636..8a5bed6e5ba 100644
--- a/sci-libs/coinor-clp/metadata.xml
+++ b/sci-libs/coinor-clp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
index 339ce1a0e90..7cae89c1ada 100644
--- a/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
+++ b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
@@ -1,3 +1,6 @@
+https://github.com/coin-or/Couenne/pull/57
+https://github.com/coin-or/Couenne/commit/fdfe17562c59518b4db478ca51c18ab5e01a59a5 (later found post-patch)
+
https://bugs.gentoo.org/792798
From debc5de2d0ac9654c01db080448df064b808c56e Mon Sep 17 00:00:00 2001
diff --git a/sci-libs/coinor-couenne/metadata.xml b/sci-libs/coinor-couenne/metadata.xml
index 52113136717..e5191e273e8 100644
--- a/sci-libs/coinor-couenne/metadata.xml
+++ b/sci-libs/coinor-couenne/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-cppad/metadata.xml b/sci-libs/coinor-cppad/metadata.xml
index be6da625a6d..9e373643ab8 100644
--- a/sci-libs/coinor-cppad/metadata.xml
+++ b/sci-libs/coinor-cppad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-csdp/metadata.xml b/sci-libs/coinor-csdp/metadata.xml
index 1fa24bb63b7..19747ce777f 100644
--- a/sci-libs/coinor-csdp/metadata.xml
+++ b/sci-libs/coinor-csdp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-dip/metadata.xml b/sci-libs/coinor-dip/metadata.xml
index 3e01e7eaf8d..6f9a1359dff 100644
--- a/sci-libs/coinor-dip/metadata.xml
+++ b/sci-libs/coinor-dip/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-dylp/metadata.xml b/sci-libs/coinor-dylp/metadata.xml
index 0766bb7d975..2829ababa7e 100644
--- a/sci-libs/coinor-dylp/metadata.xml
+++ b/sci-libs/coinor-dylp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-flopcpp/metadata.xml b/sci-libs/coinor-flopcpp/metadata.xml
index f3edc8d69d4..71cd1bc29c4 100644
--- a/sci-libs/coinor-flopcpp/metadata.xml
+++ b/sci-libs/coinor-flopcpp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-mp/metadata.xml b/sci-libs/coinor-mp/metadata.xml
index 3ca43d16de0..7eeed3b865d 100644
--- a/sci-libs/coinor-mp/metadata.xml
+++ b/sci-libs/coinor-mp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-netlib/metadata.xml b/sci-libs/coinor-netlib/metadata.xml
index 8069fbe2d1a..98c002b80d8 100644
--- a/sci-libs/coinor-netlib/metadata.xml
+++ b/sci-libs/coinor-netlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
index 2093e3961b6..792b443c5d9 100644
--- a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
+++ b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,6 +10,7 @@ MY_PN=OS
DESCRIPTION="COIN-OR Optimization Services"
HOMEPAGE="https://projects.coin-or.org/OS/"
SRC_URI="http://www.coin-or.org/download/source/${MY_PN}/${MY_PN}-${PV}.tgz"
+S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
LICENSE="EPL-1.0"
SLOT="0/6"
@@ -32,9 +33,9 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
test? ( sci-libs/coinor-sample )"
-S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.1-fix-c++14.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.10.1-fix-c++14.patch"
+)
src_prepare() {
default
@@ -46,6 +47,11 @@ src_prepare() {
src_configure() {
append-cppflags -DNDEBUG
+ # Can be dropped > 2.10.3 as patches landed upstream but don't
+ # apply cleanly to 2.10.1.
+ # bug #808793
+ append-cxxflags -std=c++14
+
econf \
--enable-shared \
$(use_enable static-libs static) \
diff --git a/sci-libs/coinor-os/metadata.xml b/sci-libs/coinor-os/metadata.xml
index 4dcb4259431..ba6fc02b9b6 100644
--- a/sci-libs/coinor-os/metadata.xml
+++ b/sci-libs/coinor-os/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-osi/metadata.xml b/sci-libs/coinor-osi/metadata.xml
index af6af3b5df7..03d23c939f9 100644
--- a/sci-libs/coinor-osi/metadata.xml
+++ b/sci-libs/coinor-osi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-sample/metadata.xml b/sci-libs/coinor-sample/metadata.xml
index 0c216ec09f0..d8eb623fac0 100644
--- a/sci-libs/coinor-sample/metadata.xml
+++ b/sci-libs/coinor-sample/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-smi/metadata.xml b/sci-libs/coinor-smi/metadata.xml
index 79fdb8913b5..190db663c34 100644
--- a/sci-libs/coinor-smi/metadata.xml
+++ b/sci-libs/coinor-smi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-symphony/metadata.xml b/sci-libs/coinor-symphony/metadata.xml
index cecafbcc090..f9f4b36e6d1 100644
--- a/sci-libs/coinor-symphony/metadata.xml
+++ b/sci-libs/coinor-symphony/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-utils/metadata.xml b/sci-libs/coinor-utils/metadata.xml
index c4ba4a30fb7..1068aea82b3 100644
--- a/sci-libs/coinor-utils/metadata.xml
+++ b/sci-libs/coinor-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/coinor-vol/metadata.xml b/sci-libs/coinor-vol/metadata.xml
index 3281553a97d..2a2dd8db133 100644
--- a/sci-libs/coinor-vol/metadata.xml
+++ b/sci-libs/coinor-vol/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/colamd/metadata.xml b/sci-libs/colamd/metadata.xml
index 73165658cfd..3e7a071b27b 100644
--- a/sci-libs/colamd/metadata.xml
+++ b/sci-libs/colamd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index 357b7485b32..91abe0eccbe 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="openmp"
S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/colpack/metadata.xml b/sci-libs/colpack/metadata.xml
index c9aa068b01c..8eda231bb12 100644
--- a/sci-libs/colpack/metadata.xml
+++ b/sci-libs/colpack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cqrlib/metadata.xml b/sci-libs/cqrlib/metadata.xml
index 6973deae4ff..5bc340b2ec6 100644
--- a/sci-libs/cqrlib/metadata.xml
+++ b/sci-libs/cqrlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index fa44cb7a77c..f52f3c13d2d 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
RDEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/sci-libs/cxsparse/metadata.xml b/sci-libs/cxsparse/metadata.xml
index 9c828896662..2aa4c4bf0ff 100644
--- a/sci-libs/cxsparse/metadata.xml
+++ b/sci-libs/cxsparse/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml
index 2752b81d42f..de52092e6f7 100644
--- a/sci-libs/dcmtk/metadata.xml
+++ b/sci-libs/dcmtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 9dc09aab7ee..1ba2ba2ea65 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,5 +1,3 @@
-DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
-DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a44f0dccc4b092c241fadc430facb77ec2a9ffb30d00dc13751f0ac08e2f05960584fbb60b26b64fa070c437f392e2e62b4ba1328e4efcd0677 SHA512 ff04cf3690160119041a9dc102ece81c351c41809fe1717cbc95aa97f2f1fe2ccc36e1b4b3045b73056a54fc7e3a27d3d734908760e9c34203b566b328b104b7
DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
diff --git a/sci-libs/dealii/dealii-9.2.0-r1.ebuild b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
deleted file mode 100644
index fa6f92f0b59..00000000000
--- a/sci-libs/dealii/dealii-9.2.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="https://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dealii/dealii.git"
- SRC_URI=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
- doc? (
- https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
- )"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
- adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
- cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
- +lapack metis mpi muparser nanoflann opencascade p4est petsc
- scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
- p4est? ( mpi )
- slepc? ( petsc )
- trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost
- app-arch/bzip2
- sys-libs/zlib
- adolc? ( sci-libs/adolc )
- arpack? ( sci-libs/arpack[mpi=] )
- assimp? ( media-libs/assimp )
- cuda? ( dev-util/nvidia-cuda-sdk )
- ginkgo? ( sci-libs/ginkgo )
- gmsh? ( sci-libs/gmsh )
- gsl? ( sci-libs/gsl:= )
- hdf5? ( sci-libs/hdf5[mpi=] )
- lapack? ( virtual/lapack )
- metis? (
- >=sci-libs/metis-5
- mpi? ( >=sci-libs/parmetis-4 )
- )
- mpi? ( virtual/mpi )
- muparser? ( dev-cpp/muParser )
- nanoflann? ( sci-libs/nanoflann )
- opencascade? ( sci-libs/opencascade:* )
- p4est? ( sci-libs/p4est[mpi] )
- petsc? ( sci-mathematics/petsc[mpi=] )
- scalapack? ( sci-libs/scalapack )
- slepc? ( sci-mathematics/slepc[mpi=] )
- sparse? ( sci-libs/umfpack )
- sundials? ( <sci-libs/sundials-4:= )
- symengine? ( >=sci-libs/symengine-0.4:= )
- tbb? ( dev-cpp/tbb )
- trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
- "${FILESDIR}"/${PN}-9.2.0-fix-boost-include-file.patch
-)
-
-src_configure() {
- # deal.II needs a custom build type:
- local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
- local mycmakeargs=(
- -DDEAL_II_PACKAGE_VERSION="${PV}"
- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
- -DDEAL_II_ALLOW_AUTODETECTION=OFF
- -DDEAL_II_ALLOW_BUNDLED=OFF
- -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
- -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
- -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
- -DDEAL_II_SHARE_RELDIR="share/${PN}"
- -DDEAL_II_WITH_ZLIB=ON
- -DDEAL_II_WITH_ADOLC="$(usex adolc)"
- -DDEAL_II_WITH_ASSIMP="$(usex assimp)"
- -DDEAL_II_WITH_ARPACK="$(usex arpack)"
- -DDEAL_II_WITH_CUDA="$(usex cuda)"
- -DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
- -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
- -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
- -DDEAL_II_WITH_GMSH="$(usex gmsh)"
- -DDEAL_II_WITH_GSL="$(usex gsl)"
- -DDEAL_II_WITH_HDF5="$(usex hdf5)"
- -DDEAL_II_WITH_LAPACK="$(usex lapack)"
- -DDEAL_II_WITH_METIS="$(usex metis)"
- -DDEAL_II_WITH_MPI="$(usex mpi)"
- -DDEAL_II_WITH_MUPARSER="$(usex muparser)"
- -DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
- -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
- -DDEAL_II_WITH_P4EST="$(usex p4est)"
- -DDEAL_II_WITH_PETSC="$(usex petsc)"
- -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
- -DDEAL_II_WITH_SLEPC="$(usex slepc)"
- -DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
- -DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
- -DDEAL_II_WITH_UMFPACK="$(usex sparse)"
- -DBUILD_SHARED_LIBS="$(usex !static-libs)"
- -DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
- -DDEAL_II_WITH_THREADS="$(usex tbb)"
- -DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
- )
-
- # Do a little dance for purely cosmetic "QA" reasons.
- use opencascade && mycmakeargs+=( -DOPENCASCADE_DIR="${CASROOT}" )
-
- # Do a little dance for purely cosmetic "QA" reasons. The build system
- # does query for the highest instruction set first and skips the other
- # variables if a "higher" variant is set
- if use cpu_flags_x86_avx512f; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- if use doc && [[ ${PV} != *9999* ]]; then
- # copy missing images to the build directory:
- cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
- "${BUILD_DIR}"/doc/doxygen/deal.II || die
- # replace links:
- sed -i \
- 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
- "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
- fi
- cmake-utils_src_install
-
- # decompress the installed example sources:
- use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/dealii-9.3.0-r1.ebuild b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
index 65d0d5b7a33..81010cd4fd9 100644
--- a/sci-libs/dealii/dealii-9.3.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.0-r1.ebuild
@@ -3,13 +3,13 @@
EAPI=7
-inherit cmake multilib
-
# deal.II uses its own FindLAPACK.cmake file that calls into the system
# FindLAPACK.cmake module and does additional internal setup. Do not remove
# any of these modules:
CMAKE_REMOVE_MODULES_LIST=""
+inherit cmake multilib
+
DESCRIPTION="Solving partial differential equations with the finite element method"
HOMEPAGE="https://www.dealii.org/"
diff --git a/sci-libs/dealii/dealii-9.3.1.ebuild b/sci-libs/dealii/dealii-9.3.1.ebuild
index 3b496443757..7e56f6af0e2 100644
--- a/sci-libs/dealii/dealii-9.3.1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1.ebuild
@@ -3,13 +3,13 @@
EAPI=7
-inherit cmake multilib
-
# deal.II uses its own FindLAPACK.cmake file that calls into the system
# FindLAPACK.cmake module and does additional internal setup. Do not remove
# any of these modules:
CMAKE_REMOVE_MODULES_LIST=""
+inherit cmake multilib
+
DESCRIPTION="Solving partial differential equations with the finite element method"
HOMEPAGE="https://www.dealii.org/"
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index fe9accb88f8..9688a1d9171 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -3,13 +3,13 @@
EAPI=7
-inherit cmake multilib
-
# deal.II uses its own FindLAPACK.cmake file that calls into the system
# FindLAPACK.cmake module and does additional internal setup. Do not remove
# any of these modules:
CMAKE_REMOVE_MODULES_LIST=""
+inherit cmake multilib
+
DESCRIPTION="Solving partial differential equations with the finite element method"
HOMEPAGE="https://www.dealii.org/"
diff --git a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
deleted file mode 100644
index 9fc6365d01c..00000000000
--- a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c1a580139f557433a226da437382b3f4307f7c8 Mon Sep 17 00:00:00 2001
-From: Luca Heltai <luca.heltai@sissa.it>
-Date: Wed, 30 Dec 2020 09:54:02 +0100
-Subject: [PATCH] Fix boost include file.
-
----
- source/fe/mapping.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
-index 288a9debcb..4ef3ef7714 100644
---- a/source/fe/mapping.cc
-+++ b/source/fe/mapping.cc
-@@ -20,6 +20,8 @@
-
- #include <deal.II/grid/tria.h>
-
-+#include <boost/geometry.hpp>
-+
- DEAL_II_NAMESPACE_OPEN
-
-
---
-2.26.3
-
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index cfcb25d9e50..e863c0a535e 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
@@ -28,12 +28,10 @@ and extra output. If you want to get meaningful backtraces see
<flag name="opencascade">Add support for opencascade (<pkg>sci-libs/opencascade</pkg>)</flag>
<flag name="p4est">Add support for p4est (<pkg>sci-libs/p4est</pkg>)</flag>
<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
- <flag name="nanoflann">Adds support for nanoflann (<pkg>sci-libs/nanoflann</pkg>)</flag>
<flag name="scalapack">Add support for ScaLAPACK (<pkg>sci-libs/scalapack</pkg>)</flag>
<flag name="slepc">Add support for slepc (<pkg>sci-mathematics/slepc</pkg>)</flag>
<flag name="sparse">Add support for suitesparse (<pkg>sci-libs/suitesparse</pkg>)</flag>
<flag name="symengine">Add support for symengine (<pkg>sci-libs/symengine</pkg>)</flag>
- <flag name="tbb">Add threading support with the help of the tbb library (<pkg>dev-cpp/tbb</pkg>)</flag>
<flag name="trilinos">Add support for trilinos (<pkg>sci-libs/trilinos</pkg>)</flag>
<flag name="assimp">Add support for assimp (<pkg>media-libs/assimp</pkg>)</flag>
<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-sdk</pkg>)</flag>
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
index ea41d6b0930..eee460123e6 100644
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
@@ -1,41 +1,48 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit epatch flag-o-matic toolchain-funcs multilib multilib-minimal
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
DESCRIPTION="Extremely fast library for floating-point convolution"
-HOMEPAGE="http://cr.yp.to/djbfft.html"
-SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
+HOMEPAGE="https://cr.yp.to/djbfft.html"
+SRC_URI="https://cr.yp.to/djbfft/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc3.patch
+ "${FILESDIR}"/${P}-shared.patch
+ "${FILESDIR}"/${P}-headers.patch
+ "${FILESDIR}"/${P}-tc-directly.patch
+)
+
DOCS=( CHANGES README TODO VERSION )
src_prepare() {
- SOVER="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c
- # mask out everything, which is not suggested by the author (RTFM)!
+ default
+
+ # mask out everything which is not suggested by the author (RTFM)!
ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math"
strip-flags
+ SOVER="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c
SONAME="libdjbfft.so.${SOVER}"
- epatch \
- "${FILESDIR}"/${P}-gcc3.patch \
- "${FILESDIR}"/${P}-shared.patch \
- "${FILESDIR}"/${P}-headers.patch
multilib_copy_sources
}
multilib_src_configure() {
+ tc-export AR RANLIB
[[ ${ABI} == x86* ]] && append-cflags -malign-double
sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c || die
echo "$(tc-getCC) ${CFLAGS} -fPIC" > "conf-cc"
echo "$(tc-getCC) ${LDFLAGS}" > "conf-ld"
- echo "${ED}usr" > "conf-home"
+ echo "${ED}/usr" > "conf-home"
einfo "conf-cc: $(<conf-cc)"
}
diff --git a/sci-libs/djbfft/files/djbfft-0.76-headers.patch b/sci-libs/djbfft/files/djbfft-0.76-headers.patch
index 39fb623f10e..e6c82d2eb62 100644
--- a/sci-libs/djbfft/files/djbfft-0.76-headers.patch
+++ b/sci-libs/djbfft/files/djbfft-0.76-headers.patch
@@ -1,36 +1,36 @@
---- strerr.h.orig 1999-09-30 23:25:58.000000000 +0300
-+++ strerr.h 2008-09-13 22:14:09.000000000 +0300
+--- a/strerr.h
++++ b/strerr.h
@@ -1,3 +1,5 @@
+#include <errno.h>
+
#ifndef STRERR_H
#define STRERR_H
---- substdio.h.orig 1999-09-30 23:25:58.000000000 +0300
-+++ substdio.h 2008-09-13 22:13:41.000000000 +0300
+--- a/substdio.h
++++ b/substdio.h
@@ -1,3 +1,5 @@
+#include <errno.h>
+
#ifndef SUBSTDIO_H
#define SUBSTDIO_H
---- speed.c.orig 1999-09-30 23:25:58.000000000 +0300
-+++ speed.c 2008-09-13 19:16:20.352525481 +0300
+--- a/speed.c
++++ b/speed.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <stdlib.h>
#include "fftr4.h"
#include "fftr8.h"
#include "fftc4.h"
---- accuracy2.c.orig 2008-10-10 20:51:06.000000000 +0100
-+++ accuracy2.c 2008-10-10 20:51:55.000000000 +0100
+--- a/accuracy2.c
++++ b/accuracy2.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include "fftc4.h"
---- accuracy.c.orig 2008-10-10 21:03:30.000000000 +0100
-+++ accuracy.c 2008-10-10 21:03:43.000000000 +0100
+--- a/accuracy.c
++++ b/accuracy.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include <stdio.h>
diff --git a/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
new file mode 100644
index 00000000000..340d3b7be6a
--- /dev/null
+++ b/sci-libs/djbfft/files/djbfft-0.76-tc-directly.patch
@@ -0,0 +1,22 @@
+# https://bugs.gentoo.org/731874
+# https://bugs.gentoo.org/725432
+--- a/Makefile
++++ b/Makefile
+@@ -736,7 +736,7 @@ warn-auto.sh systype
+ echo 'rm -f "$$main"'; \
+ echo 'if [ "$${main##*.}" = "a" ]'; \
+ echo 'then'; \
+- echo ' ar cr "$$main" $${1+"$$@"}'; \
++ echo ' $(AR) cr "$$main" $${1+"$$@"}'; \
+ case "`cat systype`" in \
+ sunos-5.*) ;; \
+ unix_sv*) ;; \
+@@ -745,7 +745,7 @@ warn-auto.sh systype
+ dgux-*) ;; \
+ hp-ux-*) ;; \
+ sco*) ;; \
+- *) echo ' ranlib "$$main"' ;; \
++ *) echo ' $(RANLIB) "$$main"' ;; \
+ esac; \
+ echo 'else'; \
+ echo ' exec `head -1 conf-ld` -shared -Wl,-soname,libdjbfft.so.0.7.6 -o "$$main" $${1+"$$@"}'; \
diff --git a/sci-libs/djbfft/metadata.xml b/sci-libs/djbfft/metadata.xml
index bd31424acb9..21a08e24f18 100644
--- a/sci-libs/djbfft/metadata.xml
+++ b/sci-libs/djbfft/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 97d198eb46b..8acdef00ba0 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/dmlc-core/metadata.xml b/sci-libs/dmlc-core/metadata.xml
index a9cd5175551..30a6ba0ac2d 100644
--- a/sci-libs/dmlc-core/metadata.xml
+++ b/sci-libs/dmlc-core/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-mathematics@gentoo.org</email>
diff --git a/sci-libs/dsdp/metadata.xml b/sci-libs/dsdp/metadata.xml
index c7207ec72d7..fc2701d4632 100644
--- a/sci-libs/dsdp/metadata.xml
+++ b/sci-libs/dsdp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/eccodes/metadata.xml b/sci-libs/eccodes/metadata.xml
index a59cfc2a528..5f5824a4a46 100644
--- a/sci-libs/eccodes/metadata.xml
+++ b/sci-libs/eccodes/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nerdboy@gentoo.org</email>
diff --git a/sci-libs/exodusii/metadata.xml b/sci-libs/exodusii/metadata.xml
index b6f57a34706..ce515d40ff3 100644
--- a/sci-libs/exodusii/metadata.xml
+++ b/sci-libs/exodusii/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/fcl/metadata.xml b/sci-libs/fcl/metadata.xml
index 35079633a42..5aa75fb2799 100644
--- a/sci-libs/fcl/metadata.xml
+++ b/sci-libs/fcl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/fetk/fetk-1.5.ebuild b/sci-libs/fetk/fetk-1.5.ebuild
index 96d1ea80984..0f930c60495 100644
--- a/sci-libs/fetk/fetk-1.5.ebuild
+++ b/sci-libs/fetk/fetk-1.5.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
DESCRIPTION="The Finite Element ToolKit - Meta package"
HOMEPAGE="http://fetk.org/"
-SRC_URI=""
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE=""
RDEPEND="
~dev-libs/maloc-${PV}
@@ -18,5 +16,4 @@ RDEPEND="
~sci-libs/gamer-${PV}
~sci-libs/mc-${PV}
~sci-libs/punc-${PV}
- "
-DEPEND=""
+"
diff --git a/sci-libs/fetk/metadata.xml b/sci-libs/fetk/metadata.xml
index d9c1802ed75..089b89e0dcf 100644
--- a/sci-libs/fetk/metadata.xml
+++ b/sci-libs/fetk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
index 574fe036ecf..d13e3c0f530 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
@@ -23,7 +23,16 @@ DEPEND="virtual/cblas
=sci-libs/givaro-4.1*"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-2.3.2-blaslapack.patch" )
+# The no-test-echelon patch works around a test failure that may
+# eventually be fixed upstream. Gentoo bug 725446 and upstream
+# Github issue 282. Same for test-fgesv (bug 807100).
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
+ "${FILESDIR}/${P}-no-test-echelon.patch"
+ "${FILESDIR}/${P}-no-test-fgesv.patch"
+ "${FILESDIR}/${P}-fix-internal-linking.patch"
+ "${FILESDIR}/${P}-no-fabi-version.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
new file mode 100644
index 00000000000..5f085554c33
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
@@ -0,0 +1,70 @@
+From 7c959a3e938a32b386418ddfdfbb884a96762d90 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Aug 2021 08:14:44 -0400
+Subject: [PATCH 1/1] fflas-ffpack/interfaces/libs/Makefile.am: fix internal
+ linking.
+
+This is just,
+
+ https://github.com/linbox-team/fflas-ffpack/pull/339
+
+but rebased onto the old release tarball.
+---
+ fflas-ffpack/interfaces/libs/Makefile.am | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/fflas-ffpack/interfaces/libs/Makefile.am b/fflas-ffpack/interfaces/libs/Makefile.am
+index 8c56746..449f6e4 100644
+--- a/fflas-ffpack/interfaces/libs/Makefile.am
++++ b/fflas-ffpack/interfaces/libs/Makefile.am
+@@ -24,7 +24,6 @@ pkgincludesubdir=$(pkgincludedir)/interfaces/libs
+
+ AM_CXXFLAGS = @DEFAULT_CFLAGS@
+ AM_CPPFLAGS = -I$(top_srcdir) #/fflas-ffpack/utils/ -I$(top_srcdir)/fflas-ffpack/fflas/ -I$(top_srcdir)/fflas-ffpack/ffpack -I$(top_srcdir)/fflas-ffpack/field
+-LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS)
+ #AM_LDFLAGS=-static
+
+
+@@ -55,31 +54,26 @@ libfflas_la_SOURCES= fflas_L1_inst.C \
+ fflas_L3_inst.C \
+ fflas_L3_inst_implem.inl
+
+-libfflas_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined
++libfflas_la_LIBADD= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS)
++libfflas_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+ libffpack_la_SOURCES= ffpack_inst.C \
+ ffpack_inst_implem.inl
+-libffpack_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
+-
+-EXTRA_libffpack_la_DEPENDENCIES= libfflas.la
++libffpack_la_LIBADD= libfflas.la
++libffpack_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+ libfflas_c_la_SOURCES=fflas_lvl1.C \
+ fflas_lvl2.C \
+ fflas_lvl3.C \
+ fflas_sparse.C
+ #libfflas_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
+-libfflas_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
+-
+-EXTRA_libfflas_c_la_DEPENDENCIES=libfflas.la
++libfflas_c_la_LIBADD= libfflas.la
++libfflas_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+ libffpack_c_la_SOURCES=ffpack.C
+ #libffpack_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
+-libffpack_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined -lfflas -lffpack
+-EXTRA_libffpack_c_la_DEPENDENCIES=libffpack.la
++libffpack_c_la_LIBADD= libffpack.la
++libffpack_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+
+ EXTRA_DIST=c_libs.doxy
+--
+2.31.1
+
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch
new file mode 100644
index 00000000000..48ae6c37166
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch
@@ -0,0 +1,31 @@
+From 11364be98b200405630117d5eebb33bfdbc8c19e Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Aug 2021 12:09:39 -0400
+Subject: [PATCH 1/1] configure.ac: don't append -fabi-version=6 to CXXFLAGS.
+
+This is a quick hack to avoid appending -fabi-version=6 to CXXFLAGS.
+Both givaro and fflas-ffpack have problems with this legacy cruft
+that are fixed upstream but tough to backport. We don't support
+compilers that old, so we can just delete it.
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 571d923..616b2f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,10 +179,6 @@ AC_SUBST(SIMD_FLAGS)
+ dnl gcc-4.9.2 bug See https://trac.sagemath.org/ticket/17635#comment:178
+ AS_IF([ test "x$CCNAM" = "xgcc492" ],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fpermissive"],[])
+
+-dnl With GCC's default ABI version, a __m128 or __m256 are the same types and therefore we cannot
+-dnl have overloads for both types without linking error.
+-AS_IF([test "x$CCNAM" = "xgcc"],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6"],[])
+-
+ AC_SUBST(REQUIRED_FLAGS)
+
+ PARFLAGS="${OMPFLAGS}"
+--
+2.31.1
+
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch
new file mode 100644
index 00000000000..0b8b68fa609
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch
@@ -0,0 +1,39 @@
+From 5be5c93ed41d0136730477beccad7b9f21d47e86 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 26 May 2020 09:45:50 -0400
+Subject: [PATCH 1/1] tests: disable test_echelon.
+
+There are two reported failures of test_echelon on Gentoo and Conda
+that the Gentoo maintainers haven't been able to reproduce yet. Until
+upstream has a chance to look at the failures, this commit disables
+that particular test.
+
+Gentoo-bug: https://bugs.gentoo.org/724526
+Upstream-bug: https://github.com/linbox-team/fflas-ffpack/issues/282
+---
+ tests/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 4326820..62e92bc 100755
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -56,7 +56,6 @@ BASIC_TESTS = \
+ test-rankprofiles \
+ test-det \
+ test-det-check \
+- test-echelon \
+ test-charpoly \
+ test-charpoly-check \
+ test-minpoly \
+@@ -119,7 +118,6 @@ test_ftrsm_check_SOURCES = test-ftrsm-check.C
+ test_invert_check_SOURCES = test-invert-check.C
+ test_charpoly_check_SOURCES = test-charpoly-check.C
+ test_minpoly_SOURCES = test-minpoly.C
+-test_echelon_SOURCES = test-echelon.C
+ test_rankprofiles_SOURCES = test-rankprofiles.C
+ test_fgemm_SOURCES = test-fgemm.C
+ test_fger_SOURCES = test-fger.C
+--
+2.26.2
+
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch
new file mode 100644
index 00000000000..a995c051856
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch
@@ -0,0 +1,37 @@
+From 3f7a5f601e73491ac7c39cc848fa98fe6224978c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 16 Aug 2021 21:19:39 -0400
+Subject: [PATCH 1/1] tests/Makefile.am: disable test-fgesv.
+
+This test can fail on Gentoo, and has been reported upstream. In the
+meantime, having it fail on end users is no good, so we disable it.
+
+Gentoo-bug: https://bugs.gentoo.org/807100
+Upstream-bug: https://github.com/linbox-team/fflas-ffpack/issues/341
+---
+ tests/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 62e92bc..83cf71f 100755
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -63,7 +63,6 @@ BASIC_TESTS = \
+ test-io \
+ test-maxdelayeddim \
+ test-solve \
+- test-fgesv \
+ test-simd \
+ test-fgemv \
+ test-nullspace \
+@@ -143,7 +142,6 @@ test_ftrtri_SOURCES = test-ftrtri.C
+ # test_fullranksubmatrix_SOURCES = test-fullranksubmatrix.C
+ # test_invert_SOURCES = test-invert.C
+ # test_krylov_elim_SOURCES = test-krylov-elim.C
+-test_fgesv_SOURCES = test-fgesv.C
+ # test_frobenius_SOURCES = test-frobenius.C
+ test_nullspace_SOURCES = test-nullspace.C
+ test_fdot_SOURCES = test-fdot.C
+--
+2.31.1
+
diff --git a/sci-libs/fflas-ffpack/metadata.xml b/sci-libs/fflas-ffpack/metadata.xml
index a12fc81f426..3dd66b794a3 100644
--- a/sci-libs/fflas-ffpack/metadata.xml
+++ b/sci-libs/fflas-ffpack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index a4327766903..77f9c12fde3 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1 +1,2 @@
+DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
new file mode 100644
index 00000000000..c8a32cdc88e
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="https://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} == *9999 ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+ SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
+RESTRICT="!test? ( test )"
+
+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
+
+HTML_DOCS=( doc/html/. )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ tc-check-openmp
+ FORTRAN_NEED_OPENMP=1
+ fi
+
+ fortran-2_pkg_setup
+ MULTIBUILD_VARIANTS=( single double longdouble )
+}
+
+src_prepare() {
+ default
+
+ # fix info file for category directory
+ [[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --enable-shared
+ --disable-static
+ $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+ $(use_enable fortran)
+ $(use_enable zbus mips-zbus-timer)
+ $(use_enable threads)
+ $(use_enable openmp)
+ )
+
+ [[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
+
+ # --enable-quad-precision is a brittle feature that requires
+ # __float128 support from the toolchain, which is lacking on
+ # most niche architectures. Bug #770346
+ case "${MULTIBUILD_ID}" in
+ single-*)
+ # altivec, sse, single-paired only work for single
+ myconf+=(
+ --enable-single
+ $(use_enable cpu_flags_ppc_altivec altivec)
+ $(use_enable cpu_flags_x86_avx avx)
+ $(use_enable cpu_flags_x86_avx2 avx2)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable cpu_flags_arm_neon neon)
+ $(use_enable mpi)
+ )
+ ;;
+
+ double-*)
+ myconf+=(
+ $(use_enable cpu_flags_x86_avx avx)
+ $(use_enable cpu_flags_x86_avx2 avx2)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable mpi)
+ )
+ ;;
+
+ longdouble-*)
+ myconf+=(
+ --enable-long-double
+ $(use_enable mpi)
+ )
+ ;;
+
+ *)
+ die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+ ;;
+ esac
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
+}
+
+src_configure() {
+ # upstream does not append proper -m flags
+ # https://bugs.gentoo.org/698572
+ use cpu_flags_x86_avx2 && append-flags -mavx2
+
+ multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+ emake -C tests smallcheck
+}
+
+src_test() {
+ # We want this to be a reasonably quick test, but that is still hard...
+ ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+ # Do not increase the number of threads, it will not help your performance
+ # local testbase="perl check.pl --nthreads=1 --estimate"
+ # ${testbase} -${p}d || die "Failure: $n"
+
+ multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant multilib-minimal_src_install
+ dodoc CONVENTIONS
+
+ if use doc; then
+ dodoc doc/*.pdf
+ docinto faq
+ dodoc -r doc/FAQ/fftw-faq.html/.
+ else
+ rm -r "${ED}"/usr/share/doc/${PF}/html || die
+ fi
+
+ augment_pc_files() {
+ local x
+ for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
+ local u
+ for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+ sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die
+ done
+ done
+ }
+ multilib_foreach_abi augment_pc_files
+
+ # fftw uses pkg-config to record its private dependencies
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index cbd8e2451a7..e377ed60541 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
+HOMEPAGE="https://www.fftw.org/"
MY_P=${PN}-${PV/_p/-pl}
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
else
- SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+ SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 23c52fd7f3d..c8a32cdc88e 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
+HOMEPAGE="https://www.fftw.org/"
MY_P=${PN}-${PV/_p/-pl}
@@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
else
- SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
+S="${WORKDIR}/${MY_P}"
+
LICENSE="GPL-2+"
SLOT="3.0/3"
IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus"
RESTRICT="!test? ( test )"
-RDEPEND="
- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
-BDEPEND="
- test? ( dev-lang/perl )"
+BDEPEND="test? ( dev-lang/perl )"
-S="${WORKDIR}/${MY_P}"
HTML_DOCS=( doc/html/. )
pkg_pretend() {
@@ -65,6 +64,7 @@ multilib_src_configure() {
$(use_enable threads)
$(use_enable openmp)
)
+
[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
# --enable-quad-precision is a brittle feature that requires
@@ -147,13 +147,16 @@ src_install() {
rm -r "${ED}"/usr/share/doc/${PF}/html || die
fi
- local x
- for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
- local u
- for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
- sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+ augment_pc_files() {
+ local x
+ for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
+ local u
+ for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+ sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die
+ done
done
- done
+ }
+ multilib_foreach_abi augment_pc_files
# fftw uses pkg-config to record its private dependencies
find "${ED}" -name '*.la' -delete || die
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index bf126e2d080..1a94d1573c4 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml
index 176a3633b94..a90e992e191 100644
--- a/sci-libs/flann/metadata.xml
+++ b/sci-libs/flann/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 7f69fe9daa2..2dc55c1776f 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,2 +1 @@
-DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af71829c6d52f2065155bf75f075965a41918722d095546ca18e8e87a85f181a76f5e42abd20c8de8165210bab SHA512 eacd990c468b1d919e1d6cc04f99656d982d5a3807970e0a1dd910a2703eb5b8eff913bc5c0e45790a547bb7aa71189fb9022024186bb84ee04d8602c9980ac2
DIST fplll-5.4.0.tar.gz 2612340 BLAKE2B 723230856461ac6418dad00e82fc7505dbbb7bfbbf68fa7f4f3240402d62f3e1ded3049c436a0f6aad9f020727d10acb3fe15dfb8b8a907f5b3c7b191e55e9a9 SHA512 a583aac73e4618ba240c28d3e8485cef6b9c184c11b33799404e96ab99502023073ed1c6fc0d3fbc4e6737415e9ea1a273f3f1e59ccba69d1546f56903567ebe
diff --git a/sci-libs/fplll/fplll-5.3.2.ebuild b/sci-libs/fplll/fplll-5.3.2.ebuild
deleted file mode 100644
index f204635f77e..00000000000
--- a/sci-libs/fplll/fplll-5.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementations of the floating-point LLL reduction algorithm"
-HOMEPAGE="https://github.com/fplll/fplll"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/6"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-BDEPEND=""
-DEPEND="dev-libs/gmp:0
- dev-libs/mpfr:0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- # Support for --with-qd is problematic at the moment.
- # https://github.com/fplll/fplll/issues/405
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/fplll/fplll-5.4.0.ebuild b/sci-libs/fplll/fplll-5.4.0.ebuild
index ecdf4079d97..577db2e4a49 100644
--- a/sci-libs/fplll/fplll-5.4.0.ebuild
+++ b/sci-libs/fplll/fplll-5.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0/7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="static-libs qd"
BDEPEND="qd? ( virtual/pkgconfig )"
diff --git a/sci-libs/fplll/metadata.xml b/sci-libs/fplll/metadata.xml
index c23c111ba1f..7ea4c6f6f50 100644
--- a/sci-libs/fplll/metadata.xml
+++ b/sci-libs/fplll/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/galib/metadata.xml b/sci-libs/galib/metadata.xml
index c5d86554ee6..3f494288128 100644
--- a/sci-libs/galib/metadata.xml
+++ b/sci-libs/galib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/gamer/metadata.xml b/sci-libs/gamer/metadata.xml
index 8425c0d53cb..7d3acaf5d25 100644
--- a/sci-libs/gamer/metadata.xml
+++ b/sci-libs/gamer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/gaul-devel/metadata.xml b/sci-libs/gaul-devel/metadata.xml
index 3bbf26aecb8..fadab987428 100644
--- a/sci-libs/gaul-devel/metadata.xml
+++ b/sci-libs/gaul-devel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index c67ec7c7e6f..d95391c7dd0 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -3,3 +3,4 @@ DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16
DIST gdal-3.2.3.tar.gz 18970990 BLAKE2B 9f2ac15b7e9d2df0393d15734030ec4777579aa01fcf2700958228b24fd50d574f3bd438c03e767549614a699c362b31f38cbb0f32ceb8056c9b55fab11ecfec SHA512 985a058a53f676f7d49a96d1a48d4f93c5da8548012bf81345afde03d8044022b210484290bca70c3d7a1ef3b0087d9e17c636b5badd1e0816c1f59b1bf21ee8
DIST gdal-3.3.0.tar.gz 19572446 BLAKE2B afc7ce3c2191fb7607fdf3a01e7ed3e83c601fa063019015f666e0c550e4e42129b8782568f20f97422308f95b4e5c3dbd2311d562b7ec0830635e47e7c931b4 SHA512 39505c07aaf4dac587a189a979462101a7acba41e8732031540ebad02e089820658943ebb48c20f4ea56548363033b2db2f03f41c8a91ff5c5997a19b5eb999e
DIST gdal-3.3.1.tar.gz 19582883 BLAKE2B 328ba9f3c6a2ecca8583648e5f22469d3fbabf8d8676262a15c6debe718be8329ad3899cbe5397dff2896bc9c2500b60834c6a44cd0f5b670828d86838611f0d SHA512 0eb89502f1cebd5dd899fb8f20571952462c45aba6cee1d62ccc820b2fed5202f6c7e7096bd4ca6c0cfcc2de623f00295097a7e33da6ffa5624dcb8a7a0dc682
+DIST gdal-3.3.2.tar.gz 19593819 BLAKE2B ab0919468482d080be9317f7d766ac8b7bd7a534a490a93ee29cab9ea5c68bef3827a256a6d13455d5ee8f4e6cf71a8a42fb173d1543282b04dea59c9378cf22 SHA512 ceacd101f770fecad12fec7fea5ba63c2a6d96413bdaa7f460798704fce1ff7a4f20b0b4a0785c195131aa8ee25990239a9e2da6844010b8f0c575f584d9b4a8
diff --git a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
new file mode 100644
index 00000000000..a727d21dab6
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch
@@ -0,0 +1,32 @@
+From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sun, 26 Sep 2021 22:49:52 +0200
+Subject: [PATCH] Fix build against Poppler master
+
+---
+ frmts/pdf/pdfdataset.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
+index 9c4c28a6572..50a8154c756 100644
+--- a/frmts/pdf/pdfdataset.cpp
++++ b/frmts/pdf/pdfdataset.cpp
+@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ #ifdef HAVE_POPPLER
+ if (bUseLib.test(PDFLIB_POPPLER))
+ {
+- GooString* poMetadata = poCatalogPoppler->readMetadata();
++ auto poMetadata = poCatalogPoppler->readMetadata();
+ if (poMetadata)
+ {
+ #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ const char * const apszMDList[2] = { pszContent, nullptr };
+ poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
+ }
++#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9))
+ delete poMetadata;
++#endif
+ }
+
+ /* Read Info object */
diff --git a/sci-libs/gdal/gdal-3.3.1.ebuild b/sci-libs/gdal/gdal-3.3.1.ebuild
index a81cf8d3765..6f159190767 100644
--- a/sci-libs/gdal/gdal-3.3.1.ebuild
+++ b/sci-libs/gdal/gdal-3.3.1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
DISTUTILS_OPTIONAL=1
inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
SLOT="0/3.3"
LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
REQUIRED_USE="
diff --git a/sci-libs/gdal/gdal-3.3.2-r1.ebuild b/sci-libs/gdal/gdal-3.3.2-r1.ebuild
new file mode 100644
index 00000000000..75f85938c60
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.3.2-r1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+ mdb? ( java )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ spatialite? ( sqlite )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ java? (
+ dev-java/ant-core
+ dev-lang/swig:0
+ >=virtual/jdk-1.8:*
+ )
+ perl? ( dev-lang/swig:0 )
+ python? (
+ dev-lang/swig:0
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="
+ dev-libs/expat
+ dev-libs/json-c:=
+ dev-libs/libpcre
+ dev-libs/libxml2:2
+ dev-libs/openssl:=
+ media-libs/tiff
+ >=sci-libs/libgeotiff-1.5.1-r1:=
+ >=sci-libs/proj-6.0.0:=
+ sys-libs/zlib[minizip(+)]
+ armadillo? ( sci-libs/armadillo:=[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio:= )
+ geos? ( >=sci-libs/geos-3.8.0 )
+ gif? ( media-libs/giflib:= )
+ gml? ( >=dev-libs/xerces-c-3.1 )
+ heif? ( media-libs/libheif:= )
+ hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+ jpeg? ( virtual/jpeg:0= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ lzma? ( || (
+ app-arch/xz-utils
+ app-arch/lzma
+ ) )
+ mdb? ( dev-java/jackcess:1 )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf:= )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( sci-libs/ogdi )
+ opencl? ( virtual/opencl )
+ oracle? ( dev-db/oracle-instantclient:= )
+ pdf? ( app-text/poppler:= )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ spatialite? ( dev-db/spatialite )
+ sqlite? ( dev-db/sqlite:3 )
+ webp? ( media-libs/libwebp:= )
+ xls? ( dev-libs/freexl )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.3-soname.patch"
+ "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+ "${FILESDIR}/${PN}-3.3.0-libdir.patch"
+ "${FILESDIR}/${P}-poppler-21.10.0.patch"
+)
+
+src_prepare() {
+ default
+
+ # Drop a --prefix hack in the upstream build system
+ # We don't want the line at all, so let's just drop it rather than
+ # trying to put in the right libdir value.
+ # bug #696106
+ sed -e '/\$ADD_PREFIX\/lib/d' \
+ -i configure.ac || die
+
+ sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+ -i configure.ac || die
+
+ sed -e 's:^ar:$(AR):g' \
+ -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+ # SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+ sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+ -i swig/python/GNUmakefile || die "sed python makefile failed"
+
+ # autoconf 2.70+
+ # bug #775209
+ config_rpath_update .
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ # charls - not packaged in Gentoo ebuild repository
+ # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+ # bsb - legal issues
+ # ingres - same story as oracle oci
+ # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+ # podofo - we use poppler instead they are exclusive for each other
+ # tiff is a hard dep
+ --includedir="${EPREFIX}"/usr/include/${PN}
+ --disable-lto
+ --disable-static
+ --disable-driver-bsb
+ --disable-driver-mrf
+ --disable-pdf-plugin
+ --enable-shared
+ --enable-driver-grib
+ --with-bash-completion="$(get_bashcompdir)"
+ --with-cpp14
+ --with-crypto
+ --with-cryptopp=no
+ --with-expat
+ --with-geotiff
+ --with-gnm
+ --with-hide-internal-symbols
+ --with-libjson-c="${EPREFIX}"/usr
+ --with-libtiff
+ --with-libtool
+ --with-libz="${EPREFIX}"/usr
+ --without-charls
+ --without-dods-root
+ --without-ecw
+ --without-fgdb
+ --without-fme
+ --without-gta
+ --without-grass
+ --without-hdf4
+ --without-idb
+ --without-ingres
+ --without-jasper
+ --without-jp2lura
+ --without-jp2mrsid
+ --without-kakadu
+ --without-kea
+ --without-libkml
+ --without-mongocxx
+ --without-mrsid
+ --without-mrsid_lidar
+ --without-msg
+ --without-rasdaman
+ --without-rasterlite2
+ --without-pcraster
+ --without-pdfium
+ --without-perl
+ --without-podofo
+ --without-python
+ --without-qhull
+ --without-sfcgal
+ --without-sosi
+ --without-teigha
+ $(use_enable debug)
+ $(use_with armadillo)
+ $(use_with aux-xml pam)
+ $(use_with curl)
+ $(use_with cpu_flags_x86_avx avx)
+ $(use_with cpu_flags_x86_sse sse)
+ $(use_with cpu_flags_x86_ssse3 ssse3)
+ $(use_with fits cfitsio)
+ $(use_with geos)
+ $(use_with gif)
+ $(use_with gml xerces)
+ $(use_with heif)
+ $(use_with hdf5)
+ $(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+ $(use_with jpeg)
+ $(use_with jpeg2k openjpeg)
+ $(use_with lzma liblzma)
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+ $(use_with netcdf)
+ $(use_with oracle oci)
+ $(use_with odbc)
+ $(use_with ogdi ogdi "${EPREFIX}"/usr)
+ $(use_with opencl)
+ $(use_with pdf poppler)
+ $(use_with png)
+ $(use_with postgres pg)
+ $(use_with spatialite)
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+ $(use_with threads)
+ $(use_with webp)
+ $(use_with xls freexl)
+ $(use_with zstd)
+ )
+
+ tc-export AR RANLIB
+
+ if use java; then
+ myconf+=(
+ --with-java=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-lib=dlopen
+ $(use_with mdb)
+ )
+ else
+ myconf+=( --without-java --without-mdb )
+ fi
+
+ if use sqlite; then
+ append-libs -lsqlite3
+ fi
+
+ # bug #632660
+ if use ogdi; then
+ append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+ append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+ # mysql-config puts this in (and boy is it a PITA to get it out)
+ if use mysql; then
+ sed -e "s: -rdynamic : :" \
+ -i GDALmake.opt || die "sed LIBS failed"
+ fi
+}
+
+src_compile() {
+ if use perl; then
+ rm "${S}"/swig/perl/*_wrap.cpp || die
+ emake -C "${S}"/swig/perl generate
+ fi
+
+ # gdal-config needed before generating Python bindings
+ default
+
+ if use java; then
+ pushd "${S}"/swig/java > /dev/null || die
+ emake
+ popd > /dev/null || die
+ fi
+
+ if use perl; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null || die
+ fi
+
+ if use python; then
+ rm -f "${S}"/swig/python/*_wrap.cpp || die
+ emake -C "${S}"/swig/python generate
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+
+ use doc && emake docs
+}
+
+src_install() {
+ local DOCS=( NEWS )
+ use doc && local HTML_DOCS=( html/. )
+
+ default
+
+ use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+ if use perl; then
+ pushd "${S}"/swig/perl > /dev/null || die
+ myinst=( DESTDIR="${D}" )
+ perl-module_src_install
+ popd > /dev/null || die
+ perl_delete_localpod
+ fi
+
+ if use python; then
+ # Don't clash with gdal's docs
+ unset DOCS HTML_DOCS
+
+ pushd "${S}"/swig/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+
+ newdoc swig/python/README.rst README-python.rst
+ fi
+
+ doman "${S}"/man/man*/*
+ find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index 2c386a679fc..ba24c3b77d3 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
@@ -19,6 +19,7 @@
<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
<flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag>
<flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
+ <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
<flag name="mdb">Enable support for Microsoft Access database</flag>
<flag name="ogdi">Enable support for the open geographic datastore interface (<pkg>sci-libs/ogdi</pkg>)</flag>
<flag name="opencl">Enable OpenCL support</flag>
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 2c13200ecfa..e05d89eaa6b 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,4 @@
+DIST geos-3.10.0.tar.bz2 6799370 BLAKE2B dd1490318fccda8ccaf5152f8521ab98ef5e4b143e12e861d02124421985a8b2c966bca6f966aa167fb60f703d25c132b8c7ee4d61e382a449bce5eb40d4cb89 SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e
DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28
diff --git a/sci-libs/geos/geos-3.10.0.ebuild b/sci-libs/geos/geos-3.10.0.ebuild
new file mode 100644
index 00000000000..28033433e14
--- /dev/null
+++ b/sci-libs/geos/geos-3.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="https://trac.osgeo.org/geos/"
+SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION=$(usex doc)
+
+ # bug #709368
+ $(usex arm '-DDISABLE_GEOS_INLINE=ON' '')
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ use doc && cmake_src_compile docs
+}
+
+src_install() {
+ cmake_src_install
+
+ if use doc ; then
+ HTML_DOCS=( "${BUILD_DIR}"/doc/doxygen_docs/html/. )
+ einstalldocs
+ fi
+}
diff --git a/sci-libs/geos/geos-3.9.1.ebuild b/sci-libs/geos/geos-3.9.1.ebuild
index d3601008f05..0f0e8c246b1 100644
--- a/sci-libs/geos/geos-3.9.1.ebuild
+++ b/sci-libs/geos/geos-3.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.t
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="doc static-libs"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/geos/metadata.xml b/sci-libs/geos/metadata.xml
index ff68ab052ff..0999c9f48f9 100644
--- a/sci-libs/geos/metadata.xml
+++ b/sci-libs/geos/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-libs/gerris/metadata.xml b/sci-libs/gerris/metadata.xml
index cbf216a3902..31d103bb29c 100644
--- a/sci-libs/gerris/metadata.xml
+++ b/sci-libs/gerris/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/getdata/metadata.xml b/sci-libs/getdata/metadata.xml
index 7a03fbedeac..b968be6857d 100644
--- a/sci-libs/getdata/metadata.xml
+++ b/sci-libs/getdata/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index 935ba5909f2..4a45be486a9 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -1 +1 @@
-DIST ginkgo-1.1.1.tar.gz 11787690 BLAKE2B 75c2c9b2d1e9ba00e3b0a20859af621cdf4aefe7c6e5ec9c7fc34a5368e5bee70d7d2b86ed9b2d9075ab7cc1a3334434fe20329d780f693be45fd7707cdbe27f SHA512 ab8f2d36453f4e60a4e0a13eddc4a137006c1cc6c9c0db00997dd721dfc06f4401109c5a22ba23a838206cff576d5041d06edaed8823006e69f11e360d1dadce
+DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
diff --git a/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch b/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
deleted file mode 100644
index 9feceee00f7..00000000000
--- a/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
-index 8a8ad04..03c6db6 100644
---- a/cmake/build_helpers.cmake
-+++ b/cmake/build_helpers.cmake
-@@ -17,6 +17,9 @@ function(ginkgo_compile_features name)
- if(GINKGO_WITH_IWYU AND GINKGO_IWYU_PATH)
- set_property(TARGET "${name}" PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${GINKGO_IWYU_PATH})
- endif()
-+ # Set an appropriate SONAME
-+ set_property(TARGET "${name}" PROPERTY
-+ SOVERSION "${Ginkgo_VERSION}")
- if(GINKGO_CHANGED_SHARED_LIBRARY)
- # Put all shared libraries and corresponding imported libraries into the specified path
- set_property(TARGET "${name}" PROPERTY
diff --git a/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
deleted file mode 100644
index 6d9b7f42768..00000000000
--- a/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Numerical linear algebra software package"
-HOMEPAGE="https://ginkgo-project.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
- SRC_URI=""
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-IUSE="+openmp cuda"
-
-RDEPEND="
- cuda? ( dev-util/nvidia-cuda-sdk )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.1-set_soname.patch
-)
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && \
- use openmp && ! tc-has-openmp ; then
- die "Need an OpenMP capable compiler"
- fi
-}
-
-src_prepare() {
- sed -i \
- -e "s#\"lib\"#\"$(get_libdir)\"#g" \
- -e "s#\"lib/#\"$(get_libdir)/#g" \
- cmake/install_helpers.cmake || die "sed failed"
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
-
- local mycmakeargs=(
- -DGINKGO_DEVEL_TOOLS=OFF
- -DGINKGO_BUILD_TESTS=OFF
- -DGINKGO_BUILD_BENCHMARKS=OFF
- -DGINKGO_BUILD_REFERENCE=ON
- -DGINKGO_BUILD_OMP="$(usex openmp)"
- -DGINKGO_BUILD_CUDA="$(usex cuda)"
- )
- cmake-utils_src_configure
-}
diff --git a/sci-libs/ginkgo/ginkgo-9999.ebuild b/sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild
index 6d9b7f42768..84dae4aa427 100644
--- a/sci-libs/ginkgo/ginkgo-9999.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild
@@ -1,16 +1,15 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Numerical linear algebra software package"
HOMEPAGE="https://ginkgo-project.github.io/"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
- SRC_URI=""
inherit git-r3
else
SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -22,13 +21,10 @@ SLOT="0"
IUSE="+openmp cuda"
RDEPEND="
- cuda? ( dev-util/nvidia-cuda-sdk )"
+ cuda? ( dev-util/nvidia-cuda-sdk )
+"
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.1-set_soname.patch
-)
-
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]] && \
use openmp && ! tc-has-openmp ; then
@@ -42,7 +38,7 @@ src_prepare() {
-e "s#\"lib/#\"$(get_libdir)/#g" \
cmake/install_helpers.cmake || die "sed failed"
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -52,8 +48,8 @@ src_configure() {
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_BUILD_REFERENCE=ON
- -DGINKGO_BUILD_OMP="$(usex openmp)"
- -DGINKGO_BUILD_CUDA="$(usex cuda)"
+ -DGINKGO_BUILD_OMP=$(usex openmp)
+ -DGINKGO_BUILD_CUDA=$(usex cuda)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/sci-libs/ginkgo/metadata.xml b/sci-libs/ginkgo/metadata.xml
index 2b6a2c10b33..604252f3caf 100644
--- a/sci-libs/ginkgo/metadata.xml
+++ b/sci-libs/ginkgo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
diff --git a/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch b/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch
new file mode 100644
index 00000000000..0564c7f94fe
--- /dev/null
+++ b/sci-libs/givaro/files/givaro-4.1.1-gcc-10.patch
@@ -0,0 +1,36 @@
+From 5ba9fa4930b347aea8817da444bea5a88971079a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Aug 2021 11:43:29 -0400
+Subject: [PATCH 1/1] configure: hack out old GCC-4.x test.
+
+The Givaro ./configure script fails to detect modern versions of GCC,
+instead deciding that they must be gcc-4.8. As a result, we wind up
+with "-fabi-version=6" in CXXFLAGS, which then gets propagated to
+users of "givaro-config --cflags", like fflas-ffpack.
+
+This is already fixed upstream, but not in a release, and not in a
+way that I care to backport. Here we just hack the configure script
+directly since the change is so trivial.
+---
+ configure | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure b/configure
+index 1eb75b0..f3bbb52 100755
+--- a/configure
++++ b/configure
+@@ -17172,11 +17172,6 @@ fi
+
+ echo "-----------------------------------------------"
+
+-if test "x$CCNAM" = "xgcc48"; then :
+- REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6"
+-fi
+-
+-
+
+ # Machine characteristics
+
+--
+2.31.1
+
diff --git a/sci-libs/givaro/givaro-4.1.1-r2.ebuild b/sci-libs/givaro/givaro-4.1.1-r2.ebuild
new file mode 100644
index 00000000000..2e76210dd2e
--- /dev/null
+++ b/sci-libs/givaro/givaro-4.1.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ library for arithmetic and algebraic computations"
+HOMEPAGE="https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/"
+SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="CeCILL-B"
+SLOT="0/9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ doc? (
+ app-doc/doxygen[dot]
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+"
+DEPEND="dev-libs/gmp:0[cxx(+)]"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/givaro-4.1.1-gcc-10.patch" )
+
+src_configure() {
+ # Passing "--disable-doc" also accidentally enables building
+ # the documentation, so we can't just $(use_enable doc) here.
+ # https://github.com/linbox-team/givaro/issues/148
+ econf \
+ $(usex doc --enable-doc "" "" "") \
+ --with-docdir="/usr/share/doc/${PF}/html" \
+ $(use_enable static-libs static) \
+ $(use_enable cpu_flags_x86_fma3 fma) \
+ $(use_enable cpu_flags_x86_fma4 fma4) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable cpu_flags_x86_sse2 sse2) \
+ $(use_enable cpu_flags_x86_sse3 sse3) \
+ $(use_enable cpu_flags_x86_ssse3 ssse3) \
+ $(use_enable cpu_flags_x86_sse4_1 sse41) \
+ $(use_enable cpu_flags_x86_sse4_2 sse42) \
+ $(use_enable cpu_flags_x86_avx avx) \
+ $(use_enable cpu_flags_x86_avx2 avx2)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/givaro/metadata.xml b/sci-libs/givaro/metadata.xml
index 3172f8a0102..91e58ef1027 100644
--- a/sci-libs/givaro/metadata.xml
+++ b/sci-libs/givaro/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index d0057e753b7..d9e4bc7d1c1 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,2 +1 @@
-DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94eeeea SHA512 9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45
DIST gmsh-4.8.4-source.tgz 13838352 BLAKE2B 26c7f68e41d1c339c7d5fd499b2261c2ce79c38648df9f4f3853ba69421d59be36992d8aac1d1ebc1fe872bb828769693c12fd9770878fa3b59c179176105ea4 SHA512 c3880e67af03aa6d00300b5f56fd229ffe37da9af66e8c7c87a3bbf7abcb3a90b4858ec76093ef8f039a70d4da1d5cc7f7c687c05b6642299c95e1a07f9513bf
diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
deleted file mode 100644
index df5ea5533a0..00000000000
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png python X zlib"
-
-REQUIRED_USE="med? ( mpi )"
-
-RDEPEND="
- virtual/fortran
- X? ( x11-libs/fltk:1 )
- blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
- cgns? ( sci-libs/cgnslib )
- jpeg? ( virtual/jpeg:0 )
- med? ( sci-libs/med[mpi] )
- opencascade? ( sci-libs/opencascade:* )
- png? ( media-libs/libpng:0 )
- petsc? ( sci-mathematics/petsc[mpi=] )
- zlib? ( sys-libs/zlib )
- mpi? ( virtual/mpi[cxx] )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- python? ( dev-lang/swig:0 )
- "
-
-S=${WORKDIR}/${P}-source
-
-pkg_setup() {
- fortran-2_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=( )
-
- use blas && \
- mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
- mycmakeargs+=(
- -DENABLE_BLAS_LAPACK="$(usex blas)"
- -DENABLE_CGNS="$(usex cgns)"
- -DENABLE_FLTK="$(usex X)"
- -DENABLE_GRAPHICS="$(usex X)"
- -DENABLE_MED="$(usex med)"
- -DENABLE_MPI="$(usex mpi)"
- -DENABLE_METIS="$(usex metis)"
- -DENABLE_NETGEN="$(usex netgen)"
- -DENABLE_OCC="$(usex opencascade)"
- -DENABLE_PETSC="$(usex petsc)"
- -DENABLE_WRAP_PYTHON="$(usex python)")
-
- cmake-utils_src_configure mycmakeargs
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- insinto /usr/share/doc/${PF}
- doins -r demos tutorial
- fi
-}
diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index 20c781af95c..4b35b67a85c 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 099284fea1d..79e6a006700 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,6 +1,2 @@
-DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe588fe4371ae85447bc6574b7798721a8559fda747ee656de96e7d8c5657901db86dc9c59bcee27789c918222e38f SHA512 55a2dab850697b1e378ecf64d299ed6f021f1b1eb7dbad749f5014e5b7f275ec6c981a5699a87969c4d0794677efa51a5a2317526b58ca96aabb3f6a68cabd81
-DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb
-DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
-DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in
deleted file mode 100644
index a2580f85e6e..00000000000
--- a/sci-libs/gsl/files/cblas.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
-includedir=${prefix}/include
-
-Name: cblas
-Description: GSL C Implementation of the Basic Linear Algebra Subprograms
-Version: @PV@
-URL: http://www.gnu.org/software/gsl
-Libs: -L${libdir} -lcblas
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/sci-libs/gsl/files/eselect.cblas.gsl b/sci-libs/gsl/files/eselect.cblas.gsl
deleted file mode 100644
index af6fee51fef..00000000000
--- a/sci-libs/gsl/files/eselect.cblas.gsl
+++ /dev/null
@@ -1,5 +0,0 @@
-libgslcblas.so /usr/@LIBDIR@/libcblas.so
-libgslcblas.so.0 /usr/@LIBDIR@/libcblas.so.0
-libgslcblas.a /usr/@LIBDIR@/libcblas.a
-../blas/gsl/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
-gsl/gsl_cblas.h /usr/include/cblas.h
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
deleted file mode 100644
index eac9c3b6f75..00000000000
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch flag-o-matic autotools toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
- https://dev.gentoo.org/~mgorny/dist/${P}-cblas.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external static-libs"
-
-RDEPEND="
- cblas-external? ( virtual/cblas )
- app-eselect/eselect-cblas"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
-
-pkg_pretend() {
- # prevent to use external cblas from a previously installed gsl
- local current_lib
- if use cblas-external; then
- current_lib=$(eselect cblas show | cut -d' ' -f2)
- if [[ ${current_lib} == gsl ]]; then
- ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
- ewarn "However the current selected external cblas is gsl."
- ewarn "Please install and/or eselect another cblas"
- die "Circular gsl dependency"
- fi
- fi
-}
-
-src_prepare() {
- ESELECT_PROF="gsl"
-
- # bug 349005
- [[ $(tc-getCC)$ == *gcc* ]] && \
- [[ $(tc-getCC)$ != *apple* ]] && \
- [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
- && filter-mfpmath sse
- filter-flags -ffast-math
-
- epatch "${WORKDIR}"/${P}-cblas.patch
- eautoreconf
-
- cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die
- sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
- "${T}"/eselect.cblas.gsl || die
- fi
-}
-
-src_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- econf \
- --enable-shared \
- $(use_with cblas-external) \
- $(use_enable static-libs static)
-}
-
-src_test() {
- emake -j1 check
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} + || die
-
- # take care of pkgconfig file for cblas implementation.
- sed -e "s/@LIBDIR@/$(get_libdir)/" \
- -e "s/@PV@/${PV}/" \
- -e "/^prefix=/s:=:=${EPREFIX}:" \
- -e "/^libdir=/s:=:=${EPREFIX}:" \
- "${FILESDIR}"/cblas.pc.in > cblas.pc \
- || die "sed cblas.pc failed"
- insinto /usr/$(get_libdir)/blas/gsl
- doins cblas.pc
- eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
- ${ESELECT_PROF}
-}
-
-pkg_postinst() {
- local p=cblas
- local current_lib=$(eselect ${p} show | cut -d' ' -f2)
- if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
- # work around eselect bug #189942
- local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
- [[ -e ${configfile} ]] && rm -f ${configfile}
- eselect ${p} set ${ESELECT_PROF}
- elog "${p} has been eselected to ${ESELECT_PROF}"
- else
- elog "Current eselected ${p} is ${current_lib}"
- elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
- elog "\t eselect ${p} set ${ESELECT_PROF}"
- fi
-}
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
deleted file mode 100644
index f9cbafbd975..00000000000
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
- https://dev.gentoo.org/~mgorny/dist/${PN}-2.3-cblas.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external +deprecated static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${WORKDIR}"/${PN}-2.3-cblas.patch )
-
-src_prepare() {
- # bug 349005
- [[ $(tc-getCC)$ == *gcc* ]] && \
- [[ $(tc-getCC)$ != *apple* ]] && \
- [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
- && filter-mfpmath sse
- filter-flags -ffast-math
-
- default
- if use deprecated; then
- sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
- fi
- eautoreconf
-}
-
-src_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- econf \
- --enable-shared \
- $(use_with cblas-external) \
- $(use_enable static-libs static)
-}
-
-src_test() {
- local MAKEOPTS="${MAKEOPTS} -j1"
- default
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
index 885b6815816..1f76267c23d 100644
--- a/sci-libs/gsl/gsl-2.7.ebuild
+++ b/sci-libs/gsl/gsl-2.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0/25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="cblas-external +deprecated static-libs"
RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 4a8296b2f94..bc6b9fcfdd1 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 2ce0a8b48a5..3a6449d4a08 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="test" # bug #277165
diff --git a/sci-libs/gts/metadata.xml b/sci-libs/gts/metadata.xml
index 9980dad1bf1..dab9c96e633 100644
--- a/sci-libs/gts/metadata.xml
+++ b/sci-libs/gts/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/h5hut/h5hut-1.99.13.ebuild b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
index 5eca8e34f1d..8401f646884 100644
--- a/sci-libs/h5hut/h5hut-1.99.13.ebuild
+++ b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,9 +15,11 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+# < dep on hdf5 because of bug #809221
+# Needs a proper fix.
DEPEND="
virtual/mpi
- sci-libs/hdf5[mpi]
+ <sci-libs/hdf5-1.12[mpi]
"
RDEPEND="${DEPEND}"
diff --git a/sci-libs/h5hut/metadata.xml b/sci-libs/h5hut/metadata.xml
index 903883b48f1..125513d74f6 100644
--- a/sci-libs/h5hut/metadata.xml
+++ b/sci-libs/h5hut/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>junghans@gentoo.org</email>
diff --git a/sci-libs/h5part/metadata.xml b/sci-libs/h5part/metadata.xml
index 903883b48f1..125513d74f6 100644
--- a/sci-libs/h5part/metadata.xml
+++ b/sci-libs/h5part/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>junghans@gentoo.org</email>
diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
index b2ff7488868..21cf98fc16d 100644
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar
SLOT="0"
LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples fortran szip static-libs test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( szip )"
diff --git a/sci-libs/hdf/metadata.xml b/sci-libs/hdf/metadata.xml
index fedc7089f83..15ed11bf817 100644
--- a/sci-libs/hdf/metadata.xml
+++ b/sci-libs/hdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 64df5831a55..bd0243d2494 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1 +1,2 @@
DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
+DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
diff --git a/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch b/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch
new file mode 100644
index 00000000000..8c4dc34cb80
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.12.1-cmake_installdirs.patch
@@ -0,0 +1,103 @@
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -180,8 +180,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,13 @@
+ endif()
+ endif ()
+
++include (GNUInstallDirs)
++set (HDF5_INSTALL_BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
++set (HDF5_INSTALL_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
++set (HDF5_INSTALL_DOC_DIR "${CMAKE_INSTALL_FULL_DOCDIR}")
++set (HDF5_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
++set (HDF5_INSTALL_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++
+ #-----------------------------------------------------------------------------
+ # Instructions for use : Sub-Project Build
+ #
+--- a/fortran/src/CMakeLists.txt
++++ b/fortran/src/CMakeLists.txt
+@@ -537,8 +537,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/hl/c++/src/CMakeLists.txt
++++ b/hl/c++/src/CMakeLists.txt
+@@ -91,8 +91,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/hl/fortran/src/CMakeLists.txt
++++ b/hl/fortran/src/CMakeLists.txt
+@@ -324,8 +324,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/hl/src/CMakeLists.txt
++++ b/hl/src/CMakeLists.txt
+@@ -123,8 +123,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1311,8 +1311,8 @@
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+@@ -1419,7 +1419,7 @@
+ # )
+ install (
+ DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html
+- DESTINATION ${HDF5_INSTALL_DATA_DIR}
++ DESTINATION ${HDF5_INSTALL_DOC_DIR}
+ COMPONENT Documents
+ )
+
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index 97cebb298aa..b7aac278849 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
LICENSE="NCSA-HDF"
SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
REQUIRED_USE="
diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
new file mode 100644
index 00000000000..a445755a129
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+
+inherit cmake flag-o-matic fortran-2
+
+MY_P="${PN}-${PV/_p/-patch}"
+MAJOR_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug doc examples fortran +hl mpi ros3 szip test threads unsupported zlib"
+
+REQUIRED_USE="
+ !unsupported? (
+ mpi? ( !cxx !threads )
+ threads? ( !cxx !fortran !hl )
+ )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ mpi? ( virtual/mpi[romio] )
+ ros3? (
+ net-misc/curl
+ dev-libs/openssl:=
+ )
+ szip? ( virtual/szip )
+ zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+ app-doc/doxygen
+ virtual/latex-base
+)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.1-cmake_installdirs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+
+ if use mpi; then
+ if has_version 'sci-libs/hdf5[-mpi]'; then
+ ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+ ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+ fi
+ export CC="mpicc"
+ use fortran && export FC="mpif90"
+ append-libs -lmpi
+ elif has_version 'sci-libs/hdf5[mpi]'; then
+ ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+ ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # Workaround needed to allow build with USE=fortran when an older
+ # version is installed. See bug #808633 and
+ # https://github.com/HDFGroup/hdf5/issues/1027 upstream.
+ -DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=ON
+ -DBUILD_STATIC_LIBS=OFF
+ -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+ -DHDF5_BUILD_EXAMPLES=OFF
+ -DALLOW_UNSUPPORTED=$(usex unsupported)
+ -DBUILD_TESTING=$(usex test)
+ -DHDF5_BUILD_CPP_LIB=$(usex cxx)
+ -DHDF5_BUILD_DOC=$(usex doc)
+ -DHDF5_BUILD_FORTRAN=$(usex fortran)
+ -DHDF5_BUILD_HL_LIB=$(usex hl)
+ -DHDF5_ENABLE_CODESTACK=$(usex debug)
+ -DHDF5_ENABLE_PARALLEL=$(usex mpi)
+ -DHDF5_ENABLE_SZIP_ENCODING=$(usex szip)
+ -DHDF5_ENABLE_SZIP_SUPPORT=$(usex szip)
+ -DHDF5_ENABLE_THREADSAFE=$(usex threads)
+ -DHDF5_ENABLE_Z_LIB_SUPPORT=$(usex zlib)
+ -DHDF5_ENABLE_ROS3_VFD:BOOL=$(usex ros3)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # TODO: generate functioning example runners from their respective
+ # .in files - as of version 1.12.1 upstream only has it implemented
+ # for autoconf.
+ if use examples; then
+ # These are all useless outside the source tree
+ rm -f {examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+ rm -f hl/{examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+
+ dodoc -r examples
+ if use cxx; then
+ docinto c++
+ dodoc -r c++/examples
+ fi
+ if use fortran; then
+ docinto fortran
+ dodoc -r fortran/examples
+ fi
+ if use hl; then
+ docinto hl
+ dodoc -r hl/examples
+ if use cxx; then
+ docinto hl/c++
+ dodoc -r hl/c++/examples
+ fi
+ if use fortran; then
+ docinto hl/fortran
+ dodoc -r hl/fortran/examples
+ fi
+ fi
+ fi
+}
diff --git a/sci-libs/hdf5/hdf5-1.12.1.ebuild b/sci-libs/hdf5/hdf5-1.12.1.ebuild
new file mode 100644
index 00000000000..c5ef043111b
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+
+inherit cmake flag-o-matic fortran-2
+
+MY_P="${PN}-${PV/_p/-patch}"
+MAJOR_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug doc examples fortran +hl mpi szip test threads unsupported zlib"
+
+REQUIRED_USE="
+ !unsupported? (
+ mpi? ( !cxx !threads )
+ threads? ( !cxx !fortran !hl )
+ )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ mpi? ( virtual/mpi[romio] )
+ szip? ( virtual/szip )
+ zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+ app-doc/doxygen
+ virtual/latex-base
+)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.1-cmake_installdirs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+
+ if use mpi; then
+ if has_version 'sci-libs/hdf5[-mpi]'; then
+ ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+ ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+ fi
+ export CC="mpicc"
+ use fortran && export FC="mpif90"
+ append-libs -lmpi
+ elif has_version 'sci-libs/hdf5[mpi]'; then
+ ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+ ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_STATIC_LIBS=OFF
+ -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+ -DHDF5_BUILD_EXAMPLES=OFF
+ -DALLOW_UNSUPPORTED=$(usex unsupported)
+ -DBUILD_TESTING=$(usex test)
+ -DHDF5_BUILD_CPP_LIB=$(usex cxx)
+ -DHDF5_BUILD_DOC=$(usex doc)
+ -DHDF5_BUILD_FORTRAN=$(usex fortran)
+ -DHDF5_BUILD_HL_LIB=$(usex hl)
+ -DHDF5_ENABLE_CODESTACK=$(usex debug)
+ -DHDF5_ENABLE_PARALLEL=$(usex mpi)
+ -DHDF5_ENABLE_SZIP_ENCODING=$(usex szip)
+ -DHDF5_ENABLE_SZIP_SUPPORT=$(usex szip)
+ -DHDF5_ENABLE_THREADSAFE=$(usex threads)
+ -DHDF5_ENABLE_Z_LIB_SUPPORT=$(usex zlib)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # TODO: generate functioning example runners from their respective
+ # .in files - as of version 1.12.1 upstream only has it implemented
+ # for autoconf.
+ if use examples; then
+ # These are all useless outside the source tree
+ rm -f {examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+ rm -f hl/{examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+
+ dodoc -r examples
+ if use cxx; then
+ docinto c++
+ dodoc -r c++/examples
+ fi
+ if use fortran; then
+ docinto fortran
+ dodoc -r fortran/examples
+ fi
+ if use hl; then
+ docinto hl
+ dodoc -r hl/examples
+ if use cxx; then
+ docinto hl/c++
+ dodoc -r hl/c++/examples
+ fi
+ if use fortran; then
+ docinto hl/fortran
+ dodoc -r hl/fortran/examples
+ fi
+ fi
+ fi
+}
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 2fa4f45de1b..042059bcd49 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</maintainer>
<longdescription>
- HDF5 is a file format and library for storing scientific data. HDF5
- was designed and implemented to address the deficiencies of HDF4.x. It
- has a more powerful and flexible data model, supports files larger
- than 2 GB, and supports parallel I/O.
-</longdescription>
+ HDF5 is a file format and library for storing scientific data. HDF5
+ was designed and implemented to address the deficiencies of HDF4.x. It
+ has a more powerful and flexible data model, supports files larger
+ than 2 GB, and supports parallel I/O.
+ </longdescription>
<use>
<flag name="hl">Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)</flag>
+ <flag name="ros3">Enable support for read-only S3 access (https://portal.hdfgroup.org/display/HDF5/Configuration+and+Setup+for+HDF5+Read+Only+S3+VFD)</flag>
<flag name="unsupported">Enable unsupported combinations of configuration options</flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/hipCUB/metadata.xml b/sci-libs/hipCUB/metadata.xml
index d9e9ab75810..427b0618536 100644
--- a/sci-libs/hipCUB/metadata.xml
+++ b/sci-libs/hipCUB/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml
index 9759bea23f0..693bc03ef76 100644
--- a/sci-libs/hipSPARSE/metadata.xml
+++ b/sci-libs/hipSPARSE/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index 3aac577a0cf..230f4325182 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1 +1 @@
-DIST htslib-1.10.2.tar.bz2 1306320 BLAKE2B f877bd9c160921f498f4160f687094a1a369732bc9f61cd94a3c9ca311fa9f865505a205e38e0d348a1010b627f1ef07b590cd7e69c945df1d804133b17b2fd1 SHA512 3ecb83b0abccf731cd42b889e352e10dd922524f6e78bcafb04f8c6c71457b0dc1f5f22690b36f03cce7d97a6a905db286243ef4858138068dcac368e4ae1075
+DIST htslib-1.13.tar.bz2 4226834 BLAKE2B ae1f64e564f0f7bea80ea9d276b5d5b2b04fa3c8bd58f2c68966225b4324962f34d8a26b74267ab90dc530dfced1b9c01702d25918fd7a7c74e13913f00d5007 SHA512 16a3d61c115b71406bc4411a0c1176909166b52c4f7bb11614e398df4defaec4d09763413053e4d0d5916921c866d20019096d8fed866e77f9f1cafbd1e95b16
diff --git a/sci-libs/htslib/htslib-1.10.2.ebuild b/sci-libs/htslib/htslib-1.13.ebuild
index 67a341be70e..cfd9cfb3263 100644
--- a/sci-libs/htslib/htslib-1.10.2.ebuild
+++ b/sci-libs/htslib/htslib-1.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
@@ -15,9 +15,10 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+bzip2 curl +lzma"
RDEPEND="
- bzip2? ( app-arch/bzip2:= )
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
curl? ( net-misc/curl )
- lzma? ( app-arch/xz-utils:= )"
+ lzma? ( app-arch/xz-utils )"
DEPEND="${RDEPEND}"
src_prepare() {
diff --git a/sci-libs/htslib/metadata.xml b/sci-libs/htslib/metadata.xml
index 5b953af488a..003b4a9e53f 100644
--- a/sci-libs/htslib/metadata.xml
+++ b/sci-libs/htslib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
diff --git a/sci-libs/hypre/metadata.xml b/sci-libs/hypre/metadata.xml
index 0f8ab9b1a46..b525b702f84 100644
--- a/sci-libs/hypre/metadata.xml
+++ b/sci-libs/hypre/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-mathematics@gentoo.org</email>
diff --git a/sci-libs/idlcoyote/metadata.xml b/sci-libs/idlcoyote/metadata.xml
index 298edd42842..e89bab8154b 100644
--- a/sci-libs/idlcoyote/metadata.xml
+++ b/sci-libs/idlcoyote/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-astronomy@gentoo.org</email>
diff --git a/sci-libs/idlmarkwardt/metadata.xml b/sci-libs/idlmarkwardt/metadata.xml
index 70e03dfd63b..e390bc9f6eb 100644
--- a/sci-libs/idlmarkwardt/metadata.xml
+++ b/sci-libs/idlmarkwardt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/ignition-common/Manifest b/sci-libs/ignition-common/Manifest
index b17f5a45c39..06f51a1327e 100644
--- a/sci-libs/ignition-common/Manifest
+++ b/sci-libs/ignition-common/Manifest
@@ -1 +1 @@
-DIST ignition-common3_3.5.0.tar.gz 6984379 BLAKE2B decc26506544a58075583d302dbae30148bc22d750864bae3816722516a21d191dcdc5dc9376a026a103575d9489f038d3fc9e296c062c32ac076e9fea28d2ab SHA512 109161e55e51a6a37fb137f64e0cf3041c72bfc2030e3b8c09ecf9f81c57b3687a8a4d9e0142520fd9d0dfbf02cba2f123e01e9407ec046b0f134dbfdaf535f0
+DIST ignition-common3_3.11.1.tar.gz 7130569 BLAKE2B c352c4750e6ec865dbe2ec08c32166235e167eaf33ed3be0ab31bd530e1f45b9449eb19733685d61a480c2d2e8b812a3a3bb72fdf184a08fd1813303bfab5947 SHA512 7521df7719163e7d2cf835857b068bb6aab62fd326ca6938c681dd3737c8391e467ad6a00ec96685310e1c8bb2fc853631346620f527bd008191ed8f8255932a
diff --git a/sci-libs/ignition-common/ignition-common-3.5.0.ebuild b/sci-libs/ignition-common/ignition-common-3.11.1.ebuild
index c2bbe8a822a..5cdee005071 100644
--- a/sci-libs/ignition-common/ignition-common-3.5.0.ebuild
+++ b/sci-libs/ignition-common/ignition-common-3.11.1.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_BUILD_TYPE=RelWithDebInfo
-inherit cmake-utils
+inherit cmake
IGN_MAJOR=3
DESCRIPTION="Set of libraries designed to rapidly develop robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libs/common https://github.com/ignitionrobotics/ign-common"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-common"
SRC_URI="https://github.com/ignitionrobotics/ign-common/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="${IGN_MAJOR}"
KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
+#RESTRICT="!test? ( test )"
+# tests dont even build
+RESTRICT="test"
RDEPEND="
dev-libs/tinyxml2:=
@@ -34,7 +37,7 @@ S="${WORKDIR}/ign-common-${PN}${IGN_MAJOR}_${PV}"
src_configure() {
local mycmakeargs=(
- "-DBUILD_TESTING=OFF"
+ "-DBUILD_TESTING=$(usex test)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/sci-libs/ignition-common/metadata.xml b/sci-libs/ignition-common/metadata.xml
index c3e61fabcf5..87532696a9a 100644
--- a/sci-libs/ignition-common/metadata.xml
+++ b/sci-libs/ignition-common/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/ignition-fuel-tools/Manifest b/sci-libs/ignition-fuel-tools/Manifest
index 3d548d905cd..0228fe7c006 100644
--- a/sci-libs/ignition-fuel-tools/Manifest
+++ b/sci-libs/ignition-fuel-tools/Manifest
@@ -1 +1 @@
-DIST ignition-fuel-tools4_4.1.0.tar.gz 451260 BLAKE2B aef6b1ca08e0d0c2099593c5d13842c5f73b6f041aea23aae57cc563ec624139331c45012f044212a53dfe82bfab6316caa51896785dd7e905c0950b3b91ca93 SHA512 7116460749870968508a0368435edfcc28f54128b2def0d93fa48e6f6ac961d27e0f0ff52ff70979ee4e626ee4cc0d5b421180487c1973ed844a1b16479466d3
+DIST ignition-fuel-tools4_4.4.0.tar.gz 403685 BLAKE2B d363eb6e0287024883322b39eaf92ab29e6b253f85b59c65a5196d3a9ad3327728d00fdbeda3bebee7ae7871684ad85ab13a973fc9bdddf9d0e2a5333c8f8e4f SHA512 975c0f77167d6d05e3eb90cb9747e0575e7b0c7b7adfb17a72e68244cf1e656a08f52b3101cfa203435d6ad44ba1483fa20ab66a597c1a1678bf1fdd08599cb6
diff --git a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild
index 1441ea0a5da..366864363d5 100644
--- a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild
+++ b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_BUILD_TYPE=RelWithDebInfo
-inherit cmake-utils
+inherit cmake
IGN_MAJOR=4
DESCRIPTION="Classes and tools for interacting with Ignition Fuel"
-HOMEPAGE="https://ignitionrobotics.org/libs/fuel_tools https://ignitionrobotics.org/libs/fuel_tools"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-fuel-tools/"
SRC_URI="https://github.com/ignitionrobotics/ign-fuel-tools/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
LICENSE="Apache-2.0"
@@ -40,5 +40,5 @@ src_configure() {
local mycmakeargs=(
"-DBUILD_TESTING=$(usex test)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/sci-libs/ignition-fuel-tools/metadata.xml b/sci-libs/ignition-fuel-tools/metadata.xml
index b0a55265c08..70c7ab91a78 100644
--- a/sci-libs/ignition-fuel-tools/metadata.xml
+++ b/sci-libs/ignition-fuel-tools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index e00617dd31f..694e1c92b68 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1 +1 @@
-DIST ignition-math6_6.5.0.tar.gz 539313 BLAKE2B 0ec7b5a4e8eac4161fd2df607c18f905bbfb12923373e2c74e435da8cd98926feac7e6b5434f7a335888a273757786872cc7cc3d0dd4f1e342a5ce488f07420d SHA512 ea8702339ffa1a76bb8aded17c83a620568edec472bf0722997a7f907ed07ead0d2e89356055835f9ee6dcc462066bdbc67cf07c01e0efe4e1b8fb3e4d2407fa
+DIST ignition-math6_6.8.0.tar.gz 550137 BLAKE2B 3d4375aa3afc9de7061d01ac7bdee72285576ddfb373450f0b4b82e00b381e93ab6f9b44055069b504e30f3340ac6a7672577dc85f436d1cfa2218ab12336757 SHA512 a8d6ae93176b443f0187e9c6f7ae87b3112fdf1b9eaf77c727749530dd33da5001b6b0bf74cefa7a2fe16bafaed185c31d21a4ab727e2d7e55698445b0589b71
diff --git a/sci-libs/ignition-math/ignition-math-6.5.0.ebuild b/sci-libs/ignition-math/ignition-math-6.8.0.ebuild
index ab724f9e7b7..fc7acfaa88c 100644
--- a/sci-libs/ignition-math/ignition-math-6.5.0.ebuild
+++ b/sci-libs/ignition-math/ignition-math-6.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
inherit cmake vcs-snapshot
DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/math"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-math"
SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/sci-libs/ignition-math/metadata.xml b/sci-libs/ignition-math/metadata.xml
index cd92ae6d0f4..6d71f37175a 100644
--- a/sci-libs/ignition-math/metadata.xml
+++ b/sci-libs/ignition-math/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/iml/metadata.xml b/sci-libs/iml/metadata.xml
index 673326db1e8..6627d365245 100644
--- a/sci-libs/iml/metadata.xml
+++ b/sci-libs/iml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/inchi/metadata.xml b/sci-libs/inchi/metadata.xml
index 8937bad0b17..e490bcb8aa8 100644
--- a/sci-libs/inchi/metadata.xml
+++ b/sci-libs/inchi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index c0292c69364..7ba7dfd7f4c 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,4 +1,2 @@
-DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
-DIST indilib-1.8.9.tar.gz 2253721 BLAKE2B 477880606867ef58e334efeb8d891996187833cdb2f6344018a47c36ad51cfe983e645d92be3e868246bc8dd730d51927834ad73efb2db5edb2ce238ae6d32f6 SHA512 7d561e3619a1ff9e4ec96c54d339f5a85b6d2f4adde57630044fa7f2a8d70c74488ab22eb6221de62c0738bb9c9d187b86b67c4e47f4f98a237d4f69731fe906
-DIST indilib-1.9.0.tar.gz 2291283 BLAKE2B 1ef715cfb388a686ad2121e1fcf2589a5d88e68e5cbdb11d72797dead63032782c32e9ae16a88304e59bb0cbb53aaefb6b919125b566958884cc252607c876d5 SHA512 7b02afb24bb2b71a7384c045af6654bb1e19f9b0fe525b31ad0ff3ecc5f1c4b9d53e4f9af225ae3845bd17d44cb7cb2274a72e331498828a2098a9984488b28e
DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
+DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
diff --git a/sci-libs/indilib/indilib-1.8.8.ebuild b/sci-libs/indilib/indilib-1.8.8.ebuild
deleted file mode 100644
index 7aa68380cde..00000000000
--- a/sci-libs/indilib/indilib-1.8.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ogg test websocket"
-
-RDEPEND="
- net-misc/curl
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- sci-libs/libnova:=
- sys-libs/zlib
- virtual/jpeg:0
- virtual/libusb:0
- ogg? (
- media-libs/libogg
- media-libs/libtheora
- )
- websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-kernel/linux-headers )
- test? ( >=dev-cpp/gtest-1.8.0 )
- websocket? ( dev-cpp/websocketpp )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P/lib/}"
-
-src_configure() {
- local mycmakeargs=(
- -DINDI_BUILD_QT5_CLIENT=OFF
- -DINDI_BUILD_UNITTESTS=$(usex test)
- -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
- $(cmake_use_find_package ogg OggTheora)
- -DINDI_BUILD_WEBSOCKET=$(usex websocket)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.9.0.ebuild b/sci-libs/indilib/indilib-1.9.0.ebuild
deleted file mode 100644
index d133f7e4225..00000000000
--- a/sci-libs/indilib/indilib-1.9.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="ogg test websocket"
-
-RDEPEND="
- net-misc/curl
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- sci-libs/libnova:=
- sys-libs/zlib
- virtual/jpeg:0
- virtual/libusb:0
- ogg? (
- media-libs/libogg
- media-libs/libtheora
- )
- websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-kernel/linux-headers )
- test? ( >=dev-cpp/gtest-1.8.0 )
- websocket? ( dev-cpp/websocketpp )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P/lib/}"
-
-src_configure() {
- local mycmakeargs=(
- -DINDI_BUILD_QT5_CLIENT=OFF
- -DINDI_BUILD_UNITTESTS=$(usex test)
- -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
- $(cmake_use_find_package ogg OggTheora)
- -DINDI_BUILD_WEBSOCKET=$(usex websocket)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
index c67a2b8eea5..15d77f70204 100644
--- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="ogg rtlsdr test websocket"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/indilib/indilib-1.8.9.ebuild b/sci-libs/indilib/indilib-1.9.2.ebuild
index dd34c66f11c..c1484d7e649 100644
--- a/sci-libs/indilib/indilib-1.8.9.ebuild
+++ b/sci-libs/indilib/indilib-1.9.2.ebuild
@@ -1,18 +1,21 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake udev
DESCRIPTION="INDI Astronomical Control Protocol library"
HOMEPAGE="https://www.indilib.org/"
SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/lib/}"
LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
SLOT="0/1"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE="ogg test websocket"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ogg rtlsdr test websocket"
+
+RESTRICT="!test? ( test )"
RDEPEND="
net-misc/curl
@@ -27,6 +30,7 @@ RDEPEND="
media-libs/libogg
media-libs/libtheora
)
+ rtlsdr? ( net-wireless/rtl-sdr )
websocket? ( dev-libs/boost:= )
"
DEPEND="${RDEPEND}
@@ -35,16 +39,13 @@ DEPEND="${RDEPEND}
websocket? ( dev-cpp/websocketpp )
"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P/lib/}"
-
src_configure() {
local mycmakeargs=(
-DINDI_BUILD_QT5_CLIENT=OFF
- -DINDI_BUILD_UNITTESTS=$(usex test)
-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
$(cmake_use_find_package ogg OggTheora)
+ $(cmake_use_find_package rtlsdr RTLSDR)
+ -DINDI_BUILD_UNITTESTS=$(usex test)
-DINDI_BUILD_WEBSOCKET=$(usex websocket)
)
diff --git a/sci-libs/indilib/metadata.xml b/sci-libs/indilib/metadata.xml
index b761949cc94..9442ce431ec 100644
--- a/sci-libs/indilib/metadata.xml
+++ b/sci-libs/indilib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/sci-libs/io_lib/Manifest b/sci-libs/io_lib/Manifest
index fc4032b6e8d..8e2e6e6a3a0 100644
--- a/sci-libs/io_lib/Manifest
+++ b/sci-libs/io_lib/Manifest
@@ -1,2 +1 @@
-DIST io_lib-1.14.14.tar.gz 6681583 BLAKE2B 192dbd073ac901c4d6f04a20a674bbbaa6c7bc1eb353c22a99feb3c9540ba82cbeaf3272b674e97199a2aac97f73219086f78c45809d491cc968d320f6cab411 SHA512 ccca26f41d48d6bce42218b1f510a7ff2691da7aa65ab8e83b353cfa1a32b3bb9470e17c3bb9e4f2beea190f719d003ee69e68769eb178859c5826e44ffa83d1
DIST io_lib-1.14.7.tar.gz 2177248 BLAKE2B 6c1a8133a0f0edd253bf0c475cb206294f95659efc82679034f36d8eb963e4020b953f18c0ccfefa6dad61daffbd054513d36a7bdf0e725b8c5a943d98e0d567 SHA512 c1021f0a0dd284e8abbf9cc1dd11995550cf6621455c873effaab56b573fee053ed9e55879003c735c26c403a0aa34d75be87d337cd515cc912706abe7e08665
diff --git a/sci-libs/io_lib/io_lib-1.14.14.ebuild b/sci-libs/io_lib/io_lib-1.14.14.ebuild
deleted file mode 100644
index d6d07fabe00..00000000000
--- a/sci-libs/io_lib/io_lib-1.14.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="General purpose trace and experiment file reading/writing interface"
-HOMEPAGE="http://staden.sourceforge.net/ https://github.com/jkbonfield/io_lib"
-SRC_URI="https://github.com/jkbonfield/${PN}/releases/download/${PN}-${PV//./-}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="
- app-arch/bzip2:=
- app-arch/xz-utils:=
- net-misc/curl:=
- sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-# tests fails and might need sci-biology/staden from
-# the science overlay
-RESTRICT="test"
-
-src_configure() {
- econf $(use static-libs static)
-}
-
-src_install() {
- default
- dodoc docs/{Hash_File_Format,ZTR_format}
-
- if ! use static-libs; then
- find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
- fi
-}
diff --git a/sci-libs/io_lib/metadata.xml b/sci-libs/io_lib/metadata.xml
index e4325132e2d..07698c90cc1 100644
--- a/sci-libs/io_lib/metadata.xml
+++ b/sci-libs/io_lib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/ipopt/metadata.xml b/sci-libs/ipopt/metadata.xml
index fa265c7e52e..465f5eae75b 100644
--- a/sci-libs/ipopt/metadata.xml
+++ b/sci-libs/ipopt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/itpp/metadata.xml b/sci-libs/itpp/metadata.xml
index 6606a6014ad..00e200e64c1 100644
--- a/sci-libs/itpp/metadata.xml
+++ b/sci-libs/itpp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/jama/metadata.xml b/sci-libs/jama/metadata.xml
index 5052beb3f7f..c3eed4e8d3f 100644
--- a/sci-libs/jama/metadata.xml
+++ b/sci-libs/jama/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
index 382cc9d362c..e640d34d62a 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit distutils-r1
DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
diff --git a/sci-libs/keras-applications/metadata.xml b/sci-libs/keras-applications/metadata.xml
index f195797ab3a..00ca801f532 100644
--- a/sci-libs/keras-applications/metadata.xml
+++ b/sci-libs/keras-applications/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>perfinion@gentoo.org</email>
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
index 9b72af9e284..a864e1a8965 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit distutils-r1
MY_PN="Keras_Preprocessing"
diff --git a/sci-libs/keras-preprocessing/metadata.xml b/sci-libs/keras-preprocessing/metadata.xml
index 833dd3977c1..89bac5c2363 100644
--- a/sci-libs/keras-preprocessing/metadata.xml
+++ b/sci-libs/keras-preprocessing/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>perfinion@gentoo.org</email>
diff --git a/sci-libs/kim-api/metadata.xml b/sci-libs/kim-api/metadata.xml
index ae9640ffb9f..c0cd18916a9 100644
--- a/sci-libs/kim-api/metadata.xml
+++ b/sci-libs/kim-api/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/kissfft/metadata.xml b/sci-libs/kissfft/metadata.xml
index 1dd34da24f4..dc040e7c9bf 100644
--- a/sci-libs/kissfft/metadata.xml
+++ b/sci-libs/kissfft/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo@aisha.cc</email>
diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild
index 3851e767c37..0ddfd86bcec 100644
--- a/sci-libs/klu/klu-1.3.9-r2.ebuild
+++ b/sci-libs/klu/klu-1.3.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
BDEPEND="
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
deleted file mode 100644
index 174e4f282fc..00000000000
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sparse LU factorization for circuit simulation"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-BDEPEND="virtual/pkgconfig
- doc? ( virtual/latex-base )"
-DEPEND="
- >=sci-libs/amd-2.4
- >=sci-libs/btf-1.2
- >=sci-libs/colamd-2.9"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_with doc)
-}
diff --git a/sci-libs/klu/metadata.xml b/sci-libs/klu/metadata.xml
index ad32bd7d455..33b1892a51f 100644
--- a/sci-libs/klu/metadata.xml
+++ b/sci-libs/klu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/lapack/metadata.xml b/sci-libs/lapack/metadata.xml
index c5618c37be1..e9670e6df2c 100644
--- a/sci-libs/lapack/metadata.xml
+++ b/sci-libs/lapack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/ldl/metadata.xml b/sci-libs/ldl/metadata.xml
index dc5e74837c9..e6396c0864b 100644
--- a/sci-libs/ldl/metadata.xml
+++ b/sci-libs/ldl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 92e66a920f0..8fca14a06fa 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/levmar/metadata.xml b/sci-libs/levmar/metadata.xml
index 6007842dab2..b67b88aecfb 100644
--- a/sci-libs/levmar/metadata.xml
+++ b/sci-libs/levmar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>amynka@gentoo.org</email>
diff --git a/sci-libs/libaec/metadata.xml b/sci-libs/libaec/metadata.xml
index 6d596231fcd..276aa45e403 100644
--- a/sci-libs/libaec/metadata.xml
+++ b/sci-libs/libaec/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libbraiding/metadata.xml b/sci-libs/libbraiding/metadata.xml
index 71becf5d2df..d816504879a 100644
--- a/sci-libs/libbraiding/metadata.xml
+++ b/sci-libs/libbraiding/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
index e6507199b20..f42bb0348a9 100644
--- a/sci-libs/libbufr/metadata.xml
+++ b/sci-libs/libbufr/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nerdboy@gentoo.org</email>
diff --git a/sci-libs/libccd/metadata.xml b/sci-libs/libccd/metadata.xml
index 8f3764e4475..33316116723 100644
--- a/sci-libs/libccd/metadata.xml
+++ b/sci-libs/libccd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 8c42831e344..ce6468aea45 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1 +1,2 @@
DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
+DIST libcerf-v1.17.tar.gz 76610 BLAKE2B 94310a8378b9272ecf39c29420eaec98716e4be71717515cebc37d9b101a1a6e4b1d673ccfb70ba55e4cd34bead21b39252738ccf8767dcb376205ac5edf12d3 SHA512 cfa9f56f69a7f030f256610f2bfcbf1b48e979af379e23aedb19df33421c488f91e5757df9a37083060b96093854e1a07175aa2d1b75ee9711f9089b61241688
diff --git a/sci-libs/libcerf/libcerf-1.17.ebuild b/sci-libs/libcerf/libcerf-1.17.ebuild
new file mode 100644
index 00000000000..b2fc188fd3b
--- /dev/null
+++ b/sci-libs/libcerf/libcerf-1.17.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
+HOMEPAGE="https://jugit.fz-juelich.de/mlz/libcerf"
+SRC_URI="https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 67e76bff0cb..0dd2c43b2e1 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/libcerf/metadata.xml b/sci-libs/libcerf/metadata.xml
index 8425c0d53cb..7d3acaf5d25 100644
--- a/sci-libs/libcerf/metadata.xml
+++ b/sci-libs/libcerf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
new file mode 100644
index 00000000000..adfb7f2d35c
--- /dev/null
+++ b/sci-libs/libcifpp/Manifest
@@ -0,0 +1,6 @@
+DIST components-1.1.1.cif.gz 80378687 BLAKE2B 0776d79f733762ad19177bc93a5587e90966a7862f84174ede23a5875ae4633b519168b24b1c02d7afb30f9049d48434921a70c097a7e8238a5745f1676dcc78 SHA512 fc68513b37871677beb60855e82ed5831e10b08340697a97bbc7113d4c898b8e8382d097d36793346e34b97f0b5def5312fe7eb81ab4f120ad3908ee8d6d1aa3
+DIST components-2.0.0.cif.gz 80878869 BLAKE2B 183c1227f403466fa543575243176d84e72bf224a70500876c77a52f0c8e1af80e99ed8cd8b428c7adc822e7006501a0cfc414e60a2896b1f53b98a116e3e4d8 SHA512 b1212155b8d6c593593013b1b39b9c711e85c1bf9b68d412dda25720ab94d82ace4445f47f832a66901d0ed5773e2d2cc5dde7a9170b9294c506edd6843d6d66
+DIST components-2.0.3.cif.gz 81156388 BLAKE2B 00a70db993a5cea859e9839fa7e76bbe59f7e8568bf4d69c7550fd8b5afbb85c8efc577c3a2d58e1c472ce5658fc9ece874d827ce20d4214377576bab6bf8577 SHA512 2a686161a39383efe0a21da600b51dad125262f04a51c74ab780df06425b657cc487c82e9816ad129997ad1f81c008e60bcb9a23095fa479c7dff2fb3d6df6aa
+DIST libcifpp-1.1.1.tar.gz 978553 BLAKE2B 750cf80bac769a3db86b3be03924402da0254e69206a15222a5dfaa23a7eadcac1f57eb054f2fc783c287bfed86dab0a75d2994b031cc3cd3c2431a26e250d17 SHA512 e74419dada21ea12423c404c34eeb0b410fdb0b26827cd4451375329668909879b6d4795451c6f7c2b2ffc8d282dfcff2f1800630a3487111404335be4cb338f
+DIST libcifpp-2.0.0.tar.gz 996947 BLAKE2B 58568f18b17d79d8f3e2487035b505d814e0343bb56a2b18665651a3788b54d5330309c3c27b6f4636ab5e9bf3f85ebdb1a4fc8ed67adc7941559c481135f873 SHA512 8ca3f0445dad758f7fd63a0039fbe3267420d2b51036cd67a38d925b498c8ac580b86a9900317c63b4705a4a9fc9c3ef1036d40fd3f20f8eff2d6e6e5da7b735
+DIST libcifpp-2.0.3.tar.gz 959697 BLAKE2B 40f04926ec307260ab9d552aa3fa646cd776b48e84c1bf2ca64769b8726f647cd0f3f81da80a2d94b4cd0b26e438106db5626319a245c769a56f42ab32273d03 SHA512 7d0ebf70be1a1debe22a0dc2404b78c766d1d263ed556c47a9b77da510f1a8112d0a5ff61706f697245916534900e2791ef2b927b439cbecda6558c84c133a0e
diff --git a/sci-libs/libcifpp/libcifpp-1.1.1.ebuild b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
new file mode 100644
index 00000000000..33da8b38c37
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Code to work with mmCIF and PDB files"
+HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
+SRC_URI="
+ https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ >=dev-libs/boost-1.70.0:0=[threads(+)]
+"
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+ mkdir data || die
+ cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DUSE_RSRC=OFF
+ -DCIFPP_BUILD_TESTS="$(usex test)"
+ )
+ cmake_src_configure
+}
diff --git a/sci-libs/libcifpp/libcifpp-2.0.0.ebuild b/sci-libs/libcifpp/libcifpp-2.0.0.ebuild
new file mode 100644
index 00000000000..1f190d58f57
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Code to work with mmCIF and PDB files"
+HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
+SRC_URI="
+ https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ >=dev-libs/boost-1.70.0:0=[threads(+)]
+"
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+ mkdir data || die
+ cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DUSE_RSRC=OFF
+ -DCIFPP_BUILD_TESTS="$(usex test)"
+ )
+ cmake_src_configure
+}
diff --git a/sci-libs/libcifpp/libcifpp-2.0.3.ebuild b/sci-libs/libcifpp/libcifpp-2.0.3.ebuild
new file mode 100644
index 00000000000..1cbb3962edf
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Code to work with mmCIF and PDB files"
+HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
+SRC_URI="
+ https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ >=dev-libs/boost-1.70.0:0=[threads(+)]
+"
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+ cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DCIFPP_BUILD_TESTS="$(usex test)"
+ )
+ cmake_src_configure
+}
diff --git a/sci-libs/libcifpp/metadata.xml b/sci-libs/libcifpp/metadata.xml
new file mode 100644
index 00000000000..572c7daf2cc
--- /dev/null
+++ b/sci-libs/libcifpp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pacho@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-libs/libcmatrix/metadata.xml b/sci-libs/libcmatrix/metadata.xml
index 8425c0d53cb..7d3acaf5d25 100644
--- a/sci-libs/libcmatrix/metadata.xml
+++ b/sci-libs/libcmatrix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libdap/metadata.xml b/sci-libs/libdap/metadata.xml
index c1f3d978773..722148b3c95 100644
--- a/sci-libs/libdap/metadata.xml
+++ b/sci-libs/libdap/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-libs/libecpint/metadata.xml b/sci-libs/libecpint/metadata.xml
index 0802ee79be8..f2664523e71 100644
--- a/sci-libs/libecpint/metadata.xml
+++ b/sci-libs/libecpint/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libexcelformat/metadata.xml b/sci-libs/libexcelformat/metadata.xml
index ae9640ffb9f..c0cd18916a9 100644
--- a/sci-libs/libexcelformat/metadata.xml
+++ b/sci-libs/libexcelformat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libgenome/metadata.xml b/sci-libs/libgenome/metadata.xml
index 8417d1580d4..bdabd1d8378 100644
--- a/sci-libs/libgenome/metadata.xml
+++ b/sci-libs/libgenome/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
index 7f28dfaeb64..5f7c388f362 100644
--- a/sci-libs/libgeodecomp/metadata.xml
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>kurt@kmk-computers.de</email>
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
index 746a584a921..b7d0dbdc7a5 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug doc"
BDEPEND="
diff --git a/sci-libs/libgeotiff/metadata.xml b/sci-libs/libgeotiff/metadata.xml
index d78f8098182..d3369ac7793 100644
--- a/sci-libs/libgeotiff/metadata.xml
+++ b/sci-libs/libgeotiff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-libs/libghemical/metadata.xml b/sci-libs/libghemical/metadata.xml
index 82a6530d10c..7b4baa94856 100644
--- a/sci-libs/libghemical/metadata.xml
+++ b/sci-libs/libghemical/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-chemistry@gentoo.org</email>
diff --git a/sci-libs/libh2o/metadata.xml b/sci-libs/libh2o/metadata.xml
index d7baf471a70..22d7b18c840 100644
--- a/sci-libs/libh2o/metadata.xml
+++ b/sci-libs/libh2o/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/sci-libs/libh2oxx/metadata.xml b/sci-libs/libh2oxx/metadata.xml
index ab8b9c0d2e6..3eccf240bc4 100644
--- a/sci-libs/libh2oxx/metadata.xml
+++ b/sci-libs/libh2oxx/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/sci-libs/libhomfly/metadata.xml b/sci-libs/libhomfly/metadata.xml
index b9eb9d36fc7..37825533559 100644
--- a/sci-libs/libhomfly/metadata.xml
+++ b/sci-libs/libhomfly/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/libigl/metadata.xml b/sci-libs/libigl/metadata.xml
index 6ea2194bc08..cf81a4fd43e 100644
--- a/sci-libs/libigl/metadata.xml
+++ b/sci-libs/libigl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>3dprint@gentoo.org</email>
diff --git a/sci-libs/libint/libint-2.6.0-r3.ebuild b/sci-libs/libint/libint-2.6.0-r3.ebuild
deleted file mode 100644
index cf8dc7472d9..00000000000
--- a/sci-libs/libint/libint-2.6.0-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fortran-2 toolchain-funcs
-
-DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
-HOMEPAGE="https://github.com/evaleev/libint"
-SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs doc"
-
-DEPEND="
- dev-libs/boost
- dev-libs/gmp[cxx(+)]
- doc? (
- dev-texlive/texlive-latex
- dev-tex/latex2html
- )"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-cxx=$(tc-getCXX) \
- --with-cxx-optflags="${CXXFLAGS}" \
- --with-cxxgen-optflags="${CXXFLAGS}" \
- --with-cxxdepend=$(tc-getCXX) \
- --with-ranlib=$(tc-getRANLIB) \
- --with-ar=$(tc-getAR) \
- --with-ld=$(tc-getLD) \
- --enable-eri=2 --enable-eri3=2 --enable-eri2=2 \
- --with-eri-max-am=7,5,4 --with-eri-opt-am=3 \
- --with-eri3-max-am=7 --with-eri2-max-am=7 \
- --with-g12-max-am=5 --with-g12-opt-am=3 \
- --with-g12dkh-max-am=5 --with-g12dkh-opt-am=3 \
- --enable-contracted-ints \
- --enable-shared
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake LDFLAGS="${LDFLAGS}"
-
- use doc && emake html pdf
-}
-
-src_install() {
- default
-
- if use doc; then
- DOCS=( doc/progman/progman.pdf )
- HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
- einstalldocs
- fi
-}
diff --git a/sci-libs/libint/libint-2.6.0-r5.ebuild b/sci-libs/libint/libint-2.6.0-r5.ebuild
index bb486f0f534..176c1000db5 100644
--- a/sci-libs/libint/libint-2.6.0-r5.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="2"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="static-libs doc"
DEPEND="
diff --git a/sci-libs/libint/metadata.xml b/sci-libs/libint/metadata.xml
index c6610a75fe0..eac41989fd8 100644
--- a/sci-libs/libint/metadata.xml
+++ b/sci-libs/libint/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libmems/metadata.xml b/sci-libs/libmems/metadata.xml
index 8417d1580d4..bdabd1d8378 100644
--- a/sci-libs/libmems/metadata.xml
+++ b/sci-libs/libmems/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
diff --git a/sci-libs/libmuscle/metadata.xml b/sci-libs/libmuscle/metadata.xml
index 8417d1580d4..bdabd1d8378 100644
--- a/sci-libs/libmuscle/metadata.xml
+++ b/sci-libs/libmuscle/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
diff --git a/sci-libs/libnova/metadata.xml b/sci-libs/libnova/metadata.xml
index 0c5d20811ad..288e228415b 100644
--- a/sci-libs/libnova/metadata.xml
+++ b/sci-libs/libnova/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-astronomy@gentoo.org</email>
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 3296248678b..3e0b88d860e 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,2 +1 @@
-DIST liborigin-3.0.0.tar.gz 156736 BLAKE2B 1c1fda3fc3ad47394b65637a808eca1ecf4cff19eb49de0811e50d395c3b7759f8ec19c680ed83f7a8191022aa17b4ba1211baa6ea16a48a5153736d9138ed5c SHA512 1cf00ec33a90b4baede0cd3b2a3e6d78ca4810511c6be58c4d1cce12e7e1001752422fe2ddbca80cd9016b91c5321eca1ab43606ace3acc21955a034ebc4094c
DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B 2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c SHA512 c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
deleted file mode 100644
index d8444dedafe..00000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From a751f00ebba9fa226860ed4e2c1ae5fa35622e89 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:33:08 +0200
-Subject: [PATCH 1/4] Don't install bundled tree.hh
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17c613b..a6b4b8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,6 @@ set (devel-headers
- OriginObj.h
- OriginFile.h
- OriginParser.h
-- tree.hh
- )
-
- # LIB_SUFFIX can either be defined at cmake command line: cmake -DLIB_SUFFIX:STRING=64 ...
---
-2.26.2
-
-
-From 0b4fa1ce0946bc293d798484c609c6a7ac5ab50a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:35:02 +0200
-Subject: [PATCH 2/4] No static target, compile opj2dat against the shared lib
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6b4b8a..6f2d87b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,22 +52,16 @@ set_target_properties(origin PROPERTIES
- VERSION ${LIBORIGIN_VERSION_MAJOR}.${LIBORIGIN_VERSION_MINOR}.${LIBORIGIN_VERSION_BUGFIX}
- SOVERSION ${LIBORIGIN_VERSION_MAJOR} )
-
--# static library
--add_library (origin-static STATIC ${sources})
--set_target_properties(origin-static PROPERTIES OUTPUT_NAME "origin" POSITION_INDEPENDENT_CODE ON)
--
- # inform on log setting
- if (DEFINED GENERATE_CODE_FOR_LOG)
- message("File parsing will be logged.")
- target_compile_definitions(origin PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
-- target_compile_definitions(origin-static PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
- else()
- message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.")
- endif ()
-
- # install libraries
- install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
--install(TARGETS origin-static DESTINATION lib${LIB_SUFFIX} OPTIONAL)
-
- # install headers
- install(FILES ${devel-headers} DESTINATION include/liborigin)
-@@ -77,7 +71,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFF
-
- # command line util
- add_executable(opj2dat opj2dat.cpp)
--target_link_libraries (opj2dat origin-static)
-+target_link_libraries (opj2dat origin)
-
- install(TARGETS opj2dat DESTINATION bin OPTIONAL)
-
---
-2.26.2
-
-
-From 5f4c497408a6f144e581dd17fb3e49963e8b6b2b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:43:52 +0200
-Subject: [PATCH 3/4] Don't install README COPYING etc., distro package does
- that
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f2d87b..4fc16e0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,6 @@ target_link_libraries (opj2dat origin)
- install(TARGETS opj2dat DESTINATION bin OPTIONAL)
-
- # documentation
--install(FILES COPYING FORMAT README DESTINATION share/doc/liborigin OPTIONAL)
- configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
- find_package(Doxygen)
- if(DOXYGEN_FOUND)
---
-2.26.2
-
-
-From bb554d88b78e7575c04cf3e79098f35b776c3878 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:47:22 +0200
-Subject: [PATCH 4/4] Drop 'OPTIONAL' from install targets, add ENABLE_TOOLS
- option
-
-I've never seen an optional install of library.
-ENABLE_TOOLS takes care of the binary.
-Doxygen is already optional.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4fc16e0..1759eee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,8 @@ set(LIBORIGIN_VERSION_MAJOR 3)
- set(LIBORIGIN_VERSION_MINOR 0)
- set(LIBORIGIN_VERSION_BUGFIX 0)
-
-+option(ENABLE_TOOLS "Install opj2dat command line util" ON)
-+
- # compile-time configuration variables to be linked in
- configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-@@ -61,7 +63,7 @@ else()
- endif ()
-
- # install libraries
--install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
-+install(TARGETS origin DESTINATION lib${LIB_SUFFIX})
-
- # install headers
- install(FILES ${devel-headers} DESTINATION include/liborigin)
-@@ -70,10 +72,12 @@ install(FILES ${devel-headers} DESTINATION include/liborigin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-
- # command line util
--add_executable(opj2dat opj2dat.cpp)
--target_link_libraries (opj2dat origin)
-+if(ENABLE_TOOLS)
-+ add_executable(opj2dat opj2dat.cpp)
-+ target_link_libraries (opj2dat origin)
-
--install(TARGETS opj2dat DESTINATION bin OPTIONAL)
-+ install(TARGETS opj2dat DESTINATION bin)
-+endif()
-
- # documentation
- configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-@@ -82,5 +86,5 @@ if(DOXYGEN_FOUND)
- add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/html)
-- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin OPTIONAL)
-+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin)
- endif(DOXYGEN_FOUND)
---
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch b/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
deleted file mode 100644
index 162dd93c3c5..00000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 78da3c4456cef15c91b5e5fcc1e82ca2364ea654 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:28:21 +0200
-Subject: [PATCH] Add missing header
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- OriginAnyParser.cpp | 1 +
- opj2dat.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index 07a619e..c90f6e4 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -22,6 +22,7 @@
- #include "OriginAnyParser.h"
- #include <sstream>
- #include <cinttypes>
-+#include <iostream>
-
- /* define a macro to get an int (or uint) from a istringstream in binary mode */
- #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-diff --git a/opj2dat.cpp b/opj2dat.cpp
-index 230ac84..67b0815 100644
---- a/opj2dat.cpp
-+++ b/opj2dat.cpp
-@@ -31,6 +31,7 @@
- #include <cmath>
- #include <fstream>
- #include <sstream>
-+#include <iostream>
- #include <string>
-
- using namespace std;
---
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
deleted file mode 100644
index 44b56a296fd..00000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a8b25b489b48086e2616df98688969f89e63fa69 Mon Sep 17 00:00:00 2001
-From: Miquel Garriga <gbmiquel@gmail.com>
-Date: Fri, 23 Nov 2018 00:15:04 +0100
-Subject: [PATCH] Remove exit() calls
-
----
- OriginFile.cpp | 15 ++++++++++-----
- OriginFile.h | 2 +-
- opj2dat.cpp | 2 ++
- 3 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/OriginFile.cpp b/OriginFile.cpp
-index f6c41b4..bcdcccb 100644
---- a/OriginFile.cpp
-+++ b/OriginFile.cpp
-@@ -33,14 +33,15 @@
- #include <string>
-
- OriginFile::OriginFile(const string& fileName)
--: fileVersion(0)
-+: fileVersion(0), ioError(0)
- {
- ifstream file(fileName.c_str(), ios_base::binary);
-
- if (!file.is_open())
- {
-- cerr << "Could not open " << fileName.c_str() << "!" << endl;
-- exit(EXIT_FAILURE);
-+ cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
-+ ioError = errno;
-+ return;
- }
-
- #ifdef GENERATE_CODE_FOR_LOG
-@@ -48,8 +49,9 @@ OriginFile::OriginFile(const string& fileName)
- logfile = fopen("./opjfile.log", "w");
- if (logfile == nullptr)
- {
-- cerr << "Could not open opjfile.log !" << endl;
-- exit(EXIT_FAILURE);
-+ cerr << endl << "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
-+ ioError = errno;
-+ return;
- }
- #endif // GENERATE_CODE_FOR_LOG
-
-@@ -152,10 +154,13 @@ OriginFile::OriginFile(const string& fileName)
- fclose(logfile);
- #endif // GENERATE_CODE_FOR_LOG
- parser.reset(createOriginAnyParser(fileName));
-+ ioError=0;
- }
-
- bool OriginFile::parse()
- {
-+ if (ioError != 0)
-+ return false;
- parser->buildVersion = buildVersion;
- parser->fileVersion = fileVersion;
- return parser->parse();
-diff --git a/OriginFile.h b/OriginFile.h
-index 80b6ff2..3a49395 100644
---- a/OriginFile.h
-+++ b/OriginFile.h
-@@ -70,7 +70,7 @@ public:
- string resultsLogString() const; //!< get Results Log
-
- private:
-- unsigned int fileVersion, buildVersion;
-+ unsigned int fileVersion, buildVersion, ioError;
- unique_ptr<OriginParser> parser;
- };
-
-diff --git a/opj2dat.cpp b/opj2dat.cpp
-index ff53309..230ac84 100644
---- a/opj2dat.cpp
-+++ b/opj2dat.cpp
-@@ -54,6 +54,8 @@ int main(int argc, char *argv[]) {
- OriginFile opj(inputfile);
- int status = opj.parse();
- cout << "Parsing status = " << status << endl;
-+ if (! status)
-+ return -1;
- cout << "OPJ PROJECT \"" << inputfile.c_str() << "\" VERSION = " << opj.version() << endl;
-
- cout << "number of datasets = " << opj.datasetCount() << endl;
---
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
deleted file mode 100644
index 227ce7b14d5..00000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 6cb6d9b328195e11c1f168f6e4b915b522c7089f Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:16:09 +0200
-Subject: [PATCH 1/3] do not output to standard streams (cout,
- cerr) by default
-
-it might be better to hide all such usage behind #ifdefs,
-since the streams might not belong to the shared library
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 11 +++++------
- OriginAnyParser.h | 2 +-
- OriginFile.cpp | 2 --
- 3 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index d45026b..ff7b8f7 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -756,7 +756,7 @@ void OriginAnyParser::readProjectTree() {
-
- // log info on project tree
- #ifdef GENERATE_CODE_FOR_LOG
-- outputProjectTree();
-+ outputProjectTree(cout);
- #endif // GENERATE_CODE_FOR_LOG
-
- return;
-@@ -2835,7 +2835,6 @@ void OriginAnyParser::getColorMap(ColorMap& cmap, const string& cmapdata, unsign
- // check we have enough data to fill the map
- unsigned int minDataSize = cmoffset + 0x114 + (colorMapSize+2)*0x38;
- if (minDataSize > cmapdatasz) {
-- cerr << "WARNING: Too few data while getting ColorMap. Needed: at least " << minDataSize << " bytes. Have: " << cmapdatasz << " bytes." << endl;
- LOG_PRINT(logfile, "WARNING: Too few data while getting ColorMap. Needed: at least %d bytes. Have: %d bytes.\n", minDataSize, cmapdatasz)
- return;
- }
-@@ -2988,15 +2987,15 @@ void OriginAnyParser::getProjectFolderProperties(tree<ProjectNode>::iterator cur
- (*current_folder).modificationDate = doubleToPosixTime(modificationDate);
- }
-
--void OriginAnyParser::outputProjectTree() {
-+void OriginAnyParser::outputProjectTree(std::ostream & out) {
- size_t windowsCount = spreadSheets.size()+matrixes.size()+excels.size()+graphs.size()+notes.size();
-
-- cout << "Project has " << windowsCount << " windows." << endl;
-- cout << "Origin project Tree" << endl;
-+ out << "Project has " << windowsCount << " windows." << endl;
-+ out << "Origin project Tree" << endl;
-
- char cdsz[21];
- for (tree<ProjectNode>::iterator it = projectTree.begin(projectTree.begin()); it != projectTree.end(projectTree.begin()); ++it) {
- strftime(cdsz, sizeof(cdsz), "%F %T", gmtime(&(*it).creationDate));
-- cout << string(projectTree.depth(it) - 1, ' ') << (*it).name.c_str() << "\t" << cdsz << endl;
-+ out << string(projectTree.depth(it) - 1, ' ') << (*it).name.c_str() << "\t" << cdsz << endl;
- }
- }
-diff --git a/OriginAnyParser.h b/OriginAnyParser.h
-index ed62bbb..bd7c1ae 100644
---- a/OriginAnyParser.h
-+++ b/OriginAnyParser.h
-@@ -68,7 +68,7 @@ protected:
- void getZcolorsMap(ColorMap&, const string&, unsigned int);
- void getProjectLeafProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
- void getProjectFolderProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
-- void outputProjectTree();
-+ void outputProjectTree(std::ostream &);
-
- inline time_t doubleToPosixTime(double jdt)
- {
-diff --git a/OriginFile.cpp b/OriginFile.cpp
-index 5ac8e22..dba050f 100644
---- a/OriginFile.cpp
-+++ b/OriginFile.cpp
-@@ -39,7 +39,6 @@ OriginFile::OriginFile(const string& fileName)
-
- if (!file.is_open())
- {
-- cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
- ioError = errno;
- return;
- }
-@@ -49,7 +48,6 @@ OriginFile::OriginFile(const string& fileName)
- logfile = fopen("./opjfile.log", "w");
- if (logfile == nullptr)
- {
-- cerr << endl << "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
- ioError = errno;
- return;
- }
---
-2.26.2
-
-
-From 588bbc357cd34b9d353470ed6c0632b6f00805f5 Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:28:46 +0200
-Subject: [PATCH 2/3] fix bugs found by UBSan
-
- - check values before casting to enum Attach
- - default-initialize sensitive struct elements
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 1 +
- OriginObj.h | 5 ++++-
- README | 3 +++
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index ff7b8f7..9f9731c 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -1543,6 +1543,7 @@ void OriginAnyParser::getAnnotationProperties(const string& anhd, unsigned int a
- GET_SHORT(stmp, r.bottom)
-
- unsigned char attach = anhd[0x28];
-+ if (attach >= (unsigned char)Attach::End_) attach = Attach::Frame;
- unsigned char border = anhd[0x29];
-
- Color color = getColor(anhd.substr(0x33,4));
-diff --git a/OriginObj.h b/OriginObj.h
-index 3a9f719..aeeeb6b 100644
---- a/OriginObj.h
-+++ b/OriginObj.h
-@@ -67,7 +67,7 @@ namespace Origin
- enum DayOfWeekFormat {DAY_DDD = 0, DAY_DDDD = 1, DAY_LETTER = 2};
-
- enum NumericDisplayType {DefaultDecimalDigits = 0, DecimalPlaces = 1, SignificantDigits = 2};
-- enum Attach {Frame = 0, Page = 1, Scale = 2};
-+ enum Attach {Frame = 0, Page = 1, Scale = 2, End_};
- enum BorderType {BlackLine = 0, Shadow = 1, DarkMarble = 2, WhiteOut = 3, BlackOut = 4, None = -1};
- enum FillPattern {NoFill = 0, BDiagDense = 1, BDiagMedium = 2, BDiagSparse = 3, FDiagDense = 4, FDiagMedium = 5, FDiagSparse = 6,
- DiagCrossDense = 7, DiagCrossMedium = 8, DiagCrossSparse = 9, HorizontalDense = 10, HorizontalMedium = 11, HorizontalSparse = 12,
-@@ -345,6 +345,7 @@ namespace Origin
- , width(8)
- , index(_index)
- , view(DataView)
-+ , colorMap()
- {coordinates.push_back(10.0);coordinates.push_back(10.0);coordinates.push_back(1.0);coordinates.push_back(1.0);};
- };
-
-@@ -895,9 +896,11 @@ namespace Origin
- GraphLayer()
- : backgroundColor({Color::Regular, {Color::White}})
- , borderType(BlackLine)
-+ , xAxis(), yAxis(), zAxis()
- , histogramBin(0.5)
- , histogramBegin(0.0)
- , histogramEnd(10.0)
-+ , colorMap()
- , xAngle(0)
- , yAngle(0)
- , zAngle(0)
-diff --git a/README b/README
-index 1dd56ef..598eacc 100644
---- a/README
-+++ b/README
-@@ -7,6 +7,9 @@ It is based on the code at
- http://sourceforge.net/projects/liborigin
- http://soft.proindependent.com/liborigin2
-
-+Additionally, some fixes were applied to silence UBSan warnings caused by
-+uninitialised POD struct members.
-+
- AUTHORS: Knut Franke, Miquel Garriga, Stefan Gerlach, Alex Kargovsky, Russell Standish, Ion Vasilief
-
- DEPENDENCIES: tree.hh (included) http://tree.phi-sci.com/
---
-2.26.2
-
-
-From 88b4de31e1860b8b5de6e3eea4a32e92f2e58c71 Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:32:50 +0200
-Subject: [PATCH 3/3] readProjectTree: provide root node to append
- to
-
-append_child() is not supposed to work on an empty tree,
-and I couldn't find any initialization before its use.
-All inserted nodes seemed to end up below tree_node::feet
-(or something) and were not cleaned up by the destructor.
-
-Using insert() to create a dummy node for others to be
-children of fixes the leak.
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index 9f9731c..4a79423 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -743,7 +743,10 @@ void OriginAnyParser::readProjectTree() {
- string pte_pre2 = readObjectAsString(pte_pre2_size);
-
- // root element and children
-- unsigned int rootfolder = readFolderTree(projectTree.begin(), pte_depth);
-+ unsigned int rootfolder = readFolderTree(
-+ projectTree.insert(projectTree.begin(), ProjectNode("", ProjectNode::Folder)),
-+ pte_depth
-+ );
- if (rootfolder > 0) {
- LOG_PRINT(logfile, "Number of files at root: %d\n", rootfolder)
- }
---
-2.26.2
-
diff --git a/sci-libs/liborigin/liborigin-3.0.0.ebuild b/sci-libs/liborigin/liborigin-3.0.0.ebuild
deleted file mode 100644
index aa4538748af..00000000000
--- a/sci-libs/liborigin/liborigin-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="https://sourceforge.net/projects/liborigin/"
-SRC_URI="http://downloads.sourceforge.net/liborigin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc tools"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- dev-cpp/tree
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${P}-no-exit-calls.patch"
- "${FILESDIR}/${P}-no-standard-streams.patch"
- # TODO upstream
- "${FILESDIR}/${P}-missing-header.patch"
- # downstream
- "${FILESDIR}/${P}-buildsystem.patch" # ENABLE_TOOLS, shared link, doc paths
-)
-
-src_prepare() {
- cmake_src_prepare
- rm tree.hh || die "failed to remove bundled tree.hh"
-
- sed -e "/install.*html/s/liborigin/${PF}/" \
- -i CMakeLists.txt || die "failed to fix htmldoc install path"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DGENERATE_CODE_FOR_LOG=$(usex debug)
- $(cmake_use_find_package doc Doxygen)
- -DENABLE_TOOLS=$(usex tools)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_src_compile doc
-}
diff --git a/sci-libs/liborigin/metadata.xml b/sci-libs/liborigin/metadata.xml
index 54bfdbb82e3..9e1b2fba29b 100644
--- a/sci-libs/liborigin/metadata.xml
+++ b/sci-libs/liborigin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libpdb++/metadata.xml b/sci-libs/libpdb++/metadata.xml
index ae9640ffb9f..c0cd18916a9 100644
--- a/sci-libs/libpdb++/metadata.xml
+++ b/sci-libs/libpdb++/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libpdb/metadata.xml b/sci-libs/libpdb/metadata.xml
index ae9640ffb9f..c0cd18916a9 100644
--- a/sci-libs/libpdb/metadata.xml
+++ b/sci-libs/libpdb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 0e910609352..93d33565b63 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,4 +1,2 @@
-DIST libqalculate-3.17.0.tar.gz 1770500 BLAKE2B 247c74db32e63437c556dd60f00f56acf53d9ba90ea1027b34b98b455215e6c03e3ee34116b6d3989fa43b449e18b6f2ebaed67f9dff36f08dd8b38c685c6586 SHA512 b204dc44b6fdb2b72d3c85840fee38482db071f0f8241420ea24093dcdcc377c66f516c571827fbede40237618a53153a75bb7afee7f3bee7a1a71aedd779a11
-DIST libqalculate-3.18.0.tar.gz 1788899 BLAKE2B 7701dab4d11c9d54f95454cd7be530cfa9f5a8dbe438dac6d734c294ce1eb5be1f4fdb30ef6d041d19f389df88dce4fa7dea68d555ad441992498685bfb3b919 SHA512 37d870f6fd147745747ac971758a512e85e33c42605b99ac4ba68b53ca42a6f0da7ede3869fe3ea4e47d77961e826ad999e0f0c0d87039042563f124bea1250e
-DIST libqalculate-3.19.0.tar.gz 2007385 BLAKE2B bd0b1bbfcd4bad0053ec9193bec1081cce609935b4282add885d7277a20696cc3c69272b8255d9da3e79907ec4c57b4b87c971908fc3da890d46ff4849e65ccc SHA512 19df6e46e88478df4dd7ae592557c8c984f76c137708892b01f88737c2a8d72ca01324fd1b1322069292795cd158483b3fc0cc99c6559279e7a2f76ca4a47a56
DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931
+DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
diff --git a/sci-libs/libqalculate/libqalculate-3.17.0.ebuild b/sci-libs/libqalculate/libqalculate-3.17.0.ebuild
deleted file mode 100644
index 35672fd3c7e..00000000000
--- a/sci-libs/libqalculate/libqalculate-3.17.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl icu gnuplot readline"
-
-DEPEND="
- dev-libs/gmp:0=
- dev-libs/libxml2:2
- dev-libs/mpfr:0=
- virtual/libiconv
- curl? ( net-misc/curl )
- icu? ( dev-libs/icu:= )
- readline? ( sys-libs/readline:0= )"
-RDEPEND="${DEPEND}
- gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-BDEPEND="
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_prepare() {
- default
-
- cat >po/POTFILES.skip <<-EOF || die
- # Required by make check
- data/currencies.xml.in
- data/datasets.xml.in
- data/elements.xml.in
- data/functions.xml.in
- data/planets.xml.in
- data/prefixes.xml.in
- data/units.xml.in
- data/variables.xml.in
- src/defs2doc.cc
- EOF
-}
-
-src_configure() {
- econf \
- --disable-static \
- $(use_with curl libcurl) \
- $(use_with gnuplot gnuplot-call) \
- $(use_with icu) \
- $(use_with readline)
-}
-
-src_install() {
- # docs/reference/Makefile.am -> referencedir=
- emake \
- DESTDIR="${D}" \
- referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
- install
- einstalldocs
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild b/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
deleted file mode 100644
index 35672fd3c7e..00000000000
--- a/sci-libs/libqalculate/libqalculate-3.18.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl icu gnuplot readline"
-
-DEPEND="
- dev-libs/gmp:0=
- dev-libs/libxml2:2
- dev-libs/mpfr:0=
- virtual/libiconv
- curl? ( net-misc/curl )
- icu? ( dev-libs/icu:= )
- readline? ( sys-libs/readline:0= )"
-RDEPEND="${DEPEND}
- gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-BDEPEND="
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_prepare() {
- default
-
- cat >po/POTFILES.skip <<-EOF || die
- # Required by make check
- data/currencies.xml.in
- data/datasets.xml.in
- data/elements.xml.in
- data/functions.xml.in
- data/planets.xml.in
- data/prefixes.xml.in
- data/units.xml.in
- data/variables.xml.in
- src/defs2doc.cc
- EOF
-}
-
-src_configure() {
- econf \
- --disable-static \
- $(use_with curl libcurl) \
- $(use_with gnuplot gnuplot-call) \
- $(use_with icu) \
- $(use_with readline)
-}
-
-src_install() {
- # docs/reference/Makefile.am -> referencedir=
- emake \
- DESTDIR="${D}" \
- referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
- install
- einstalldocs
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
index 590dd468c1e..a233c76663b 100644
--- a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="curl icu gnuplot readline"
DEPEND="
diff --git a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
index b1e1ab83165..65c9f8a2022 100644
--- a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
@@ -10,8 +10,8 @@ HOMEPAGE="https://qalculate.github.io/"
SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="curl icu gnuplot readline"
DEPEND="
@@ -24,8 +24,7 @@ DEPEND="
readline? ( sys-libs/readline:0= )"
RDEPEND="${DEPEND}
gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-BDEPEND="
- dev-util/intltool
+BDEPEND="dev-util/intltool
sys-devel/gettext
virtual/pkgconfig"
@@ -68,6 +67,7 @@ src_install() {
DESTDIR="${D}" \
referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
install
+
einstalldocs
find "${ED}" -name '*.la' -delete || die
diff --git a/sci-libs/libqalculate/metadata.xml b/sci-libs/libqalculate/metadata.xml
index 5a79485a6de..284c82a7b61 100644
--- a/sci-libs/libqalculate/metadata.xml
+++ b/sci-libs/libqalculate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 4cd22d93ef3..f17c047aae4 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1 @@
-DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
deleted file mode 100644
index c2cbdb1b003..00000000000
--- a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/config/sc_include.m4
-+++ b/config/sc_include.m4
-@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
- [
- SC_REQUIRE_LIB([m], [fabs])
- SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
--SC_CHECK_LIB([lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
-+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
- [LUA], [$1])
- SC_CHECK_BLAS_LAPACK([$1])
- SC_BUILTIN_ALL_PREFIX([$1])
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,7 +74,7 @@ echo "| Checking headers"
- echo "o---------------------------------------"
-
- AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
--AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
-+AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
-
- echo "o---------------------------------------"
- echo "| Checking functions"
---- a/src/sc_lua.h
-+++ b/src/sc_lua.h
-@@ -30,23 +30,9 @@
-
- SC_EXTERN_C_BEGIN;
-
--#ifdef SC_HAVE_LUA5_2_LUA_H
--#include <lua5.2/lua.h>
--#include <lua5.2/lualib.h>
--#include <lua5.2/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA5_1_LUA_H
--#include <lua5.1/lua.h>
--#include <lua5.1/lualib.h>
--#include <lua5.1/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA_H
--#include <lua.h>
--#include <lualib.h>
--#include <lauxlib.h>
--#endif
--#endif
--#endif
-+#include <@LUA_IMPL@/lua.h>
-+#include <@LUA_IMPL@/lualib.h>
-+#include <@LUA_IMPL@/lauxlib.h>
-
- SC_EXTERN_C_END;
-
diff --git a/sci-libs/libsc/libsc-2.2-r100.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild
deleted file mode 100644
index e29a4201d39..00000000000
--- a/sci-libs/libsc/libsc-2.2-r100.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Support for parallel scientific applications"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
-else
- SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
- romio? ( mpi )"
-
-RDEPEND="${LUA_DEPS}
- sys-apps/util-linux
- virtual/blas
- virtual/lapack
- mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2-autoconf_lua_version.patch
-)
-
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
-
- # Inject a version number into the build system
- echo "${PV}" > ${S}/.tarball-version || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable mpi)
- $(use_enable openmp openmp)
- $(use_enable romio mpiio)
- $(use_enable static-libs static)
- $(use_enable threads pthread)
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- )
- econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use examples; then
- docinto examples
- dodoc -r example/*
- docompress -x /usr/share/doc/${PF}/examples
- else
- # Remove compiled example binaries in case of -examples:
- rm -r "${ED}"/usr/bin || die "rm failed"
- fi
-
- # Remove ac files, bug #619806
- rm -r "${ED}"/usr/share/aclocal || die "rm failed"
-
- # Fix wrong installation paths:
- dodir /usr/share/libsc
- mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
- rmdir "${ED}"/etc/ || die "rmdir failed"
- mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
- rmdir "${ED}"/usr/share/ini || die "rmdir failed"
-}
diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
index e84c20273cf..667c713b009 100644
--- a/sci-libs/libsc/libsc-2.3.1.ebuild
+++ b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
@@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs
DESCRIPTION="Support for parallel scientific applications"
HOMEPAGE="http://www.p4est.org/"
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
EGIT_BRANCH="develop"
- SRC_URI=""
else
SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -22,35 +21,32 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
+IUSE="debug examples mpi openmp romio threads"
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
romio? ( mpi )"
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+ ${LUA_DEPS}
sys-apps/util-linux
virtual/blas
virtual/lapack
mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch
"${FILESDIR}"/${PN}-2.3-add_soname.patch
)
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ lua-single_pkg_setup
}
src_prepare() {
@@ -65,11 +61,11 @@ src_prepare() {
src_configure() {
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable mpi)
$(use_enable openmp openmp)
$(use_enable romio mpiio)
- $(use_enable static-libs static)
$(use_enable threads pthread)
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
@@ -98,4 +94,7 @@ src_install() {
rmdir "${ED}"/etc/ || die "rmdir failed"
mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index b99e7232521..00143eccd87 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs
DESCRIPTION="Support for parallel scientific applications"
HOMEPAGE="http://www.p4est.org/"
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
EGIT_BRANCH="develop"
- SRC_URI=""
else
SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -22,34 +21,31 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
+IUSE="debug examples mpi openmp romio threads"
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
romio? ( mpi )"
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+ ${LUA_DEPS}
sys-apps/util-linux
virtual/blas
virtual/lapack
mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch
)
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ lua-single_pkg_setup
}
src_prepare() {
@@ -64,11 +60,11 @@ src_prepare() {
src_configure() {
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable mpi)
$(use_enable openmp openmp)
$(use_enable romio mpiio)
- $(use_enable static-libs static)
$(use_enable threads pthread)
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
@@ -97,4 +93,7 @@ src_install() {
rmdir "${ED}"/etc/ || die "rmdir failed"
mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/sci-libs/libsc/metadata.xml b/sci-libs/libsc/metadata.xml
index 20badba13ad..c2a3238de46 100644
--- a/sci-libs/libsc/metadata.xml
+++ b/sci-libs/libsc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
diff --git a/sci-libs/libsigrok/metadata.xml b/sci-libs/libsigrok/metadata.xml
index 60598929d67..125e899de10 100644
--- a/sci-libs/libsigrok/metadata.xml
+++ b/sci-libs/libsigrok/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>embedded@gentoo.org</email>
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild
index 64dcf8d7c68..94adf3d75fe 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-single-r1
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit autotools python-single-r1
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
- inherit git-r3 autotools
+ inherit git-r3
else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -32,17 +32,15 @@ BDEPEND="
src_prepare() {
default
- [[ ${PV} == *9999* ]] && eautoreconf
- # Only a test program (not installed, and not used by src_test)
- # is used by libsigrok, so disable it to avoid the compile.
- sed -i \
- -e '/build_runtc=/s:yes:no:' \
- configure || die
+ # bug #794592
+ sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die
+
+ eautoreconf
}
src_configure() {
- econf $(use_enable static-libs static)
+ econf $(use_enable static-libs static) PYTHON3="${PYTHON}"
}
src_test() {
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index a5914c13031..71b414a4c1a 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -3,12 +3,12 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-single-r1
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit autotools python-single-r1
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
- inherit git-r3 autotools
+ inherit git-r3
else
SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -32,17 +32,15 @@ BDEPEND="
src_prepare() {
default
- [[ ${PV} == *9999* ]] && eautoreconf
- # Only a test program (not installed, and not used by src_test)
- # is used by libsigrok, so disable it to avoid the compile.
- sed -i \
- -e '/build_runtc=/s:yes:no:' \
- configure || die
+ # bug #794592
+ sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die
+
+ eautoreconf
}
src_configure() {
- econf $(use_enable static-libs static)
+ econf $(use_enable static-libs static) PYTHON3="${PYTHON}"
}
src_test() {
diff --git a/sci-libs/libsigrokdecode/metadata.xml b/sci-libs/libsigrokdecode/metadata.xml
index 71b1461e114..98ae10b3c34 100644
--- a/sci-libs/libsigrokdecode/metadata.xml
+++ b/sci-libs/libsigrokdecode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>embedded@gentoo.org</email>
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
index 7e8ad2fbf9d..14945195437 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P
LICENSE="MIT"
SLOT="0/6"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/libspatialindex/metadata.xml b/sci-libs/libspatialindex/metadata.xml
index 93b617e9a77..c1730d14653 100644
--- a/sci-libs/libspatialindex/metadata.xml
+++ b/sci-libs/libspatialindex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>3dprint@gentoo.org</email>
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index e1e9144dd42..0dbb0b08cf6 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,2 +1 @@
-DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
diff --git a/sci-libs/libsvm/libsvm-3.24.ebuild b/sci-libs/libsvm/libsvm-3.24.ebuild
deleted file mode 100644
index 64467f9355a..00000000000
--- a/sci-libs/libsvm/libsvm-3.24.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
-
-DESCRIPTION="Library for Support Vector Machines"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
-SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="java openmp python tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- java? ( >=virtual/jdk-1.4 )
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
- java? ( >=virtual/jre-1.4 )
- python? ( ${PYTHON_DEPS} )
- tools? ( sci-visualization/gnuplot )
-"
-
-PATCHES=(
- "${FILESDIR}/3.11-openmp.patch"
- "${FILESDIR}/3.14-makefile.patch"
-)
-
-pkg_setup() {
- if use openmp; then
- if ! tc-has-openmp; then
- ewarn "OpenMP is not supported by your currently selected compiler"
-
- if tc-is-clang; then
- ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
- ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
- fi
-
- die "need openmp capable compiler"
- fi
-
- append-cflags -fopenmp
- append-cxxflags -fopenmp
- append-cppflags -DOPENMP
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
- || die "Failed to fix paths in python files"
- sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
- || die "Failed to fix paths for svm-grid"
- sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
- || die "Failed to rename grid.py to svm-grid"
-
- if use java; then
- local JAVAC_FLAGS="$(java-pkg_javac-args)"
- sed -i \
- -e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
- java/Makefile || die "Failed to fix java makefile"
- fi
- tc-export CXX CC
-}
-
-src_compile() {
- default
- use java && emake -C java
-}
-
-src_install() {
- dobin svm-train svm-predict svm-scale
- dolib.so *.so*
- doheader svm.h
-
- DOCS=( README )
-
- if use tools; then
- local t
- for t in tools/*.py; do
- python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
- done
-
- mv tools/README{,.tools} || die
- DOCS+=( tools/README.tools )
-
- insinto /usr/share/doc/${PF}/examples
- docompress -x /usr/share/doc/${PF}/examples
- doins heart_scale
- doins -r svm-toy
- fi
-
- if use python ; then
- installation() {
- touch python/__init__.py || die
- python_moduleinto libsvm
- python_domodule python/*.py
- }
- python_foreach_impl installation
-
- mv python/README{,.python} || die
- DOCS+=( python/README.python )
- fi
-
- HTML_DOCS=( FAQ.html )
- if use java; then
- java-pkg_dojar java/libsvm.jar
- HTML_DOCS+=( java/test_applet.html )
- fi
-
- einstalldocs
-}
diff --git a/sci-libs/libsvm/metadata.xml b/sci-libs/libsvm/metadata.xml
index 7ba70023b93..0ebc02970a4 100644
--- a/sci-libs/libsvm/metadata.xml
+++ b/sci-libs/libsvm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libticables2/metadata.xml b/sci-libs/libticables2/metadata.xml
index 913b1258a5b..89fb0f07464 100644
--- a/sci-libs/libticables2/metadata.xml
+++ b/sci-libs/libticables2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libticalcs2/metadata.xml b/sci-libs/libticalcs2/metadata.xml
index 1cd5468cfcb..654103b7563 100644
--- a/sci-libs/libticalcs2/metadata.xml
+++ b/sci-libs/libticalcs2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libticonv/metadata.xml b/sci-libs/libticonv/metadata.xml
index e176fa0cacf..41237f72d97 100644
--- a/sci-libs/libticonv/metadata.xml
+++ b/sci-libs/libticonv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libtifiles2/metadata.xml b/sci-libs/libtifiles2/metadata.xml
index 95f486416a2..10305187c6e 100644
--- a/sci-libs/libtifiles2/metadata.xml
+++ b/sci-libs/libtifiles2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index c31f10f3ee3..198b182adf2 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,2 +1,3 @@
DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
DIST libxc-5.1.4.tar.gz 43036222 BLAKE2B 10348ccd2e8e512bf576a03eb19bf714ae4f0e590ae3a7266ae8f46c42ee12ef91e049f0007ce42023e7f13c865fedef6d1ab0fb76195ca47f62a50702741c49 SHA512 ef7f44e773a0a8a9c1a53ddd12301e123f9a4606f22420cf011d579314c1bf3164b82299aca0ef32cb130b380e5e9534d4fcc658c549ac4cb8b6f86d025cfe1e
+DIST libxc-5.1.6.tar.gz 45121466 BLAKE2B 393c85b49b1cc515abd4767a01cc56958585aac74d9913f60c304f102e76c0f3903dab326779ea7e466c19389309b2bcf49a4e0833d8f869a185b6143e1ecf29 SHA512 7e65753ca93c2174e3644f519651c59305b2fc4919de99ca2278c42a359641ced73b5c661c5315fe73b55a69ac4b7568ab1be754fc06b40bdf790881ba3ed2cb
diff --git a/sci-libs/libxc/libxc-5.1.4.ebuild b/sci-libs/libxc/libxc-5.1.4.ebuild
index 884100437a3..07bbbe3d910 100644
--- a/sci-libs/libxc/libxc-5.1.4.ebuild
+++ b/sci-libs/libxc/libxc-5.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
IUSE="fortran test"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/libxc/libxc-5.1.6.ebuild b/sci-libs/libxc/libxc-5.1.6.ebuild
new file mode 100644
index 00000000000..54a6f584a57
--- /dev/null
+++ b/sci-libs/libxc/libxc-5.1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fortran-2
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran test"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-shared \
+ --disable-static \
+ $(use_enable fortran)
+}
+
+src_install() {
+ default
+ dodoc ChangeLog.md
+
+ # no static archives
+ find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/libxc/metadata.xml b/sci-libs/libxc/metadata.xml
index 55e82d2ab1c..3d68ccd2a43 100644
--- a/sci-libs/libxc/metadata.xml
+++ b/sci-libs/libxc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/linbox/metadata.xml b/sci-libs/linbox/metadata.xml
index f7ca231ff1a..b935b656e7d 100644
--- a/sci-libs/linbox/metadata.xml
+++ b/sci-libs/linbox/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/linux-gpib-modules/metadata.xml b/sci-libs/linux-gpib-modules/metadata.xml
index 0781b9a96b9..9f59724a823 100644
--- a/sci-libs/linux-gpib-modules/metadata.xml
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/sci-libs/linux-gpib/metadata.xml b/sci-libs/linux-gpib/metadata.xml
index 0943a596eef..27e81f251aa 100644
--- a/sci-libs/linux-gpib/metadata.xml
+++ b/sci-libs/linux-gpib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/sci-libs/lis/metadata.xml b/sci-libs/lis/metadata.xml
index b2cb4b334b2..adc6d0de7bd 100644
--- a/sci-libs/lis/metadata.xml
+++ b/sci-libs/lis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index ba6266162ad..72792614058 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1 +1,2 @@
DIST lmfit-8.2.2.tgz 31970 BLAKE2B 67eebc0e58d3d78057afcd84f35adcfea783c8501a5f8934dd07c38eb2419b1c43bedd3401a830a993005913138bdf8d1dc73c2142983b9f881f0db9bec06b93 SHA512 5835dce914027429cb36765543cf6b872e4ef1acd8feaeca281f9edf286fda89db78fbc0713dcfea4e4f2fe55a1b05317e6428980060bc3acce579ef1fa0c271
+DIST lmfit-9.0.tar.gz 36686 BLAKE2B 34d77a9101dcea1387df09e58cf8b69e51b1961ba8f1f73ac070abcc4c6ddbf1a1cd1f4bf2568942442f0c4c3815288959259c16e505ad1a91a4db2a2753bed6 SHA512 523d18c75498f5586c55e6dfcab8d1005aaef61d60e8d482814ced4f90bcd14d72c53ee71ed1991651d38845cce67e3da756fab9500431d6f435fa5ad998c2b1
diff --git a/sci-libs/lmfit/files/lmfit-9.0-cmake.patch b/sci-libs/lmfit/files/lmfit-9.0-cmake.patch
new file mode 100644
index 00000000000..0c3270052cb
--- /dev/null
+++ b/sci-libs/lmfit/files/lmfit-9.0-cmake.patch
@@ -0,0 +1,50 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,9 +52,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set(destination ${CMAKE_INSTALL_PREFIX})
+ configure_file("lmfit.pc.in" "lmfit.pc" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc"
+- DESTINATION "${destination}/lib/pkgconfig/")
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+
+ include(CTest)
++include(GNUInstallDirs)
+
+ add_subdirectory(lib)
+ add_subdirectory(demo)
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -19,13 +19,13 @@ link_libm(${lib})
+
+ install(
+ TARGETS ${lib}
+- LIBRARY DESTINATION ${destination}/lib
+- RUNTIME DESTINATION ${destination}/lib
+- ARCHIVE DESTINATION ${destination}/lib
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/lib
+ COMPONENT Libraries)
+ install(
+ FILES ${inc_files}
+- DESTINATION ${destination}/include
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/include
+ COMPONENT Headers)
+
+ if(WIN32)
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -15,11 +15,11 @@ function(one_page pname section)
+ )
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}"
++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
+ )
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html"
++ DESTINATION "${CMAKE_INSTALL_DOCDIR}/html"
+ )
+ endfunction()
+
diff --git a/sci-libs/lmfit/lmfit-9.0-r1.ebuild b/sci-libs/lmfit/lmfit-9.0-r1.ebuild
new file mode 100644
index 00000000000..4c42caa6110
--- /dev/null
+++ b/sci-libs/lmfit/lmfit-9.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
+HOMEPAGE="https://jugit.fz-juelich.de/mlz/lmfit"
+SRC_URI="https://jugit.fz-juelich.de/mlz/lmfit/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake.patch
+)
diff --git a/sci-libs/lmfit/metadata.xml b/sci-libs/lmfit/metadata.xml
index 2550df8221b..8db92b6d42e 100644
--- a/sci-libs/lmfit/metadata.xml
+++ b/sci-libs/lmfit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index 65d38903cb3..86388f6e102 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,2 +1,3 @@
DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
DIST lrslib-071.tar.gz 460165 BLAKE2B 67be1ffac1c09a94773c69fc2215db19623bc8bc78be74342a1eda497b70eed2d8cb8e9b34ce269177154a4aed6f7bde02f632a536999b24f3116b3e69be456e SHA512 451aa5dada106516aeed1688c1e939a2e216ac760addb483f9cc1d5d4ac62e88af2772a6fa589b217b544621d041d94386a79502483db2eeaf04e90c4a3fd78e
+DIST lrslib-071b.tar.gz 466789 BLAKE2B 57a8abd9d203b1cdc62d6848afa77aa6912d9d720a0dedfbe72ca602ad8ba36d13160f7da7d719e3fa140ba2cb6432d20590ae9ea9b1f66bc2e24c393d9fe1bd SHA512 feafc5726e66c977e917f0b59ae950cdb98dbd84639885b487930aab2a89a7f067a3f39c381acc3eae7206b91255e1befa5551488d8816afc0f8054d801eb539
diff --git a/sci-libs/lrslib/files/lrslib-071b-makefile-cflags.patch b/sci-libs/lrslib/files/lrslib-071b-makefile-cflags.patch
new file mode 100644
index 00000000000..1cc8303f616
--- /dev/null
+++ b/sci-libs/lrslib/files/lrslib-071b-makefile-cflags.patch
@@ -0,0 +1,100 @@
+From 8a99af08a479c413d54c1a8def7479c778e55703 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 23 Oct 2021 07:53:22 -0400
+Subject: [PATCH 2/2] makefile: replace remaining "-O3" with $(CFLAGS).
+
+Some time in the past, $CFLAGS was inserted into most of the build
+rules, and defaulted to "-O3 -Wall" if the user does not override
+that. However a few lingering "-O3" and "-O3 -Wall" remain hard-
+coded in the makefile. Here we fix that.
+---
+ makefile | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/makefile b/makefile
+index fd8a613..c14b93e 100644
+--- a/makefile
++++ b/makefile
+@@ -64,12 +64,12 @@ MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrs
+
+ lrs: ${LRSOBJ}
+ $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o lrs ${LRSOBJ} -lgmp
+- $(CC) -O3 hvref.c $(LDFLAGS) -o hvref
++ $(CC) $(CFLAGS) hvref.c $(LDFLAGS) -o hvref
+ ln -s -f lrs redund
+
+ lrsmp: ${LRSOBJMP}
+ $(CC) ${CFLAGS} -DMA ${BITS} $(LDFLAGS) -o lrsmp ${LRSOBJMP}
+- $(CC) -O3 hvref.c $(LDFLAGS) -o hvref
++ $(CC) $(CFLAGS) hvref.c $(LDFLAGS) -o hvref
+ ln -s -f lrs redund
+
+ lrs64: ${LRSOBJ64}
+@@ -157,8 +157,8 @@ singlemplrs: mplrsgmp mplrs1 mplrs2
+
+ flint: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h
+ @test -d ${INCLUDEDIR}/flint || { echo ${INCLUDEDIR}/flint not found; exit 1; }
+- $(CC) -O3 -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint $(LDFLAGS) -o lrsflint -lgmp
+-# $(CC) -O3 -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp
++ $(CC) $(CFLAGS) -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint $(LDFLAGS) -o lrsflint -lgmp
++# $(CC) $(CFLAGS) -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp
+
+ mplrsflint: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.c lrsdriver.h
+ ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DPLRS $(LDFLAGS) -o mplrsflint mplrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp
+@@ -176,33 +176,33 @@ single: lrs.c lrslong.c lrslong.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver
+ ln -s -f lrs2 redund2
+
+ allmp: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c
+- $(CC) -Wall -O3 $(LDFLAGS) -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -Wall -O3 -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c
+- $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c
+- $(CC) -O3 -DLRS_QUIET $(LDFLAGS) -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static
+- $(CC) -O3 $(LDFLAGS) -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -O3 $(LDFLAGS) -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -O3 $(LDFLAGS) -o 2nash 2nash.c
++ $(CC) -Wall $(CFLAGS) $(LDFLAGS) -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c
++ $(CC) -Wall $(CFLAGS) -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c
++ $(CC) -Wall $(CFLAGS) -DSAFE -DLRSLONG ${BITS} $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c
++ $(CC) $(CFLAGS) -DLRS_QUIET $(LDFLAGS) -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static
++ $(CC) $(CFLAGS) $(LDFLAGS) -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -o 2nash 2nash.c
+
+ demo: lpdemo1.c lrslib.c lrsdriver.c lrslib.h lrsgmp.c lrsgmp.h
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+
+ lrsnash: lrsnash.c nashdemo.c lrsnashlib.c lrslib.c lrsnashlib.h lrslib.h lrsgmp.c lrsgmp.h lrslong.h lrsdriver.h lrsdriver.c
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS}
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o 2nash 2nash.c
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS}
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o 2nash 2nash.c
+ cp lrsnashgmp lrsnash
+
+ fel: fel.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c lrslong.c
+- $(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp $(LDFLAGS) -o felgmp
+- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE $(LDFLAGS) -o fel1
+- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} $(LDFLAGS) -o fel2
++ $(CC) $(CFLAGS) -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp $(LDFLAGS) -o felgmp
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE $(LDFLAGS) -o fel1
++ $(CC) $(CFLAGS) -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} $(LDFLAGS) -o fel2
+
+ ######################################################################
+ # From here on the author is David Bremner <bremner@unb.ca> to whom you should turn for help
+--
+2.32.0
+
diff --git a/sci-libs/lrslib/files/lrslib-071b-makefile-ldflags.patch b/sci-libs/lrslib/files/lrslib-071b-makefile-ldflags.patch
new file mode 100644
index 00000000000..c8c9bc1e820
--- /dev/null
+++ b/sci-libs/lrslib/files/lrslib-071b-makefile-ldflags.patch
@@ -0,0 +1,184 @@
+From f9a97514196eb35de1cdae1c1fc622c8aff5fb04 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 23 Oct 2021 07:37:57 -0400
+Subject: [PATCH 1/2] makefile: add $(LDFLAGS) to commands that induce linkage.
+
+Like the more-familiar CFLAGS, there is a standard variable called
+LDFLAGS that should be used while linking libraries and executables.
+The default compilation rules for POSIX make include it,
+
+ https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html
+
+This commit adds LDFLAGS to the custom makefile commands that link
+either an executable or a shared library.
+---
+ makefile | 80 ++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 40 insertions(+), 40 deletions(-)
+
+diff --git a/makefile b/makefile
+index 32e6b52..fd8a613 100644
+--- a/makefile
++++ b/makefile
+@@ -63,17 +63,17 @@ LRSOBJ64=lrs64.o lrslong1.o lrslib1.o lrslibgmp.o lrsgmp.o lrsdriver.o
+ MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs64.o
+
+ lrs: ${LRSOBJ}
+- $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
+- $(CC) -O3 hvref.c -o hvref
++ $(CC) ${CFLAGS} -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o lrs ${LRSOBJ} -lgmp
++ $(CC) -O3 hvref.c $(LDFLAGS) -o hvref
+ ln -s -f lrs redund
+
+ lrsmp: ${LRSOBJMP}
+- $(CC) ${CFLAGS} -DMA ${BITS} -o lrsmp ${LRSOBJMP}
+- $(CC) -O3 hvref.c -o hvref
++ $(CC) ${CFLAGS} -DMA ${BITS} $(LDFLAGS) -o lrsmp ${LRSOBJMP}
++ $(CC) -O3 hvref.c $(LDFLAGS) -o hvref
+ ln -s -f lrs redund
+
+ lrs64: ${LRSOBJ64}
+- $(CC) ${CFLAGS} -DMA -L${LIBDIR} -o lrs ${LRSOBJ64} -lgmp
++ $(CC) ${CFLAGS} -DMA -L${LIBDIR} $(LDFLAGS) -o lrs ${LRSOBJ64} -lgmp
+
+ lrs.o: lrs.c
+ $(CC) ${CFLAGS} -DMA ${BITS} -c -o lrs.o lrs.c
+@@ -106,7 +106,7 @@ lrsmp.o: lrsmp.c lrsmp.h
+ $(CC) ${CFLAGS} -DMA -DMP -c -o lrsmp.o lrsmp.c
+
+ checkpred: checkpred.c lrsgmp.h lrsgmp.c
+- $(CC) $(CFLAGS) -DGMP -lgmp -o checkpred checkpred.c lrsgmp.c
++ $(CC) $(CFLAGS) -DGMP -lgmp $(LDFLAGS) -o checkpred checkpred.c lrsgmp.c
+
+ lrslong1-mplrs.o: lrslong.c lrslong.h
+ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DLRSLONG -DPLRS -c -o lrslong1-mplrs.o lrslong.c
+@@ -136,73 +136,73 @@ mplrs64.o: mplrs.c mplrs.h lrslib.h lrsgmp.h
+ $(mpicxx) ${CFLAGS} -I${INCLUDEDIR} -DMA -DPLRS -DTIMES -DSIGNALS -D_WITH_GETLINE -c -o mplrs64.o mplrs.c
+
+ mplrs: ${MPLRSOBJ} mplrsgmp
+- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA ${BITS} -L${LIBDIR} -o mplrs ${MPLRSOBJ} -lgmp
++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA ${BITS} -L${LIBDIR} $(LDFLAGS) -o mplrs ${MPLRSOBJ} -lgmp
+
+ mplrs64: ${MPLRSOBJ64} mplrsgmp
+- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA -L${LIBDIR} -o mplrs ${MPLRSOBJ64} -lgmp
++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DMA -L${LIBDIR} $(LDFLAGS) -o mplrs ${MPLRSOBJ64} -lgmp
+
+ mplrsgmp: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c
+- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DGMP -I${INCLUDEDIR} mplrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -o mplrsgmp -lgmp
++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DGMP -I${INCLUDEDIR} mplrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} $(LDFLAGS) -o mplrsgmp -lgmp
+
+ mplrs1: mplrs.c mplrs.h lrslib.c lrslib.h lrslong.c lrslong.h lrsdriver.h lrsdriver.c
+- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DLRSLONG mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs1
++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DLRSLONG mplrs.c lrslib.c lrslong.c lrsdriver.c $(LDFLAGS) -o mplrs1
+
+ mplrs2: mplrs.c mplrs.h lrslib.c lrslib.h lrslong.c lrslong.h lrsdriver.h lrsdriver.c
+- $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DSAFE -DLRSLONG ${BITS} mplrs.c lrslib.c lrslong.c lrsdriver.c -o mplrs2
++ $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS -DSAFE -DLRSLONG ${BITS} mplrs.c lrslib.c lrslong.c lrsdriver.c $(LDFLAGS) -o mplrs2
+
+ mplrsmp: mplrs.c mplrs.h lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c
+- $(mpicxx) ${CFLAGS} -DMP -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS mplrs.c lrslib.c lrsmp.c lrsdriver.c -o mplrsmp
++ $(mpicxx) ${CFLAGS} -DMP -DTIMES -DSIGNALS -D_WITH_GETLINE -DPLRS mplrs.c lrslib.c lrsmp.c lrsdriver.c $(LDFLAGS) -o mplrsmp
+
+ singlemplrs: mplrsgmp mplrs1 mplrs2
+
+ flint: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h
+ @test -d ${INCLUDEDIR}/flint || { echo ${INCLUDEDIR}/flint not found; exit 1; }
+- $(CC) -O3 -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint -o lrsflint -lgmp
++ $(CC) -O3 -DFLINT -I/usr/local/include/flint lrs.c lrslib.c lrsgmp.c lrsdriver.c -L/usr/local/lib -Wl,-rpath=/usr/local/lib -lflint $(LDFLAGS) -o lrsflint -lgmp
+ # $(CC) -O3 -DFLINT -I${INCLUDEDIR} -I${INCLUDEDIR}/flint lrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -o lrsflint -lgmp
+
+ mplrsflint: mplrs.c mplrs.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.c lrsdriver.h
+- ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DPLRS -o mplrsflint mplrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp
++ ${mpicxx} ${CFLAGS} -DTIMES -DSIGNALS -D_WITH_GETLINE -DFLINT -I${INCLUDEDIR}/flint -DPLRS $(LDFLAGS) -o mplrsflint mplrs.c lrsdriver.c lrslib.c lrsgmp.c -L${LIBDIR} -lflint -lgmp
+
+ #comment out lines with ${BITS} if __int128 not supported by your C compiler
+
+ lrsgmp: lrs.c lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c
+- $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp
++ $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} $(LDFLAGS) -o lrsgmp lrs.c lrslib.c lrsgmp.c lrsdriver.c -L${LIBDIR} -lgmp
+ ln -s -f lrsgmp redundgmp
+
+ single: lrs.c lrslong.c lrslong.h lrslib.c lrslib.h lrsgmp.c lrsgmp.h lrsdriver.h lrsdriver.c
+- $(CC) ${CFLAGS} -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrslong.c lrsdriver.c
+- $(CC) ${CFLAGS} ${BITS} -DSAFE -DLRSLONG -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c
++ $(CC) ${CFLAGS} -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrslong.c lrsdriver.c
++ $(CC) ${CFLAGS} ${BITS} -DSAFE -DLRSLONG $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrslong.c lrsdriver.c
+ ln -s -f lrs1 redund1
+ ln -s -f lrs2 redund2
+
+ allmp: lrs.c lrslib.c lrslib.h lrsmp.c lrsmp.h lrsdriver.h lrsdriver.c
+- $(CC) -Wall -O3 -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -Wall -O3 -DSAFE -DLRSLONG -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c
+- $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c
+- $(CC) -O3 -DLRS_QUIET -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static
+- $(CC) -O3 -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -O3 -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c
+- $(CC) -O3 -o 2nash 2nash.c
++ $(CC) -Wall -O3 $(LDFLAGS) -o lrs lrs.c lrslib.c lrsdriver.c lrsmp.c
++ $(CC) -Wall -O3 -DSAFE -DLRSLONG $(LDFLAGS) -o lrs1 lrs.c lrslib.c lrsdriver.c lrslong.c
++ $(CC) -Wall -O3 -DSAFE -DLRSLONG ${BITS} $(LDFLAGS) -o lrs2 lrs.c lrslib.c lrsdriver.c lrslong.c
++ $(CC) -O3 -DLRS_QUIET $(LDFLAGS) -o lrsnash lrsnash.c lrsnashlib.c lrslib.c lrsdriver.c lrsmp.c -static
++ $(CC) -O3 $(LDFLAGS) -o setnash setupnash.c lrslib.c lrsdriver.c lrsmp.c
++ $(CC) -O3 $(LDFLAGS) -o setnash2 setupnash2.c lrslib.c lrsdriver.c lrsmp.c
++ $(CC) -O3 $(LDFLAGS) -o 2nash 2nash.c
+
+ demo: lpdemo1.c lrslib.c lrsdriver.c lrslib.h lrsgmp.c lrsgmp.h
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo1 lpdemo1.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo lpdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lpdemo2 lpdemo2.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o vedemo vedemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o chdemo chdemo.c lrslib.c lrsdriver.c lrsgmp.c -lgmp -DGMP
+
+ lrsnash: lrsnash.c nashdemo.c lrsnashlib.c lrslib.c lrsnashlib.h lrslib.h lrsgmp.c lrsgmp.h lrslong.h lrsdriver.h lrsdriver.c
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS}
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
+- $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} -o 2nash 2nash.c
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnashgmp lrsnash.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash1 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o lrsnash2 lrsnash.c lrsnashlib.c lrslib.c lrslong.c lrsdriver.c -DLRSLONG -DSAFE ${BITS}
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o nashdemo nashdemo.c lrsnashlib.c lrslib.c lrsgmp.c lrsdriver.c -lgmp -DGMP
++ $(CC) -O3 -I${INCLUDEDIR} -L${LIBDIR} $(LDFLAGS) -o 2nash 2nash.c
+ cp lrsnashgmp lrsnash
+
+ fel: fel.c lrslib.h lrslib.c lrsgmp.h lrsgmp.c lrslong.c
+- $(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp -o felgmp
+- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE -o fel1
+- $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} -o fel2
++ $(CC) -O3 -Wall -DGMP -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrsgmp.c -L${LIBDIR} -lgmp $(LDFLAGS) -o felgmp
++ $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE $(LDFLAGS) -o fel1
++ $(CC) -O3 -Wall -I${INCLUDEDIR} fel.c lrslib.c lrsdriver.c lrslong.c -L${LIBDIR} -DLRSLONG -DSAFE ${BITS} $(LDFLAGS) -o fel2
+
+ ######################################################################
+ # From here on the author is David Bremner <bremner@unb.ca> to whom you should turn for help
+@@ -228,7 +228,7 @@ SHLIBBIN=lrs-shared lrsnash-shared
+ # Building (linking) the shared library, and relevant symlinks.
+
+ ${SHLIB}: ${SHLIBOBJ}
+- $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ} -lgmp
++ $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) $(LDFLAGS) -o $@ ${SHLIBOBJ} -lgmp
+
+ ${SONAME}: ${SHLIB}
+ ln -sf ${SHLIB} ${SONAME}
+@@ -241,11 +241,11 @@ ${SHLINK}: ${SONAME}
+ all-shared: ${SHLIBBIN}
+
+ lrs-shared: ${SHLINK} lrs-shared.o
+- $(CC) $^ -o $@ -L . -llrs
++ $(CC) $^ $(LDFLAGS) -o $@ -L . -llrs
+
+
+ lrsnash-shared: ${SHLINK} lrsnash.c
+- $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp
++ $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} $(LDFLAGS) -o $@ -L . -llrs -lgmp
+
+ # driver object files
+
+--
+2.32.0
+
diff --git a/sci-libs/lrslib/lrslib-071b-r1.ebuild b/sci-libs/lrslib/lrslib-071b-r1.ebuild
new file mode 100644
index 00000000000..b252998413f
--- /dev/null
+++ b/sci-libs/lrslib/lrslib-071b-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Reverse-search algorithm for vertex enumeration problems"
+HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
+SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
+
+# COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version."
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="gmp mpi"
+
+BDEPEND=""
+RDEPEND="
+ gmp? (
+ dev-libs/gmp:0=
+ mpi? ( virtual/mpi )
+ )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-makefile-ldflags.patch"
+ "${FILESDIR}/${P}-makefile-cflags.patch"
+)
+
+src_prepare() {
+ default
+ tc-export CC
+
+ # The "makefile" sort-of supports CFLAGS as of lrslib-071b, but
+ # "-O3" is still included verbatim in many targets. Likewise, a
+ # LIBDIR variable exists but "lib" remains hard-coded in the install
+ # targets.
+ sed -e "s,/usr/local,${EPREFIX}/usr,g" \
+ -e "s,/lib,/$(get_libdir),g" \
+ -i makefile || die
+}
+
+src_compile() {
+ if use gmp ; then
+ emake
+ emake all-shared
+ use mpi && emake mplrs
+ else
+ emake allmp
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common
+ if use gmp; then
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+ use mpi && dobin mplrs
+ fi
+ dodoc README
+}
diff --git a/sci-libs/lrslib/lrslib-071b.ebuild b/sci-libs/lrslib/lrslib-071b.ebuild
new file mode 100644
index 00000000000..dce7bc19ece
--- /dev/null
+++ b/sci-libs/lrslib/lrslib-071b.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Reverse-search algorithm for vertex enumeration problems"
+HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
+SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
+
+# COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version."
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="gmp mpi"
+
+BDEPEND=""
+RDEPEND="
+ gmp? (
+ dev-libs/gmp:0=
+ mpi? ( virtual/mpi )
+ )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ tc-export CC
+
+ # The "makefile" sort-of supports CFLAGS as of lrslib-071b, but
+ # "-O3" is still included verbatim in many targets. Likewise, a
+ # LIBDIR variable exists but "lib" remains hard-coded in the install
+ # targets.
+ sed -e "s/-O3/${CFLAGS}/g" \
+ -e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
+ -e "s,/usr/local,${EPREFIX}/usr,g" \
+ -e "s,/lib,/$(get_libdir),g" \
+ -i makefile || die
+}
+
+src_compile() {
+ if use gmp ; then
+ emake
+ emake all-shared
+ use mpi && emake mplrs
+ else
+ emake allmp
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common
+ if use gmp; then
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+ use mpi && dobin mplrs
+ fi
+ dodoc README
+}
diff --git a/sci-libs/lrslib/metadata.xml b/sci-libs/lrslib/metadata.xml
index 8b97646ef0f..151b168de63 100644
--- a/sci-libs/lrslib/metadata.xml
+++ b/sci-libs/lrslib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/m4ri/metadata.xml b/sci-libs/m4ri/metadata.xml
index 002827f2523..189a75d32cd 100644
--- a/sci-libs/m4ri/metadata.xml
+++ b/sci-libs/m4ri/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/m4rie/metadata.xml b/sci-libs/m4rie/metadata.xml
index 91166811603..0c2d7316d12 100644
--- a/sci-libs/m4rie/metadata.xml
+++ b/sci-libs/m4rie/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/sci-libs/mathgl/metadata.xml b/sci-libs/mathgl/metadata.xml
index c8a7abfe76a..d0b3ea7deb5 100644
--- a/sci-libs/mathgl/metadata.xml
+++ b/sci-libs/mathgl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/matio/metadata.xml b/sci-libs/matio/metadata.xml
index 2bc7cf11270..52a162e0f28 100644
--- a/sci-libs/matio/metadata.xml
+++ b/sci-libs/matio/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/mc/metadata.xml b/sci-libs/mc/metadata.xml
index 8425c0d53cb..7d3acaf5d25 100644
--- a/sci-libs/mc/metadata.xml
+++ b/sci-libs/mc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch
new file mode 100644
index 00000000000..46d7ed21af8
--- /dev/null
+++ b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch
@@ -0,0 +1,117 @@
+From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 24 Aug 2021 08:32:13 +0200
+Subject: [PATCH] build against hdf5-1.12
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config/cmake_files/medMacros.cmake | 4 ++--
+ src/ci/MEDfileCompatibility.c | 2 +-
+ src/hdfi/_MEDfileCreate.c | 2 +-
+ src/hdfi/_MEDfileOpen.c | 2 +-
+ src/hdfi/_MEDmemFileOpen.c | 2 +-
+ src/hdfi/_MEDparFileCreate.c | 2 +-
+ src/hdfi/_MEDparFileOpen.c | 2 +-
+ 7 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake
+index 957c59b..d73c7af 100644
+--- a/config/cmake_files/medMacros.cmake
++++ b/config/cmake_files/medMacros.cmake
+@@ -447,13 +447,13 @@ MACRO(MED_FIND_HDF5)
+ ##
+ ## Requires 1.10.x version
+ ##
+- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
++ IF(HDF5_VERSION VERSION_LESS 1.10.2)
+ MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
+ ENDIF()
+ ##
+ ##
+
+- ADD_DEFINITIONS(-DH5_USE_16_API)
++ ADD_DEFINITIONS(-DH5_USE_18_API -DH5_USE_16_API)
+ IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS)
+ ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)
+ ENDIF()
+diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c
+index 1d6cabf..43b5b50 100644
+--- a/src/ci/MEDfileCompatibility.c
++++ b/src/ci/MEDfileCompatibility.c
+@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename,
+ #if MED_NUM_MAJEUR != 4
+ #error "Don't forget to update the test version here when you change the major version of the library !"
+ #endif
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
+ #error "Cf. _MEDfileCreate ..."
+ #endif
+diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c
+index 4bc9551..b670c92 100644
+--- a/src/hdfi/_MEDfileCreate.c
++++ b/src/hdfi/_MEDfileCreate.c
+@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
+ * En HDF5-1.10.0p1 cela n'a aucun effet !
+ * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+ */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+
+diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c
+index 8ace00e..ebd875b 100644
+--- a/src/hdfi/_MEDfileOpen.c
++++ b/src/hdfi/_MEDfileOpen.c
+@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
+
+ • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
+ */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+ /* L'avantage de bloquer le modèle interne HDF5
+diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c
+index ae92ba7..4a929ff 100644
+--- a/src/hdfi/_MEDmemFileOpen.c
++++ b/src/hdfi/_MEDmemFileOpen.c
+@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
+ goto ERROR;
+ }
+
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+ if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
+diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c
+index f0b77be..b7d1b78 100644
+--- a/src/hdfi/_MEDparFileCreate.c
++++ b/src/hdfi/_MEDparFileCreate.c
+@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc
+ * En HDF5-1.10.0p1 cela n'a aucun effet !
+ * Un test autoconf permet de fixer un intervalle de version HDF à MED.
+ */
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+
+diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c
+index 0a9700d..4933692 100644
+--- a/src/hdfi/_MEDparFileOpen.c
++++ b/src/hdfi/_MEDparFileOpen.c
+@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access
+ MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
+ goto ERROR;
+ }
+-#if H5_VERS_MINOR > 10
++#if H5_VERS_MINOR > 12
+ #error "Don't forget to change the compatibility version of the library !"
+ #endif
+ if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
+--
+2.32.0
+
diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild
index ab5056e4a4d..ec6eef42dc1 100644
--- a/sci-libs/med/med-4.1.0.ebuild
+++ b/sci-libs/med/med-4.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake fortran-2 python-single-r1
@@ -30,9 +30,11 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
+# "${FILESDIR}/${P}-0003-fix-hdf5-version-check.patch"
PATCHES=(
"${FILESDIR}/${P}-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch"
"${FILESDIR}/${P}-0002-Re-add-option-for-building-Fortran-library.patch"
+ "${FILESDIR}/${P}-0003-build-against-hdf5-1.12.patch"
)
DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO )
diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 3969f782cca..b744f23897b 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
diff --git a/sci-libs/metadata.xml b/sci-libs/metadata.xml
index b543f7c4216..883490ed5ec 100644
--- a/sci-libs/metadata.xml
+++ b/sci-libs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The sci-libs category contains various science-related libraries.
diff --git a/sci-libs/metis/files/metis-5.1.0-datatype.patch b/sci-libs/metis/files/metis-5.1.0-datatype.patch
deleted file mode 100644
index cbca8904ff7..00000000000
--- a/sci-libs/metis/files/metis-5.1.0-datatype.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/metis.h
-+++ b/include/metis.h
-@@ -30,7 +30,7 @@
- GCC does provides these definitions in stdint.h, but it may require some
- modifications on other architectures.
- --------------------------------------------------------------------------*/
--#define IDXTYPEWIDTH 32
-+#define IDXTYPEWIDTH 64
-
-
- /*--------------------------------------------------------------------------
-
diff --git a/sci-libs/metis/metadata.xml b/sci-libs/metis/metadata.xml
index cfc70289ed3..6415e7e43b5 100644
--- a/sci-libs/metis/metadata.xml
+++ b/sci-libs/metis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
deleted file mode 100644
index 692b7617144..00000000000
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A package for unstructured serial graph partitioning"
-HOMEPAGE="http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"
-SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc openmp"
-
-RDEPEND="!sci-libs/parmetis"
-
-PATCHES=(
- "${FILESDIR}"/${P}-datatype.patch
- "${FILESDIR}"/${P}-shared-GKlib.patch
- "${FILESDIR}"/${P}-multilib.patch
- "${FILESDIR}"/${P}-remove-GKlib-O3.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DGKLIB_PATH="${S}"/GKlib
- -DSHARED=yes
- -DOPENMP=$(usex openmp)
- )
- cmake_src_configure
-}
-
-src_test() {
- cd graphs || die
- local PATH="${BUILD_DIR}"/programs/:${PATH}
-
- ndmetis mdual.graph || die
- mpmetis metis.mesh 2 || die
- gpmetis test.mgraph 4 || die
- gpmetis copter2.graph 4 || die
- graphchk 4elt.graph || die
-}
-
-src_install() {
- cmake_src_install
- dodoc manual/manual.pdf
-
- cat >> "${T}"/metis.pc <<- EOF || die
- prefix=${EPREFIX}/usr
- exec_prefix=\${prefix}
- libdir=\${exec_prefix}/$(get_libdir)
- includedir=\${prefix}/include
-
- Name: METIS
- Description: Software for partioning unstructured graphes and meshes
- Version: ${PV}
- Cflags: -I\${includedir}/metis
- Libs: -L\${libdir} -lmetis
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${T}"/metis.pc
-}
diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild
index edba6584954..f45164ac35c 100644
--- a/sci-libs/metis/metis-5.1.0-r5.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc double-precision examples int64 openmp"
RDEPEND="!<sci-libs/parmetis-4.0.3-r2"
diff --git a/sci-libs/minuit/metadata.xml b/sci-libs/minuit/metadata.xml
index b6037a530db..f49fa95c688 100644
--- a/sci-libs/minuit/metadata.xml
+++ b/sci-libs/minuit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 59fd7e51f0f..07376226d86 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/mpfi/metadata.xml b/sci-libs/mpfi/metadata.xml
index a0c9c3fcbb0..3d28a394429 100644
--- a/sci-libs/mpfi/metadata.xml
+++ b/sci-libs/mpfi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-mathematics@gentoo.org</email>
diff --git a/sci-libs/mpir/metadata.xml b/sci-libs/mpir/metadata.xml
index cd50fabad65..069a5c0beae 100644
--- a/sci-libs/mpir/metadata.xml
+++ b/sci-libs/mpir/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
index 6c7bab904ee..48fbdcfacfa 100644
--- a/sci-libs/mumps/metadata.xml
+++ b/sci-libs/mumps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/mumps/mumps-5.3.5.ebuild b/sci-libs/mumps/mumps-5.3.5-r1.ebuild
index 76f2dbe8d4d..8f970661e82 100644
--- a/sci-libs/mumps/mumps-5.3.5.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5-r1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
mpi? ( >=sci-libs/parmetis-4 )
)
mpi? ( sci-libs/scalapack )
+ !mpi? ( virtual/lapack )
scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )
"
DEPEND="${RDEPEND}"
@@ -83,6 +84,8 @@ src_prepare() {
}
src_configure() {
+ # We abuse LIBADD here to work around the fact that MUMPS is criminally
+ # underlinked.
LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
local ord="-Dpord"
@@ -132,6 +135,7 @@ src_configure() {
-e "s;^\(SCALAP\s*=\).*;\1;" \
-e 's;^LIBSEQNEEDED =;LIBSEQNEEDED = libseqneeded;g' \
Makefile.inc || die
+ LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs lapack)"
export LINK="$(tc-getFC)"
fi
sed -i -e "s;^\s*\(ORDERINGSF\s*=\).*;\1 ${ord};" Makefile.inc || die
diff --git a/sci-libs/nanoflann/metadata.xml b/sci-libs/nanoflann/metadata.xml
index 55ff474ea24..8380ce09585 100644
--- a/sci-libs/nanoflann/metadata.xml
+++ b/sci-libs/nanoflann/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
diff --git a/sci-libs/neartree/metadata.xml b/sci-libs/neartree/metadata.xml
index be72ab17e93..409122f2c19 100644
--- a/sci-libs/neartree/metadata.xml
+++ b/sci-libs/neartree/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/nemesis/metadata.xml b/sci-libs/nemesis/metadata.xml
index 9599a858f64..fd6da0343cc 100644
--- a/sci-libs/nemesis/metadata.xml
+++ b/sci-libs/nemesis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch
new file mode 100644
index 00000000000..72db4dbd2c7
--- /dev/null
+++ b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.3.1-slibtool.patch
@@ -0,0 +1,42 @@
+https://github.com/Unidata/netcdf-cxx4/pull/103
+https://bugs.gentoo.org/778200
+
+From: orbea <orbea@riseup.net>
+Date: Thu, 25 Mar 2021 12:24:57 -0700
+Subject: [PATCH 1/2] cxx4: Move -lnetcdf to LIBADD so its used.
+
+--- a/cxx4/Makefile.am
++++ b/cxx4/Makefile.am
+@@ -3,15 +3,13 @@
+
+ # This file builds the new C++-4 interface.
+
+-# Point pre-preprocessor to netcdf-4 directory (libsrc4).
+-LDADD = $(top_builddir)/cxx4/libnetcdf_c++4.la -lnetcdf
+-
+ # This is our output library.
+ lib_LTLIBRARIES = libnetcdf_c++4.la
+
+ # For rules updating the version info, see
+ # http://www.gnu.org/s/libtool/manual/html_node/Updating-version-info.html
+ libnetcdf_c__4_la_LDFLAGS = -version-info 2:0:1 -no-undefined
++libnetcdf_c__4_la_LIBADD = -lnetcdf
+
+ # These headers will be installed in the users header directory.
+ include_HEADERS = netcdf ncAtt.h ncCheck.h ncDim.h ncException.h \
+
+From a6dd5eb862d9a845b8458591b957b07c527e0d20 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 25 Mar 2021 12:25:33 -0700
+Subject: [PATCH 2/2] plugins: Add a missing -lhdf5 linker flag.
+
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -20,6 +20,7 @@ lib_LTLIBRARIES = libh5bzip2.la
+
+ libh5bzip2_la_SOURCES = ${HDF5PLUGINSRC}
+ libh5bzip2_la_LDFLAGS = -module -avoid-version -shared -export-dynamic -no-undefined
++libh5bzip2_la_LIBADD = -lhdf5
+
+ libmisc_la_SOURCES = H5Zmisc.c H5Zutil.c h5misc.h
+ libmisc_la_LDFLAGS = -module -avoid-version -shared -export-dynamic -no-undefined -rpath ${abs_builddir}
diff --git a/sci-libs/netcdf-cxx/metadata.xml b/sci-libs/netcdf-cxx/metadata.xml
index 534ebb4466b..040a4543b31 100644
--- a/sci-libs/netcdf-cxx/metadata.xml
+++ b/sci-libs/netcdf-cxx/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 31c7a79c7e9..47e1c0f9bb2 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="UCAR-Unidata"
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="examples"
# 6 out of 9 fail, reported upstream
RESTRICT="test"
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${MYP}"
+PATCHES=(
+ "${FILESDIR}"/${P}-slibtool.patch
+)
+
src_configure() {
econf --disable-static
}
diff --git a/sci-libs/netcdf-fortran/metadata.xml b/sci-libs/netcdf-fortran/metadata.xml
index 907e9aef735..4e7a4a8023f 100644
--- a/sci-libs/netcdf-fortran/metadata.xml
+++ b/sci-libs/netcdf-fortran/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/netcdf/metadata.xml b/sci-libs/netcdf/metadata.xml
index b7e0ce8e79e..acecc3ab296 100644
--- a/sci-libs/netcdf/metadata.xml
+++ b/sci-libs/netcdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/netcdf/netcdf-4.7.4.ebuild b/sci-libs/netcdf/netcdf-4.7.4.ebuild
index 428737d15aa..a537ce445a2 100644
--- a/sci-libs/netcdf/netcdf-4.7.4.ebuild
+++ b/sci-libs/netcdf/netcdf-4.7.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-c-${PV}"
LICENSE="UCAR-Unidata"
SLOT="0/18"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/sci-libs/nfft/metadata.xml b/sci-libs/nfft/metadata.xml
index b759151e3dc..4eda0251b43 100644
--- a/sci-libs/nfft/metadata.xml
+++ b/sci-libs/nfft/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>junghans@gentoo.org</email>
diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml
index 35f045929ff..10605909bb4 100644
--- a/sci-libs/nlopt/metadata.xml
+++ b/sci-libs/nlopt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index 7590eee2b11..01368b67d50 100644
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-r1 cmake fortran-2
diff --git a/sci-libs/numkit/metadata.xml b/sci-libs/numkit/metadata.xml
index a8fbd089f37..a882eb598c6 100644
--- a/sci-libs/numkit/metadata.xml
+++ b/sci-libs/numkit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>alexxy@gentoo.org</email>
diff --git a/sci-libs/o2scl/metadata.xml b/sci-libs/o2scl/metadata.xml
index e560f8975f9..bfbde3f72f1 100644
--- a/sci-libs/o2scl/metadata.xml
+++ b/sci-libs/o2scl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/oc/metadata.xml b/sci-libs/oc/metadata.xml
index 611da852fac..0551933b820 100644
--- a/sci-libs/oc/metadata.xml
+++ b/sci-libs/oc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/oce/metadata.xml b/sci-libs/oce/metadata.xml
index 8afc4aac139..2fecd54ca11 100644
--- a/sci-libs/oce/metadata.xml
+++ b/sci-libs/oce/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>zoltan@sinustrom.info</email>
diff --git a/sci-libs/octomap/metadata.xml b/sci-libs/octomap/metadata.xml
index d6afbe70c1f..50ea9cff57e 100644
--- a/sci-libs/octomap/metadata.xml
+++ b/sci-libs/octomap/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/ogdi/metadata.xml b/sci-libs/ogdi/metadata.xml
index 2dc0ec7a6b9..c51ca536091 100644
--- a/sci-libs/ogdi/metadata.xml
+++ b/sci-libs/ogdi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
index 8c064938d77..8a821d13f95 100644
--- a/sci-libs/ogdi/ogdi-4.1.0.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 282547b8ee4..b0a64a31bb4 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,5 +1,2 @@
-DIST openblas-0.3.12.tar.gz 12325103 BLAKE2B 3d6706e59e83f87dd58b287753bf697de99e83c8a4484453f120d8f8c9c69ea5b481a143db04342a1dcb1779ce548a49618cf4941d08d636e12ed481305e8fb5 SHA512 1ff5a065c41f7e460857f8428fc77900b189f051fa8129eea9ae93237f234d387cc1c6e627c2c95636164f512d4d721d4229729f04a04e8d5f655abbf5463d98
-DIST openblas-0.3.13.tar.gz 12437434 BLAKE2B d8f9d3296506c6148cd506278f0b6a2a4fe50975a7fd3f54108e98e88a13002b1035f5697322ba73df7c6397faee6d0772c1d4d46b66db8e862f17b980dbdf97 SHA512 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
-DIST openblas-0.3.14.tar.gz 12460465 BLAKE2B 9505ff6e132581ecc86159fb84192c6bbce0f2974293eaf1b4aca6b96b5da85823bfc1bced65a96930674fd4781ea3e375aed09cbdc9930cef26694c9f8e1c80 SHA512 c7d5947ada525a32bc6e97ff94272df9730fa5fb06102e06e80472baedc1a9119d82050cdaede192db15f816ae7143784d7801b61b64fab5b5cf97cdbd5e625e
-DIST openblas-0.3.15.tar.gz 12498434 BLAKE2B acf3d15e002686bcd84323616387dcf540b58d57392a4862cb556da58d873a8c40783fc4fdae45170aeb204ede3451843c44e3f5e264f76c9a7486b30b3f4cc7 SHA512 c07964ead5ffe9cf088364697bfe5cb409170663e420bdcd08a6366a028625d2a3c23ee4ddbaf0e625860a9fd08cbbb39f97eb985c366c052696d6f8598a844f
DIST openblas-0.3.17.tar.gz 12513037 BLAKE2B bb3a89500f242613a6bed73519702995cf1e82dcfec49f9469ecfd6647121260a4364582dbc257a75212320b5690ba93e75a0f2762dce7f398ef6443b169b4e4 SHA512 a97745c1f050ea44fce5f1722810de469612d374a29796a874d12673d6ad189872160cc2b5d0885790e6562d9d7ade629144c86f2649e668b0d4def36aa74495
+DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index ae6d647a3f8..11aed171af8 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/openblas/openblas-0.3.12-r1.ebuild b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
deleted file mode 100644
index 4d8d73725fd..00000000000
--- a/sci-libs/openblas/openblas-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/OpenBLAS-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
-REQUIRED_USE="?? ( openmp pthread )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- eselect-ldso? (
- >=app-eselect/eselect-blas-0.2
- >=app-eselect/eselect-lapack-0.2
- )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
- "${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
-)
-
-pkg_pretend() {
- elog "This software has a massive number of options that"
- elog "are configurable and it is *impossible* for all of"
- elog "those to fit inside any manageable ebuild."
- elog "The Gentoo provided package has enough to build"
- elog "a fully optimized library for your targeted CPU."
- elog "You can set the CPU target using the environment"
- elog "variable - OPENBLAS_TARGET or it will be detected"
- elog "automatically from the target toolchain (supports"
- elog "cross compilation toolchains)."
- elog "You can control the maximum number of threads"
- elog "using OPENBLAS_NTHREAD, default=64 and number of "
- elog "parallel calls to allow before further calls wait"
- elog "using OPENBLAS_NPARALLEL, default=8."
-}
-
-pkg_setup() {
- fortran-2_pkg_setup
-
- # List of most configurable options - Makefile.rule
-
- # https://github.com/xianyi/OpenBLAS/pull/2663
- tc-export CC FC LD AR AS RANLIB
-
- # HOSTCC is used for scripting
- export HOSTCC=$(tc-getBUILD_CC)
-
- # threading options
- use openmp && tc-check-openmp
- USE_THREAD=0
- if use openmp; then
- USE_THREAD=1; USE_OPENMP=1;
- elif use pthread; then
- USE_THREAD=1; USE_OPENMP=0;
- fi
- export USE_THREAD USE_OPENMP
-
- # We need to filter these while building the library, and not just
- # while building the test suite. Will hopefully get fixed upstream:
- # https://github.com/xianyi/OpenBLAS/issues/2657
- use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
-
- # disable submake with -j and default optimization flags
- # in Makefile.system
- # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
- export MAKE_NB_JOBS=-1 \
- COMMON_OPT=" " \
- FCOMMON_OPT=" "
-
- # Target CPU ARCH options
- # generally detected automatically from cross toolchain
- use dynamic && \
- export DYNAMIC_ARCH=1 \
- NO_AFFINITY=1 \
- TARGET=GENERIC
-
- export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
- NUM_THREADS=${OPENBLAS_NTHREAD:-64}
-
- # setting OPENBLAS_TARGET to override auto detection
- # in case the toolchain is not enough to detect
- # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
- if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
- export TARGET="${OPENBLAS_TARGET}"
- fi
-
- export NO_STATIC=1
-
- BUILD_RELAPACK=1
- if ! use relapack; then
- BUILD_RELAPACK=0
- fi
-
- export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
-}
-
-src_prepare() {
- default
-
- # Disable tests by default
- sed -e "/^all ::/s/tests //" -i Makefile || die
-
- # if 64bit-index is needed, create second library
- # with LIBPREFIX=libopenblas64
- if use index-64bit; then
- cp -aL "${S}" "${S}-index-64bit" || die
- fi
-}
-
-src_compile() {
- default
- cd interface || die
- emake shared-blas-lapack
-
- if use index-64bit; then
- emake -C"${S}-index-64bit" \
- INTERFACE64=1 \
- LIBPREFIX=libopenblas64
- fi
-}
-
-src_test() {
- emake tests
-}
-
-src_install() {
- emake install DESTDIR="${D}" \
- OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
- OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-
- dodoc GotoBLAS_*.txt *.md Changelog.txt
-
- if use index-64bit; then
- dolib.so "${S}-index-64bit"/libopenblas64*.so*
- fi
-
- if use eselect-ldso; then
- insinto /usr/$(get_libdir)/blas/openblas/
- doins interface/libblas.so.3
- dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
- doins interface/libcblas.so.3
- dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
- insinto /usr/$(get_libdir)/lapack/openblas/
- doins interface/liblapack.so.3
- dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
- doins interface/liblapacke.so.3
- dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
- fi
-}
-
-pkg_postinst() {
- use eselect-ldso || return
- local libdir=$(get_libdir) me="openblas"
-
- # check blas
- eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
- local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
- if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
- eselect blas set ${libdir} ${me}
- elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
- else
- elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
- elog "To use blas [${me}] implementation, you have to issue (as root):"
- elog "\t eselect blas set ${libdir} ${me}"
- fi
-
- # check lapack
- eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
- local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
- if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
- eselect lapack set ${libdir} ${me}
- elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
- else
- elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
- elog "To use lapack [${me}] implementation, you have to issue (as root):"
- elog "\t eselect lapack set ${libdir} ${me}"
- fi
-}
-
-pkg_postrm() {
- if use eselect-ldso; then
- eselect blas validate
- eselect lapack validate
- fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.14.ebuild b/sci-libs/openblas/openblas-0.3.14.ebuild
deleted file mode 100644
index 4d8d73725fd..00000000000
--- a/sci-libs/openblas/openblas-0.3.14.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/OpenBLAS-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
-REQUIRED_USE="?? ( openmp pthread )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- eselect-ldso? (
- >=app-eselect/eselect-blas-0.2
- >=app-eselect/eselect-lapack-0.2
- )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
- "${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
-)
-
-pkg_pretend() {
- elog "This software has a massive number of options that"
- elog "are configurable and it is *impossible* for all of"
- elog "those to fit inside any manageable ebuild."
- elog "The Gentoo provided package has enough to build"
- elog "a fully optimized library for your targeted CPU."
- elog "You can set the CPU target using the environment"
- elog "variable - OPENBLAS_TARGET or it will be detected"
- elog "automatically from the target toolchain (supports"
- elog "cross compilation toolchains)."
- elog "You can control the maximum number of threads"
- elog "using OPENBLAS_NTHREAD, default=64 and number of "
- elog "parallel calls to allow before further calls wait"
- elog "using OPENBLAS_NPARALLEL, default=8."
-}
-
-pkg_setup() {
- fortran-2_pkg_setup
-
- # List of most configurable options - Makefile.rule
-
- # https://github.com/xianyi/OpenBLAS/pull/2663
- tc-export CC FC LD AR AS RANLIB
-
- # HOSTCC is used for scripting
- export HOSTCC=$(tc-getBUILD_CC)
-
- # threading options
- use openmp && tc-check-openmp
- USE_THREAD=0
- if use openmp; then
- USE_THREAD=1; USE_OPENMP=1;
- elif use pthread; then
- USE_THREAD=1; USE_OPENMP=0;
- fi
- export USE_THREAD USE_OPENMP
-
- # We need to filter these while building the library, and not just
- # while building the test suite. Will hopefully get fixed upstream:
- # https://github.com/xianyi/OpenBLAS/issues/2657
- use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
-
- # disable submake with -j and default optimization flags
- # in Makefile.system
- # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
- export MAKE_NB_JOBS=-1 \
- COMMON_OPT=" " \
- FCOMMON_OPT=" "
-
- # Target CPU ARCH options
- # generally detected automatically from cross toolchain
- use dynamic && \
- export DYNAMIC_ARCH=1 \
- NO_AFFINITY=1 \
- TARGET=GENERIC
-
- export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
- NUM_THREADS=${OPENBLAS_NTHREAD:-64}
-
- # setting OPENBLAS_TARGET to override auto detection
- # in case the toolchain is not enough to detect
- # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
- if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
- export TARGET="${OPENBLAS_TARGET}"
- fi
-
- export NO_STATIC=1
-
- BUILD_RELAPACK=1
- if ! use relapack; then
- BUILD_RELAPACK=0
- fi
-
- export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
-}
-
-src_prepare() {
- default
-
- # Disable tests by default
- sed -e "/^all ::/s/tests //" -i Makefile || die
-
- # if 64bit-index is needed, create second library
- # with LIBPREFIX=libopenblas64
- if use index-64bit; then
- cp -aL "${S}" "${S}-index-64bit" || die
- fi
-}
-
-src_compile() {
- default
- cd interface || die
- emake shared-blas-lapack
-
- if use index-64bit; then
- emake -C"${S}-index-64bit" \
- INTERFACE64=1 \
- LIBPREFIX=libopenblas64
- fi
-}
-
-src_test() {
- emake tests
-}
-
-src_install() {
- emake install DESTDIR="${D}" \
- OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
- OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-
- dodoc GotoBLAS_*.txt *.md Changelog.txt
-
- if use index-64bit; then
- dolib.so "${S}-index-64bit"/libopenblas64*.so*
- fi
-
- if use eselect-ldso; then
- insinto /usr/$(get_libdir)/blas/openblas/
- doins interface/libblas.so.3
- dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
- doins interface/libcblas.so.3
- dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
- insinto /usr/$(get_libdir)/lapack/openblas/
- doins interface/liblapack.so.3
- dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
- doins interface/liblapacke.so.3
- dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
- fi
-}
-
-pkg_postinst() {
- use eselect-ldso || return
- local libdir=$(get_libdir) me="openblas"
-
- # check blas
- eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
- local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
- if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
- eselect blas set ${libdir} ${me}
- elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
- else
- elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
- elog "To use blas [${me}] implementation, you have to issue (as root):"
- elog "\t eselect blas set ${libdir} ${me}"
- fi
-
- # check lapack
- eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
- local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
- if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
- eselect lapack set ${libdir} ${me}
- elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
- else
- elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
- elog "To use lapack [${me}] implementation, you have to issue (as root):"
- elog "\t eselect lapack set ${libdir} ${me}"
- fi
-}
-
-pkg_postrm() {
- if use eselect-ldso; then
- eselect blas validate
- eselect lapack validate
- fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.15.ebuild b/sci-libs/openblas/openblas-0.3.15.ebuild
deleted file mode 100644
index 4566f928af8..00000000000
--- a/sci-libs/openblas/openblas-0.3.15.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/OpenBLAS-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
-REQUIRED_USE="?? ( openmp pthread )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- eselect-ldso? (
- >=app-eselect/eselect-blas-0.2
- >=app-eselect/eselect-lapack-0.2
- )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
- "${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
-)
-
-pkg_pretend() {
- elog "This software has a massive number of options that"
- elog "are configurable and it is *impossible* for all of"
- elog "those to fit inside any manageable ebuild."
- elog "The Gentoo provided package has enough to build"
- elog "a fully optimized library for your targeted CPU."
- elog "You can set the CPU target using the environment"
- elog "variable - OPENBLAS_TARGET or it will be detected"
- elog "automatically from the target toolchain (supports"
- elog "cross compilation toolchains)."
- elog "You can control the maximum number of threads"
- elog "using OPENBLAS_NTHREAD, default=64 and number of "
- elog "parallel calls to allow before further calls wait"
- elog "using OPENBLAS_NPARALLEL, default=8."
-}
-
-pkg_setup() {
- fortran-2_pkg_setup
-
- # List of most configurable options - Makefile.rule
-
- # https://github.com/xianyi/OpenBLAS/pull/2663
- tc-export CC FC LD AR AS RANLIB
-
- # HOSTCC is used for scripting
- export HOSTCC=$(tc-getBUILD_CC)
-
- # threading options
- use openmp && tc-check-openmp
- USE_THREAD=0
- if use openmp; then
- USE_THREAD=1; USE_OPENMP=1;
- elif use pthread; then
- USE_THREAD=1; USE_OPENMP=0;
- fi
- export USE_THREAD USE_OPENMP
-
- # We need to filter these while building the library, and not just
- # while building the test suite. Will hopefully get fixed upstream:
- # https://github.com/xianyi/OpenBLAS/issues/2657
- use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
-
- # disable submake with -j and default optimization flags
- # in Makefile.system
- # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
- export MAKE_NB_JOBS=-1 \
- COMMON_OPT=" " \
- FCOMMON_OPT=" "
-
- # Target CPU ARCH options
- # generally detected automatically from cross toolchain
- use dynamic && \
- export DYNAMIC_ARCH=1 \
- NO_AFFINITY=1 \
- TARGET=GENERIC
-
- export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
- NUM_THREADS=${OPENBLAS_NTHREAD:-64}
-
- # setting OPENBLAS_TARGET to override auto detection
- # in case the toolchain is not enough to detect
- # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
- if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
- export TARGET="${OPENBLAS_TARGET}"
- fi
-
- export NO_STATIC=1
-
- BUILD_RELAPACK=1
- if ! use relapack; then
- BUILD_RELAPACK=0
- fi
-
- export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
-}
-
-src_prepare() {
- default
-
- # Disable tests by default
- sed -e "/^all ::/s/tests //" -i Makefile || die
-
- # if 64bit-index is needed, create second library
- # with LIBPREFIX=libopenblas64
- if use index-64bit; then
- cp -aL "${S}" "${S}-index-64bit" || die
- fi
-}
-
-src_compile() {
- default
- cd interface || die
- emake shared-blas-lapack
-
- if use index-64bit; then
- emake -C"${S}-index-64bit" \
- INTERFACE64=1 \
- LIBPREFIX=libopenblas64
- fi
-}
-
-src_test() {
- emake tests
-}
-
-src_install() {
- emake install DESTDIR="${D}" \
- OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
- OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-
- dodoc GotoBLAS_*.txt *.md Changelog.txt
-
- if use index-64bit; then
- dolib.so "${S}-index-64bit"/libopenblas64*.so*
- fi
-
- if use eselect-ldso; then
- insinto /usr/$(get_libdir)/blas/openblas/
- doins interface/libblas.so.3
- dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
- doins interface/libcblas.so.3
- dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
- insinto /usr/$(get_libdir)/lapack/openblas/
- doins interface/liblapack.so.3
- dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
- doins interface/liblapacke.so.3
- dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
- fi
-}
-
-pkg_postinst() {
- use eselect-ldso || return
- local libdir=$(get_libdir) me="openblas"
-
- # check blas
- eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
- local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
- if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
- eselect blas set ${libdir} ${me}
- elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
- else
- elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
- elog "To use blas [${me}] implementation, you have to issue (as root):"
- elog "\t eselect blas set ${libdir} ${me}"
- fi
-
- # check lapack
- eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
- local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
- if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
- eselect lapack set ${libdir} ${me}
- elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
- else
- elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
- elog "To use lapack [${me}] implementation, you have to issue (as root):"
- elog "\t eselect lapack set ${libdir} ${me}"
- fi
-}
-
-pkg_postrm() {
- if use eselect-ldso; then
- eselect blas validate
- eselect lapack validate
- fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.17.ebuild b/sci-libs/openblas/openblas-0.3.17.ebuild
index 4566f928af8..4d8d73725fd 100644
--- a/sci-libs/openblas/openblas-0.3.17.ebuild
+++ b/sci-libs/openblas/openblas-0.3.17.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/OpenBLAS-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
REQUIRED_USE="?? ( openmp pthread )"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/openblas/openblas-0.3.13.ebuild b/sci-libs/openblas/openblas-0.3.18.ebuild
index 4566f928af8..7d76564474c 100644
--- a/sci-libs/openblas/openblas-0.3.13.ebuild
+++ b/sci-libs/openblas/openblas-0.3.18.ebuild
@@ -27,7 +27,6 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
- "${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
)
pkg_pretend() {
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 29f10ccec88..a6e46ffdc98 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,3 +1,4 @@
DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
+DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 9477ecff134..b0acd7390fe 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>waebbl-gentoo@posteo.net</email>
diff --git a/sci-libs/opencascade/opencascade-7.5.3.ebuild b/sci-libs/opencascade/opencascade-7.5.3.ebuild
new file mode 100644
index 00000000000..23b32a16122
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-7.5.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PV="$(ver_rs 1- '_')"
+PV_MAJ="$(ver_cut 1-2)"
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://www.opencascade.com"
+SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/occt-V${MY_PV}"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV_MAJ}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk"
+
+REQUIRED_USE="?? ( optimize tbb )"
+
+# There's no easy way to test. Testing needs a rather big environment
+# properly set up.
+RESTRICT="test"
+
+RDEPEND="
+ app-eselect/eselect-opencascade
+ dev-lang/tcl:=
+ dev-lang/tk:=
+ dev-tcltk/itcl
+ dev-tcltk/itk
+ dev-tcltk/tix
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/ftgl
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXmu
+ examples? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols2:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+ ffmpeg? ( media-video/ffmpeg:= )
+ freeimage? ( media-libs/freeimage )
+ tbb? ( dev-cpp/tbb )
+ vtk? ( sci-libs/vtk:=[rendering] )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/eigen
+ dev-libs/rapidjson
+"
+BDEPEND="
+ app-eselect/eselect-opencascade
+ doc? ( app-doc/doxygen )
+ examples? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5.1-0001-allow-default-search-path-for-Qt5.patch
+ "${FILESDIR}"/${PN}-7.5.1-0002-remove-unnecessary-Qt5-check.patch
+ "${FILESDIR}"/${PN}-7.5.1-0003-add-Gentoo-configuration-type.patch
+ "${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
+ "${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
+ "${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
+ "${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ use debug && append-cppflags -DDEBUG
+
+ sed -e 's|/lib\$|/'$(get_libdir)'\$|' \
+ -i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+ # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+ # assumptions it makes about installation paths. Rather than fixing it, just
+ # get rid of the mechanism altogether - its purpose is to allow a
+ # side-by-side installation of release and debug libraries.
+ sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+ -i adm/cmake/occt_toolkit.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOC_Overview=$(usex doc)
+ -DBUILD_Inspector=$(usex examples)
+ -DBUILD_WITH_DEBUG=$(usex debug)
+ -DINSTALL_DIR_BIN="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${P}"
+ -DINSTALL_DIR_DOC="share/doc/${PF}"
+ -DINSTALL_DIR_LIB="$(get_libdir)/${P}"
+ -DINSTALL_DIR_SCRIPT="$(get_libdir)/${P}/bin"
+ -DINSTALL_DIR_WITH_VERSION=ON
+ -DINSTALL_SAMPLES=$(usex examples)
+ -DINSTALL_TEST_CASES=NO
+ -DUSE_D3D=NO
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FREEIMAGE=$(usex freeimage)
+ -DUSE_FREETYPE=ON
+ -DUSE_GLES2=$(usex gles2)
+ -DUSE_RAPIDJSON=$(usex json)
+ -DUSE_TBB=$(usex tbb)
+ -DUSE_VTK=$(usex vtk)
+ )
+
+ use doc && mycmakeargs+=( -DINSTALL_DOC_Overview=ON )
+
+ if use examples; then
+ mycmakeargs+=(
+ -D3RDPARTY_QT_DIR="${ESYSROOT}"/usr
+ -DBUILD_SAMPLES_QT=ON
+ )
+ fi
+
+ if use vtk; then
+ if has_version ">=sci-libs/vtk-9.0.0"; then
+ mycmakeargs+=(
+ -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+ -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0
+ -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+ )
+ fi
+ fi
+
+ cmake_src_configure
+
+ # prepare /etc/env.d file
+ sed -e "s|lib/|$(get_libdir)/|" \
+ -e "s|VAR_PV|${PV}|" \
+ -e "s|VAR_CASROOT|${ESYSROOT}/usr|" \
+ < "${FILESDIR}"/${PN}-${PV_MAJ}.env.in > "${T}"/${PV_MAJ} || die
+
+ # use TBB for memory allocation optimizations
+ if use tbb; then
+ sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/${PV_MAJ} || die
+ fi
+
+ # use internal optimized memory manager and don't clear memory with this
+ # memory manager.
+ if use optimize ; then
+ sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=1|' \
+ -e 's|^#MMGT_CLEAR=1$|MMGT_CLEAR=0|' \
+ -i "${T}"/${PV_MAJ} || die
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ # respect slotting
+ insinto "/etc/env.d/${PN}"
+ doins "${T}/${PV_MAJ}"
+
+ # remove examples
+ if use !examples; then
+ rm -r "${ED}/usr/share/${P}/samples" || die
+ fi
+
+ docompress -x /usr/share/doc/${PF}/overview/html
+}
+
+pkg_postinst() {
+ eselect ${PN} set ${PV_MAJ} || die "failed to switch to updated implementation"
+ einfo "You can switch between available ${PN} implementations using eselect ${PN}"
+}
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index d1a7c272dd2..0672751ba74 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1 +1,2 @@
DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
+DIST openlibm-0.8.0.tar.gz 367130 BLAKE2B e516fee18203040b8f3cdffab10c4ca22df638551b420ec7e679ff373221973a013c93520b29395c61c8ef0f0f6c87516c1d4a9885c3bbb5e8cae8900efee6ea SHA512 336dfac1fd4ab6ce256aa0129a211c3556eac46d2e775e5cec9626dc5bbcb4d5e65c86617d72e531694e8c8e6320a0fabc76600a02b0ac9f1d652774d0a94440
diff --git a/sci-libs/openlibm/metadata.xml b/sci-libs/openlibm/metadata.xml
index cd02d5ec288..af499f7d92f 100644
--- a/sci-libs/openlibm/metadata.xml
+++ b/sci-libs/openlibm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/openlibm/openlibm-0.8.0.ebuild b/sci-libs/openlibm/openlibm-0.8.0.ebuild
new file mode 100644
index 00000000000..ba45cbd625f
--- /dev/null
+++ b/sci-libs/openlibm/openlibm-0.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="High quality system independent, open source libm"
+HOMEPAGE="https://github.com/JuliaLang/openlibm"
+SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
+# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+ default
+ sed -e "/^OLM_LIBS :=/s/^/#/" \
+ -e "/install: /s/install-static//" \
+ -i Makefile || die
+}
+
+src_configure() {
+ tc-export CC CXX FC AR LD
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+ libdir="${EPREFIX}/usr/$(get_libdir)" install
+ dodoc README.md
+}
diff --git a/sci-libs/orocos-bfl/metadata.xml b/sci-libs/orocos-bfl/metadata.xml
index 0dca5e8d094..89b74507195 100644
--- a/sci-libs/orocos-bfl/metadata.xml
+++ b/sci-libs/orocos-bfl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 1e4e4131ca2..4e6fd68874c 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1 +1 @@
-DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
+DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
deleted file mode 100644
index d3205b55628..00000000000
--- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 719735a7d36f079f63c4be06bf3118581f628562 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 3 Apr 2021 18:39:42 +0200
-Subject: [PATCH] don't install kdl.tag file
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- doc/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index dcc81b0..cc1774e 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,4 +1,3 @@
-
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" IMMEDIATE @ONLY)
- ADD_CUSTOM_TARGET(docs "doxygen" "Doxyfile")
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdl.tag DESTINATION share/doc/liborocos-kdl/ OPTIONAL) # only installs if found.
---
-2.31.1
-
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
deleted file mode 100644
index fe7eb126f84..00000000000
--- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 54e66339b734639dc42b63b65a8a4b100f2549c3 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 3 Apr 2021 18:46:42 +0200
-Subject: [PATCH] add LIB_SUFFIX in pkg-config file
-
-Add the LIB_SUFFIX suffix to the libdir variable
-in the kdl.pc.in file.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/kdl.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kdl.pc.in b/src/kdl.pc.in
-index 49e2ab9..1650e2e 100644
---- a/src/kdl.pc.in
-+++ b/src/kdl.pc.in
-@@ -1,5 +1,5 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--libdir=${prefix}/lib
-+libdir=${prefix}/lib@LIB_SUFFIX@
- includedir=${prefix}/include
-
- Name: orocos-kdl
---
-2.31.1
-
diff --git a/sci-libs/orocos_kdl/metadata.xml b/sci-libs/orocos_kdl/metadata.xml
index 8e818f01bbf..1977fd3cda9 100644
--- a/sci-libs/orocos_kdl/metadata.xml
+++ b/sci-libs/orocos_kdl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
index 175baf488d1..bb20a06d821 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
@@ -19,7 +19,7 @@ else
fi
LICENSE="LGPL-2.1"
-SLOT="0/14"
+SLOT="0/15"
IUSE="doc examples models test"
REQUIRED_USE="examples? ( models )"
RESTRICT="!test? ( test )"
@@ -31,12 +31,9 @@ BDEPEND="
test? ( dev-util/cppunit )
"
-PATCHES=(
- "${FILESDIR}"/${P}-0001-don-t-install-kdl.tag-file.patch
- "${FILESDIR}"/${P}-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
-)
-
src_configure() {
+ # disable catkin support
+ sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die
local mycmakeargs=(
-DBUILD_MODELS=$(usex models ON OFF)
-DENABLE_EXAMPLES=$(usex examples)
@@ -73,8 +70,4 @@ src_install() {
docinto examples
dodoc -r "${S}"/examples/.
fi
-
- # Need to have package.xml in our custom gentoo path
- insinto /usr/share/ros_packages/${PN}
- doins "${ED}/usr/share/${PN}/package.xml"
}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index d50c631a39c..bb20a06d821 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -19,7 +19,7 @@ else
fi
LICENSE="LGPL-2.1"
-SLOT="0/14"
+SLOT="0/15"
IUSE="doc examples models test"
REQUIRED_USE="examples? ( models )"
RESTRICT="!test? ( test )"
@@ -31,11 +31,9 @@ BDEPEND="
test? ( dev-util/cppunit )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.0-0001-don-t-install-kdl.tag-file.patch
-)
-
src_configure() {
+ # disable catkin support
+ sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die
local mycmakeargs=(
-DBUILD_MODELS=$(usex models ON OFF)
-DENABLE_EXAMPLES=$(usex examples)
@@ -72,8 +70,4 @@ src_install() {
docinto examples
dodoc -r "${S}"/examples/.
fi
-
- # Need to have package.xml in our custom gentoo path
- insinto /usr/share/ros_packages/${PN}
- doins "${S}/package.xml"
}
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 9140b29444a..53d047ba796 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,4 +1,2 @@
-DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
-DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index 35ac42b0102..c58dd131de0 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
deleted file mode 100644
index ee878cbfc3e..00000000000
--- a/sci-libs/p4est/p4est-2.2-r100.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
-else
- SRC_URI="
- https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
-REQUIRED_USE="${LUA_REQUIRED_USE}
- romio? ( mpi )"
-
-RDEPEND="${LUA_DEPS}
- ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
- sys-apps/util-linux
- virtual/blas
- virtual/lapack
- mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.11
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-src_prepare() {
- default
-
- # Inject libsc to get all parts of the build system...
- if ! [[ ${PV} = *9999* ]]; then
- rmdir "${S}/sc" || die "rmdir failed"
- mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
- fi
-
- # Inject a version number into the build system
- echo "${PV}" > ${S}/.tarball-version
-
- AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
- eautoreconf
-
- sed -i \
- "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
- "${S}"/configure || die "sed failed"
-
- sed -i \
- "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
- "${S}"/configure || die "sed failed"
-}
-
-src_configure() {
- # avoid underlinkage
- LDFLAGS="${LDFLAGS} -lsc"
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable mpi)
- $(use_enable openmp)
- $(use_enable romio mpiio)
- $(use_enable static-libs static)
- $(use_enable threads pthread)
- $(use_enable vtk-binary)
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/usr"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- use doc && dodoc -r doc/*
-
- if use examples
- then
- docinto examples
- dodoc -r example/*
- docompress -x /usr/share/doc/${PF}/examples
- else
- # Remove compiled example binaries in case of -examples:
- rm -r "${ED}"/usr/bin || die "rm failed"
- fi
-
- # Fix wrong installation paths:
- dodir /usr/share/p4est
- mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
- mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
- rmdir "${ED}"/etc/ || die "rmdir failed"
-}
diff --git a/sci-libs/p4est/p4est-2.3.1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
index 597b67a136a..c7756fee11c 100644
--- a/sci-libs/p4est/p4est-2.3.1.ebuild
+++ b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-{1..3} )
-inherit autotools lua-single toolchain-funcs
+inherit autotools flag-o-matic lua-single toolchain-funcs
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
HOMEPAGE="http://www.p4est.org/"
@@ -26,34 +26,31 @@ LICENSE="GPL-2+"
SLOT="0"
# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+IUSE="debug doc examples mpi openmp romio threads +vtk-binary"
REQUIRED_USE="${LUA_REQUIRED_USE}
romio? ( mpi )"
RDEPEND="${LUA_DEPS}
- ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
+ ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=]
sys-apps/util-linux
virtual/blas
virtual/lapack
mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/automake
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
"${FILESDIR}"/${PN}-2.3-add_soname.patch
)
-DOCS=( AUTHORS NEWS README )
-
pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ lua-single_pkg_setup
}
src_prepare() {
@@ -82,19 +79,19 @@ src_prepare() {
src_configure() {
# avoid underlinkage
- LDFLAGS="${LDFLAGS} -lsc"
+ append-libs -lsc
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable mpi)
$(use_enable openmp)
$(use_enable romio mpiio)
- $(use_enable static-libs static)
$(use_enable threads pthread)
$(use_enable vtk-binary)
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/usr"
+ --with-sc="${ESYSROOT}/usr"
)
econf "${myeconfargs[@]}"
}
@@ -119,4 +116,7 @@ src_install() {
mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
rmdir "${ED}"/etc/ || die "rmdir failed"
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index bb4b3a864ed..c7756fee11c 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -5,10 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-{1..3} )
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools lua-single toolchain-funcs
+inherit autotools flag-o-matic lua-single toolchain-funcs
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
HOMEPAGE="http://www.p4est.org/"
@@ -29,29 +26,31 @@ LICENSE="GPL-2+"
SLOT="0"
# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+IUSE="debug doc examples mpi openmp romio threads +vtk-binary"
REQUIRED_USE="${LUA_REQUIRED_USE}
romio? ( mpi )"
RDEPEND="${LUA_DEPS}
- ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
+ ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=]
sys-apps/util-linux
virtual/blas
virtual/lapack
mpi? ( virtual/mpi[romio=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.11
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
+ "${FILESDIR}"/${PN}-2.3-add_soname.patch
+)
pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ lua-single_pkg_setup
}
src_prepare() {
@@ -80,19 +79,19 @@ src_prepare() {
src_configure() {
# avoid underlinkage
- LDFLAGS="${LDFLAGS} -lsc"
+ append-libs -lsc
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable mpi)
$(use_enable openmp)
$(use_enable romio mpiio)
- $(use_enable static-libs static)
$(use_enable threads pthread)
$(use_enable vtk-binary)
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/usr"
+ --with-sc="${ESYSROOT}/usr"
)
econf "${myeconfargs[@]}"
}
@@ -117,4 +116,7 @@ src_install() {
mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
rmdir "${ED}"/etc/ || die "rmdir failed"
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/sci-libs/parmetis/metadata.xml b/sci-libs/parmetis/metadata.xml
index cf1b66e8126..62de4c03afb 100644
--- a/sci-libs/parmetis/metadata.xml
+++ b/sci-libs/parmetis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 54351d75797..67a373f2321 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,3 +1,2 @@
DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
-DIST pastix_5.2.2.22.tar.bz2 2664470 BLAKE2B b1fbd12bf2c882aa8fd2c4891a6890df4bdc4488cedca2a7861e676ec5678063927f2e4a4edc47aa7ca0422b283f8f012aa1032af7212fe39f4c55e7f0f7adc4 SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70
DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
diff --git a/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch b/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
deleted file mode 100644
index 8aa7c06e5c9..00000000000
--- a/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Add missing cast to floating-point type:
-* sopalin/src/variable_csc.c: In function ‘vcsc_add_node’:
-* sopalin/src/variable_csc.c:138:13: error: non-floating-point argument in call to function ‘__builtin_isnan’
-* if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
-See also:
-https://bugs.gentoo.org/show_bug.cgi?id=580422
-
---- src/common/src/errors.h
-+++ src/common/src/errors.h
-@@ -140,7 +140,7 @@
- * expr - The value to check.
- */
- #define CHECK_NAN(expr) { \
-- ASSERT_DEBUG(!isnan(expr), DBG_SOPALIN_NAN); \
-+ ASSERT_DEBUG(!isnan(((double) expr)), DBG_SOPALIN_NAN); \
- ASSERT_DEBUG(!isinf(expr), DBG_SOPALIN_INF); \
- }
- #else
---- src/sopalin/src/variable_csc.c
-+++ src/sopalin/src/variable_csc.c
-@@ -135,7 +135,7 @@
- #endif
-
- for (ii = 0; ii < dof2; ii++) {
-- if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
-+ if (isnan(((double) vcsc->values[COL-1][i*dof2 + ii]))) {
- vcsc->values[COL-1][i*dof2 + ii] = VALUE[ii];
- } else {
- vcsc->values[COL-1][i*dof2 + ii] = op(vcsc->values[COL-1][i*dof2 + ii],
-@@ -252,7 +252,7 @@
- vcsc->rows[COL_NODE][i]);
- }
- #endif
-- if (isnan(vcsc->values[COL_NODE][idx])) {
-+ if (isnan(((double) vcsc->values[COL_NODE][idx]))) {
- vcsc->values[COL_NODE][idx] = VALUE;
- } else {
- vcsc->values[COL_NODE][idx] = op(vcsc->values[COL_NODE][idx],
-@@ -660,7 +660,7 @@
- } else {
- INTS iterdof;
- for (iterdof = 0; iterdof < dof2; iterdof++) {
-- if (!isnan(vcsc->values[MYCOL-1][dof2*iter2+iterdof])) {
-+ if (!isnan(((double) vcsc->values[MYCOL-1][dof2*iter2+iterdof]))) {
- /* ignore NaN values from VCSC */
- (*values_o)[dof2*iter3+iterdof] = op(
- (*values_o)[dof2*iter3+iterdof],
diff --git a/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
deleted file mode 100644
index c01b02bb8f7..00000000000
--- a/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./sopalin/src/updo.c.orig 2016-02-23 01:42:00.000000000 +0000
-+++ ./sopalin/src/updo.c 2016-02-23 01:42:10.000000000 +0000
-@@ -940,8 +940,10 @@
- i = TASK_CBLKNUM(i);
- # define END_LOOP(a) } SMP_END_LOOP(a)
- # else /* SMP_SOPALIN */
--# define START_LOOP for (i=0;i<SYMB_CBLKNBR;i++)
--# define END_LOOP
-+# define START_LOOP \
-+ int bubnum = me; \
-+ for (i=0;i<SYMB_CBLKNBR;i++)
-+# define END_LOOP(a) a
- # endif
-
- /* Xi=(Dii)-1Xi; */
diff --git a/sci-libs/pastix/metadata.xml b/sci-libs/pastix/metadata.xml
index 1a653c7ffd2..219e89c8192 100644
--- a/sci-libs/pastix/metadata.xml
+++ b/sci-libs/pastix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
deleted file mode 100644
index dbb6464862a..00000000000
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fortran-2 toolchain-funcs
-
-# TODO:
-# testing: emake examples?
-# better doc instalation and building
-# pypastix (separate package?)
-# multilib with eselect?
-# static libs building without pic
-# metis?
-
-# package id: change every version, see the link on inriaforge
-PID=35070
-# commit id: change every version
-#CID=351ef60
-# leave empty if this is not a post release bug fix
-#PPV=bugfix9_
-#MYPN=pastix_release
-#SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${MYPN}_${PPV}${CID}.tar.bz2"
-
-DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="https://pastix.gforge.inria.fr"
-SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi +smp starpu static-libs"
-
-RDEPEND="
- sci-libs/scotch:0=[int64?,mpi?]
- sys-apps/hwloc:0=
- virtual/blas
- mpi? ( virtual/mpi )
- starpu? ( dev-libs/starpu:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-nosmp-undefined-variable.patch"
- "${FILESDIR}/${P}-isnan-floating-point-cast.patch"
-)
-S="${WORKDIR}/${PN}_${PV}/src"
-
-src_prepare() {
- default
- sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
- -e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
- -e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
- -e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \
- -e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \
- -e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
- -e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
- -e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
- -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \
- -e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
- -e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
- -e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
- -e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \
- -e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \
- -e '/fPIC/s/^#//g' \
- -e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \
- -e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
- -e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \
- -e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
- -e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \
- -e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \
- -e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
- -e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
- -e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
- config/LINUX-GNU.in > config.in || die
- sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
-}
-
-src_configure() {
- if use amd64; then
- sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
- -i config.in || die
- fi
-
- if use int64; then
- sed -e '/VERSIONINT.*_int64/s/#//' \
- -e '/CCTYPES.*INTSSIZE64/s/#//' \
- -i config.in || die
- fi
-
- if ! use mpi; then
- sed -e '/VERSIONMPI.*_nompi/s/#//' \
- -e '/CCTYPES.*NOMPI/s/#//' \
- -e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
- -e '/MCFPROG\s*= $(CFPROG)/s/#//' \
- -e 's/-DDISTRIBUTED//' \
- -e 's/-lptscotch/-lscotch/g' \
- -i config.in || die
- fi
-
- if ! use smp; then
- sed -e '/VERSIONSMP.*_nosmp/s/#//' \
- -e '/CCTYPES.*NOSMP/s/#//' \
- -i config.in || die
- fi
-
- if use starpu; then
- sed -e '/libstarpu/s/#//g' -i config.in || die
- fi
-}
-
-src_compile() {
- emake all drivers
-}
-
-src_test() {
- # both test and tests targets are defined and do not work
- echo
-}
-
-src_install() {
- default
- sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die
- # quick and dirty (static libs should really be built without pic)
- cd .. || die
- dodoc README.txt doc/refcard/refcard.pdf
-}
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 79b393d3665..9e3d9459f74 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.
LICENSE="CeCILL-C"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc int64 mpi +smp starpu static-libs"
RDEPEND="
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
index 7131f14b3a7..499b8e68c76 100644
--- a/sci-libs/pastix/pastix-6.0.3.ebuild
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/${PID}/${P}.tar.gz"
LICENSE="CeCILL-C"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="cuda examples +fortran int64 metis mpi +python +scotch starpu test"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index d847e57fb44..e3641c7c81c 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1 +1 @@
-DIST pcl-1.11.1.tar.gz 68515312 BLAKE2B b6e8810861ca715acd9e97ad2b7d62ba9bf18b6a5ce3f13d7e2967f994ac39c42ba08aca83e1ae2186b986e4caf065d25d80d16d2c81a33838bde29326657e7a SHA512 93dd3180443a1a26f019bfd1e34855014619b3b74326ae93806a2711dba392b1c76f2aa682cc3955c651a45ce829a0c89d1cae7cef09cdea60fcb671aefe4da2
+DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f
diff --git a/sci-libs/pcl/metadata.xml b/sci-libs/pcl/metadata.xml
index aeefe273d2b..2bb119042ee 100644
--- a/sci-libs/pcl/metadata.xml
+++ b/sci-libs/pcl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/sci-libs/pcl/pcl-1.11.1-r1.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild
index 4f9bd374f66..1ab0b8e362f 100644
--- a/sci-libs/pcl/pcl-1.11.1-r1.ebuild
+++ b/sci-libs/pcl/pcl-1.12.0.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
fi
-inherit ${SCM} cmake-utils multilib
+inherit ${SCM} cmake multilib
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
@@ -22,7 +22,7 @@ fi
HOMEPAGE="https://pointclouds.org/"
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
-SLOT="0/1.11"
+SLOT="0/1.12"
IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
RESTRICT="!test? ( test )"
@@ -79,5 +79,5 @@ src_configure() {
"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
"-DBUILD_TESTS=$(usex test TRUE FALSE)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 4f9bd374f66..1ab0b8e362f 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
fi
-inherit ${SCM} cmake-utils multilib
+inherit ${SCM} cmake multilib
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
@@ -22,7 +22,7 @@ fi
HOMEPAGE="https://pointclouds.org/"
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
-SLOT="0/1.11"
+SLOT="0/1.12"
IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
RESTRICT="!test? ( test )"
@@ -79,5 +79,5 @@ src_configure() {
"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
"-DBUILD_TESTS=$(usex test TRUE FALSE)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/sci-libs/pgplot/metadata.xml b/sci-libs/pgplot/metadata.xml
index 1f8f0d3e10f..0bcf04505a3 100644
--- a/sci-libs/pgplot/metadata.xml
+++ b/sci-libs/pgplot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index 88a36164cbf..e203bf027c4 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/primegen/metadata.xml b/sci-libs/primegen/metadata.xml
index b9ad1c8da71..3b04521c13d 100644
--- a/sci-libs/primegen/metadata.xml
+++ b/sci-libs/primegen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-mathematics@gentoo.org</email>
diff --git a/sci-libs/profnet/metadata.xml b/sci-libs/profnet/metadata.xml
index 959160fe46b..ccdff086e20 100644
--- a/sci-libs/profnet/metadata.xml
+++ b/sci-libs/profnet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
diff --git a/sci-libs/profnet/profnet-1.0.22.ebuild b/sci-libs/profnet/profnet-1.0.22.ebuild
index df450e7e8d3..5488f1435de 100644
--- a/sci-libs/profnet/profnet-1.0.22.ebuild
+++ b/sci-libs/profnet/profnet-1.0.22.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit fortran-2 toolchain-funcs
+inherit flag-o-matic fortran-2 toolchain-funcs
DESCRIPTION="Neural network architecture for profacc"
HOMEPAGE="https://rostlab.org/"
SRC_URI="ftp://rostlab.org/profnet/${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-3"
+SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
RDEPEND="sys-libs/libunwind"
DEPEND="${RDEPEND}"
src_prepare() {
+ default
sed \
-e '/$@/s:-o:$(LDFLAGS) -o:g' \
-i src-phd/Makefile || die
}
src_compile() {
+ append-fflags $(test-flags-FC -fallow-argument-mismatch)
emake \
F77=$(tc-getF77) \
FFLAGS="${FFLAGS}"
@@ -34,4 +35,7 @@ src_install() {
DESTDIR="${D}" \
prefix="${EPREFIX}/usr" \
install
+
+ # Don't install compressed man pages
+ find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die
}
diff --git a/sci-libs/profphd-utils/metadata.xml b/sci-libs/profphd-utils/metadata.xml
index 959160fe46b..ccdff086e20 100644
--- a/sci-libs/profphd-utils/metadata.xml
+++ b/sci-libs/profphd-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
diff --git a/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild b/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
index 83d0f8485e0..288f583f659 100644
--- a/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
+++ b/sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
inherit fortran-2 toolchain-funcs
@@ -9,13 +9,11 @@ DESCRIPTION="Additional utils for profphd"
HOMEPAGE="https://rostlab.org/"
SRC_URI="ftp://rostlab.org/profphd-utils/${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-3"
+SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND=""
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
src_compile() {
emake \
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 6e3fbe16ce7..a87805e63cf 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,5 +1,7 @@
DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
+DIST proj-8.1.1.tar.gz 5797853 BLAKE2B 5ff7640a4727db836b4ed00b36ba914b7f27e0890629dfa9c0cb477c00b74a43b6312ae45bd9fffe75e945689575def021a891110cb43dfaa2dff03624f479c2 SHA512 1f18ad83bae40c6c910900a062bd41c331838add6eebb7e83b4784e4e06fbf48706cee24aadbefe0f138f081ecc02e93a2b6fd45a84806e1372bf2997dafa852
+DIST proj-data-1.7.tar.gz 585899744 BLAKE2B 4d5c81ed64a1ee20b8bd7abf0426ced747e9050d8d7548815365d35884dd3952252a716df9d38986e4bb2e450436df206ce7b51dca77ee35a681e4028b11a54f SHA512 03865e972cc5898b3995582e5a5b8d129609b89ef9a077fa775aaf0b2f4a6002605cd657443840d83ffd5f56233d7d248e3442f7d0efdddfd0f90f2959831310
DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
diff --git a/sci-libs/proj/metadata.xml b/sci-libs/proj/metadata.xml
index e36b505c091..7fcefae65e2 100644
--- a/sci-libs/proj/metadata.xml
+++ b/sci-libs/proj/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-libs/proj/proj-7.2.1.ebuild b/sci-libs/proj/proj-7.2.1.ebuild
index 11efd85db87..248dca09f02 100644
--- a/sci-libs/proj/proj-7.2.1.ebuild
+++ b/sci-libs/proj/proj-7.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0/19"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="curl europe static-libs test +tiff"
REQUIRED_USE="test? ( !europe )"
diff --git a/sci-libs/proj/proj-8.1.0-r1.ebuild b/sci-libs/proj/proj-8.1.0-r1.ebuild
index 501de56a4e6..9898a2c4666 100644
--- a/sci-libs/proj/proj-8.1.0-r1.ebuild
+++ b/sci-libs/proj/proj-8.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="curl europe test +tiff"
REQUIRED_USE="test? ( !europe )"
diff --git a/sci-libs/proj/proj-8.1.1.ebuild b/sci-libs/proj/proj-8.1.1.ebuild
new file mode 100644
index 00000000000..7c632133dcf
--- /dev/null
+++ b/sci-libs/proj/proj-8.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+PROJ_DATA="proj-data-1.7.tar.gz"
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj.org/"
+SRC_URI="
+ https://download.osgeo.org/proj/${P}.tar.gz
+ https://download.osgeo.org/proj/${PROJ_DATA}
+"
+
+LICENSE="MIT"
+# SONAME in 8.1.1 is actually 23 (in 8.1.0, was 22)
+# It's far less confusing to just increment it again here (so N+1)
+SLOT="0/24"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="curl test +tiff"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+ curl? ( net-misc/curl )
+ tiff? ( media-libs/tiff )"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ cd "${S}"/data || die
+ mv README README.DATA || die
+
+ unpack ${PROJ_DATA}
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOCDIR="${EPREFIX}"/usr/share/${PF}
+ -DBUILD_TESTING=$(usex test)
+ -DENABLE_CURL=$(usex curl)
+ -DBUILD_PROJSYNC=$(usex curl)
+ -DENABLE_TIFF=$(usex tiff)
+ )
+
+ use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ cd data || die
+ dodoc README.DATA
+
+ find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/punc/metadata.xml b/sci-libs/punc/metadata.xml
index 3298e3c4690..7356f2ef0ca 100644
--- a/sci-libs/punc/metadata.xml
+++ b/sci-libs/punc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/pyshp/metadata.xml b/sci-libs/pyshp/metadata.xml
index 3da8982993c..6635cddf96e 100644
--- a/sci-libs/pyshp/metadata.xml
+++ b/sci-libs/pyshp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tomjbe@gentoo.org</email>
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 61b75a6891b..647c94900bf 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1 +1 @@
-DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b
+DIST qd-2.3.23.tar.gz 781558 BLAKE2B bbda1ede1e93c100ca831b3eddc34ad6092007f9674c83803e5a5e140f80cc6b4b41fa71857beb9ef255d77265470537e43ef81886d6a013958a429b1c641c55 SHA512 ab311883db7708cee1c307eead5d02dac3b9809389b8d29e2fda5207decb752ca360a9aab234dd8a70228e0e004a6b6d6cdf92fd098536e96a2fa01c5b2ced2c
diff --git a/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch b/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch
deleted file mode 100644
index 204880de95c..00000000000
--- a/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -U3 -r qd-2.3.22.orig/configure.ac qd-2.3.22/configure.ac
---- qd-2.3.22.orig/configure.ac 2018-10-30 23:01:31.000000000 +0700
-+++ qd-2.3.22/configure.ac 2018-11-09 21:45:39.415092314 +0700
-@@ -18,14 +18,14 @@
-
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE([nostdinc foreign])
--AM_CONFIG_HEADER([config.h])
--AM_CONFIG_HEADER([include/qd/qd_config.h])
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_HEADERS([include/qd/qd_config.h])
-
- AC_CANONICAL_HOST
-
- # Checks for arguments
- # --enable-inline
--AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions. [[default=yes]]]))
-+AC_ARG_ENABLE([inline], AS_HELP_STRING(--enable-inline, [inline commonly used functions. [[default=yes]]]))
- AC_MSG_CHECKING([if commonly used function is to be inlined])
- if test "$enable_inline" != "no"; then
- enable_inline="yes"
-@@ -34,7 +34,7 @@
- AC_MSG_RESULT($enable_inline)
-
- # --enable-ieee-add
--AC_ARG_ENABLE(enable_ieee_add, AC_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound. [[default=no]]]))
-+AC_ARG_ENABLE([ieee-add], AS_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound. [[default=no]]]))
- AC_MSG_CHECKING([if addition with IEEE-style error bound is to be used])
- if test "$enable_ieee_add" = "yes"; then
- AC_DEFINE([QD_IEEE_ADD], [1], [Define to 1 to use additions with IEEE-style error bounds.])
-@@ -44,7 +44,7 @@
- AC_MSG_RESULT($enable_ieee_add)
-
- # --enable-sloppy-mul
--AC_ARG_ENABLE(enable_sloppy_mul, AC_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication. [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-mul], AS_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication. [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy multiplication is to be used])
- if test "$enable_sloppy_mul" != "no"; then
- enable_sloppy_mul="yes"
-@@ -53,7 +53,7 @@
- AC_MSG_RESULT($enable_sloppy_mul)
-
- # --enable-sloppy-div
--AC_ARG_ENABLE(enable_sloppy_div, AC_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division. [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-div], AS_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division. [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy division is to be used])
- if test "$enable_sloppy_div" != "no"; then
- enable_sloppy_div="yes"
-@@ -63,7 +63,7 @@
-
-
- # --enable-debug
--AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
-+AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
- AC_MSG_CHECKING([if debugging code is to be enabled])
- if test "$enable_debug" = "yes"; then
- AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.])
-@@ -73,7 +73,7 @@
- AC_MSG_RESULT($enable_debug)
-
- # --enable-warnings
--AC_ARG_ENABLE(enable_warnings, AC_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
-+AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
- AC_MSG_CHECKING([if compiler warnings is to be enabled])
- if test "$enable_warnings" != "yes"; then
- enable_warnings="no"
-@@ -83,13 +83,6 @@
-
- # Checks for programs.
- AC_LANG(C++)
--if test "$CXXFLAGS" = ""; then
-- if test "$enable_debug" = "yes"; then
-- CXXFLAGS="-O"
-- else
-- CXXFLAGS="-O2"
-- fi
--fi
-
- # Set up compiler search list. DUe to possible case insensitive filesystems,
- # Cygwin and Apple systems sometimes gets confused between cc and CC.
-@@ -106,50 +99,10 @@
- fi
- AC_PROG_CC
-
--
--CXX_PROG_NAME=`basename $CXX`
--case $host in
-- powerpc*-*-*)
-- case "$CXX_PROG_NAME" in
-- xlC*)
-- REQ_CXXFLAGS="$REQ_CXXFLAGS -qstrict"
-- ;;
-- esac
-- ;;
-- i?86-*-* | k?*-*-* | athlon-*-* | ia64-*-* | x86_64-*-*)
-- case "$CXX_PROG_NAME" in
-- icc|icpc|ecc)
-- REQ_CXXFLAGS="$REQ_CXXFLAGS -mp"
-- if test "$enable_warnings" = "yes"; then
-- CXXFLAGS="$CXXFLAGS -wd1572 -wd981 -wd1418 -wd1419"
-- fi
-- ;;
-- esac
-- ;;
-- alpha*-*-*)
-- case "$CXX_PROG_NAME" in
-- cxx)
-- CXXFLAGS="$CXXFLAGS -std strict_ansi -tweak"
-- ;;
-- esac
-- ;;
--esac
--
--AC_SUBST(REQ_CXXFLAGS)
--CXXFLAGS="$CXXFLAGS $REQ_CXXFLAGS"
--
--if test "$enable_warnings" = "yes"; then
-- if test "$GCC" = "yes"; then
-- CXXFLAGS="$CXXFLAGS -Wall"
-- fi
--fi
--
--if test "$enable_debug" = "yes"; then
-- CXXFLAGS="$CXXFLAGS -g"
--fi
-+CXXFLAGS="${CXXFLAGS} -Wall"
-
- # --enable-fma
--AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]]))
-+AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]]))
- if test "x$enable_fma" = "x"; then
- enable_fma="auto"
- fi
-@@ -248,7 +201,7 @@
- FCFLAGS="-O2"
- fi
- fi
--AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
-+AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
- if test "$enable_fortran" != "no"; then
- AC_LANG_PUSH(Fortran)
- AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90])
-@@ -312,8 +265,7 @@
- AC_CHECK_LIB(m,sqrt)
-
- # libtool stuff
--AC_DISABLE_SHARED
--AC_PROG_LIBTOOL
-+LT_INIT
-
- # Output
- AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile
-diff -U3 -r qd-2.3.22.orig/fortran/Makefile.am qd-2.3.22/fortran/Makefile.am
---- qd-2.3.22.orig/fortran/Makefile.am 2018-10-30 23:05:01.000000000 +0700
-+++ qd-2.3.22/fortran/Makefile.am 2018-11-09 21:47:44.530083871 +0700
-@@ -16,7 +16,9 @@
-
- lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
- libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
-+libqdmod_la_LIBADD = $(top_builddir)/src/libqd.la $(FCLIBS)
- libqd_f_main_la_SOURCES = main.cpp
-+libqd_f_main_la_LIBADD = $(top_builddir)/src/libqd.la libqdmod.la $(FCLIBS)
- ddmod.lo: $(DDEXT) ddext.lo
- qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
- $(QDMOD): qdmod.lo $(DDMOD)
-diff -U3 -r qd-2.3.22.orig/qd-config.in qd-2.3.22/qd-config.in
---- qd-2.3.22.orig/qd-config.in 2018-10-30 23:04:56.000000000 +0700
-+++ qd-2.3.22/qd-config.in 2018-11-09 21:49:18.140077553 +0700
-@@ -14,7 +14,7 @@
- build_CXXFLAGS="@CXXFLAGS@"
- build_LDFLAGS="@LDFLAGS@"
- CXX="@CXX@"
--CXXFLAGS="-I$includedir @REQ_CXXFLAGS@"
-+CXXFLAGS="-I$includedir"
- FC="@FC@"
-
- LDFLAGS="-L$libdir -lqd @LIBS@"
diff --git a/sci-libs/qd/metadata.xml b/sci-libs/qd/metadata.xml
index 8425c0d53cb..7d3acaf5d25 100644
--- a/sci-libs/qd/metadata.xml
+++ b/sci-libs/qd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/qd/qd-2.3.22.ebuild b/sci-libs/qd/qd-2.3.23.ebuild
index 46948cd5589..e3d6651702a 100644
--- a/sci-libs/qd/qd-2.3.22.ebuild
+++ b/sci-libs/qd/qd-2.3.23.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
FORTRAN_NEEDED=fortran
@@ -9,28 +9,20 @@ inherit autotools fortran-2
DESCRIPTION="Quad-double and double-double float arithmetics"
HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
+SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran static-libs"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
+IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
src_configure() {
econf \
- --disable-ieee-add \
+ --disable-static \
+ --enable-ieee-add \
--disable-sloppy-mul \
--disable-sloppy-div \
--enable-inline \
- --enable-shared \
- $(use_enable static-libs static) \
$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
$(use_enable fortran)
}
@@ -42,10 +34,8 @@ src_install() {
dosym dd_real.h /usr/include/qd/dd.h
if ! use doc; then
- rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die
+ rm "${ED}"/usr/share/doc/${PF}/*.pdf || die
fi
- if ! use static-libs; then
- find "${D}" -name '*.la' -delete || die
- fi
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/sci-libs/qfits/metadata.xml b/sci-libs/qfits/metadata.xml
index 223e7f7b167..e73e6952b88 100644
--- a/sci-libs/qfits/metadata.xml
+++ b/sci-libs/qfits/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-astronomy@gentoo.org</email>
diff --git a/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
index 9c9ef931734..1fdbd946e99 100644
--- a/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
+++ b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
@@ -1,7 +1,8 @@
-diff -Nur qrupdate-1.1.1.orig/Makefile qrupdate-1.1.1/Makefile
---- qrupdate-1.1.1.orig/Makefile 2009-02-06 09:12:00.000000000 +0000
-+++ qrupdate-1.1.1/Makefile 2010-05-13 17:27:15.000000000 +0100
-@@ -32,22 +32,22 @@
+diff --git a/Makefile b/Makefile
+index f9dbe86..2b11b59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,22 +32,22 @@ help:
@echo " make install - installs everything"
lib:
@@ -32,10 +33,11 @@ diff -Nur qrupdate-1.1.1.orig/Makefile qrupdate-1.1.1/Makefile
install-staticlib:
- make -C src/ install-staticlib
+ $(MAKE) -C src install-staticlib
-diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
---- qrupdate-1.1.1.orig/src/Makefile 2010-01-19 11:32:35.000000000 +0000
-+++ qrupdate-1.1.1/src/Makefile 2010-05-13 17:28:30.000000000 +0100
-@@ -34,6 +34,8 @@
+diff --git a/src/Makefile b/src/Makefile
+index 65ef49a..c338882 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -34,6 +34,8 @@ clup1up.f dlup1up.f slup1up.f zlup1up.f
OBJS = $(SRC:%.f=%.o)
@@ -44,7 +46,7 @@ diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
lib: ../libqrupdate.a
ifeq ($(shell uname),Darwin)
-@@ -46,19 +48,22 @@
+@@ -46,19 +48,22 @@ solib: ../libqrupdate$(SOEXT)
../libqrupdate.a: $(OBJS)
ar -cr $@ $(OBJS)
@@ -73,10 +75,11 @@ diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
install: install-shlib install-staticlib
-diff -Nur qrupdate-1.1.1.orig/test/Makefile qrupdate-1.1.1/test/Makefile
---- qrupdate-1.1.1.orig/test/Makefile 2010-02-11 08:25:37.000000000 +0000
-+++ qrupdate-1.1.1/test/Makefile 2010-05-13 17:15:51.000000000 +0100
-@@ -41,7 +41,7 @@
+diff --git a/test/Makefile b/test/Makefile
+index 45a843d..3be917f 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -41,7 +41,7 @@ utils.o: utils.f
$(FC) $(FFLAGS) -c $<
../libqrupdate.a:
diff --git a/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch b/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
index 0eee49ae68f..67c5b8f007e 100644
--- a/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
+++ b/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
@@ -1,5 +1,5 @@
---- src/Makefile.orig 2010-02-07 15:58:01 +0100
-+++ src/Makefile 2010-02-07 16:02:18 +0100
+--- a/src/Makefile
++++ b/src/Makefile
@@ -65,14 +65,17 @@
install-shlib: ../libqrupdate$(SOEXT) install-lib$(SOEXT)
diff --git a/sci-libs/qrupdate/metadata.xml b/sci-libs/qrupdate/metadata.xml
index 9c82197cc8d..b0288faf7de 100644
--- a/sci-libs/qrupdate/metadata.xml
+++ b/sci-libs/qrupdate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
deleted file mode 100644
index efcc931e338..00000000000
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch fortran-2 flag-o-matic multilib versionator toolchain-funcs
-
-DESCRIPTION="Library for updating of QR and Cholesky decompositions"
-HOMEPAGE="https://sourceforge.net/projects/qrupdate"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
-IUSE="static-libs"
-
-RDEPEND="virtual/lapack"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.1.1-Makefiles.patch \
- "${FILESDIR}"/${PN}-1.1.2-install.patch
-
- # GCC 10 workaround
- # bug #741524
- append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
- sed -i Makeconf \
- -e "s:gfortran:$(tc-getFC):g" \
- -e "s:FFLAGS=.*:FFLAGS=${FFLAGS}:" \
- -e "s:BLAS=.*:BLAS=$($(tc-getPKG_CONFIG) --libs blas):" \
- -e "s:LAPACK=.*:LAPACK=$($(tc-getPKG_CONFIG) --libs lapack):" \
- -e "/^LIBDIR=/a\PREFIX=${EPREFIX}/usr" \
- -e "s:LIBDIR=lib:LIBDIR=$(get_libdir):" \
- || die "Failed to set up Makeconf"
-}
-
-src_compile() {
- emake solib
- use static-libs && emake lib
-}
-
-src_install() {
- emake DESTDIR="${D}" install-shlib
- dosym libqrupdate.so.$(get_major_version) /usr/$(get_libdir)/libqrupdate.so
- use static-libs && emake DESTDIR="${D}" install-staticlib
- dodoc README ChangeLog
-}
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
new file mode 100644
index 00000000000..6ff21cac1a8
--- /dev/null
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fortran-2 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Library for updating of QR and Cholesky decompositions"
+HOMEPAGE="https://sourceforge.net/projects/qrupdate"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND="virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.1-Makefiles.patch
+ "${FILESDIR}"/${PN}-1.1.2-install.patch
+)
+
+src_prepare() {
+ default
+
+ # GCC 10 workaround
+ # bug #741524
+ append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+ sed -i Makeconf \
+ -e "s|gfortran|$(tc-getFC)|g" \
+ -e "s|FFLAGS=.*|FFLAGS=${FFLAGS}|" \
+ -e "s|BLAS=.*|BLAS=$($(tc-getPKG_CONFIG) --libs blas)|" \
+ -e "s|LAPACK=.*|LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)|" \
+ -e "/^LIBDIR=/a\PREFIX=${EPREFIX}/usr" \
+ -e "s|LIBDIR=lib|LIBDIR=$(get_libdir)|" \
+ || die "Failed to set up Makeconf"
+}
+
+src_compile() {
+ emake solib
+}
+
+src_install() {
+ emake DESTDIR="${D}" install-shlib
+ dosym libqrupdate.so.$(ver_cut 1) /usr/$(get_libdir)/libqrupdate.so
+ dodoc README ChangeLog
+}
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
new file mode 100644
index 00000000000..00865310a02
--- /dev/null
+++ b/sci-libs/rocBLAS/Manifest
@@ -0,0 +1,2 @@
+DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
+DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e18c38e088a8b7db58156d478dd6718befbb82bb7fd43a38fe64a5427124c5ad5241fa37977f094e6efd195d168d3e5f65 SHA512 490ab1c1e98a8b311ad5630515c448d9bb0a2bf588a08bcbebee345e2954d616b4ffe7c2e03dadca82c590438c42afccb98fe8ba00856aece101b5ffe62ef1e0
diff --git a/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch b/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch
new file mode 100644
index 00000000000..8e6753781a2
--- /dev/null
+++ b/sci-libs/rocBLAS/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch
@@ -0,0 +1,96 @@
+https://github.com/ROCmSoftwarePlatform/Tensile/issues/1395
+https://github.com/ROCmSoftwarePlatform/Tensile/pull/1398
+
+--- a/Tensile/TensileCreateLibrary.py
++++ b/Tensile/TensileCreateLibrary.py
+@@ -136,6 +136,35 @@ def which(p):
+ return candidate
+ return None
+
++def splitArchs():
++ # Helper for architecture
++ def isSupported(arch):
++ return globalParameters["AsmCaps"][arch]["SupportedISA"] and \
++ globalParameters["AsmCaps"][arch]["SupportedSource"]
++
++ if ";" in globalParameters["Architecture"]:
++ wantedArchs = globalParameters["Architecture"].split(";")
++ else:
++ wantedArchs = globalParameters["Architecture"].split("_")
++ archs = []
++ cmdlineArchs = []
++ if "all" in wantedArchs:
++ for arch in globalParameters['SupportedISA']:
++ if isSupported(arch):
++ if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)):
++ if (arch == (9,0,10)):
++ archs += [gfxName(arch) + '-xnack+']
++ cmdlineArchs += [gfxName(arch) + ':xnack+']
++ archs += [gfxName(arch) + '-xnack-']
++ cmdlineArchs += [gfxName(arch) + ':xnack-']
++ else:
++ archs += [gfxName(arch)]
++ cmdlineArchs += [gfxName(arch)]
++ else:
++ for arch in wantedArchs:
++ archs += [re.sub(":", "-", arch)]
++ cmdlineArchs += [arch]
++ return archs, cmdlineArchs
+
+ def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile):
+ buildPath = ensurePath(os.path.join(globalParameters['WorkingPath'], 'code_object_tmp'))
+@@ -149,24 +178,8 @@ def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile):
+ objectFilename = base + '.o'
+ soFilename = base + '.so'
+
+- def isSupported(arch):
+- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \
+- globalParameters["AsmCaps"][arch]["SupportedSource"]
+-
+ if (CxxCompiler == "hipcc"):
+- archs = []
+- cmdlineArchs = []
+- for arch in globalParameters['SupportedISA']:
+- if isSupported(arch):
+- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)):
+- if (arch == (9,0,10)):
+- archs += [gfxName(arch) + '-xnack+']
+- cmdlineArchs += [gfxName(arch) + ':xnack+']
+- archs += [gfxName(arch) + '-xnack-']
+- cmdlineArchs += [gfxName(arch) + ':xnack-']
+- else:
+- archs += [gfxName(arch)]
+- cmdlineArchs += [gfxName(arch)]
++ archs, cmdlineArchs = splitArchs()
+
+ archFlags = ['--offload-arch=' + arch for arch in cmdlineArchs]
+
+@@ -1063,11 +1076,6 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl
+ sourceKernels = list([k for k in kernels if k['KernelLanguage'] == 'Source'])
+ asmKernels = list([k for k in kernels if k['KernelLanguage'] == 'Assembly'])
+
+- # Helper for architecture
+- def isSupported(arch):
+- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \
+- globalParameters["AsmCaps"][arch]["SupportedSource"]
+-
+ # Build a list of kernel object names.
+ for kernel in sourceKernels:
+ sourceKernelNames += [kernelWriterSource.getKernelFileBase(kernel)]
+@@ -1081,15 +1089,7 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl
+
+ # Source based kernels are built for all supported architectures
+ if (cxxCompiler == 'hipcc'):
+- sourceArchs = []
+- for arch in globalParameters['SupportedISA']:
+- if isSupported(arch):
+- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)):
+- if (arch == (9,0,10)):
+- sourceArchs += [gfxName(arch) + '-xnack+']
+- sourceArchs += [gfxName(arch) + '-xnack-']
+- else:
+- sourceArchs += [gfxName(arch)]
++ sourceArchs, _ = splitArchs()
+ else:
+ raise RuntimeError("Unknown compiler %s" % cxxCompiler)
+
diff --git a/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch b/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch
new file mode 100644
index 00000000000..be5a4db2142
--- /dev/null
+++ b/sci-libs/rocBLAS/files/Tensile-4.3.0-output-commands.patch
@@ -0,0 +1,23 @@
+diff --color -uprN orig/Tensile/cmake/TensileConfig.cmake Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake
+--- orig/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:00.115478470 +0800
++++ Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:49.963478801 +0800
+@@ -234,6 +234,7 @@ function(TensileCreateLibraryFiles
+ COMMENT "Generating Tensile Libraries"
+ OUTPUT ${Tensile_EMBED_LIBRARY_SOURCE};${Tensile_MANIFEST_CONTENTS}
+ COMMAND ${CommandLine}
++ USES_TERMINAL
+ )
+
+ set("${Tensile_VAR_PREFIX}_ALL_FILES" ${Tensile_MANIFEST_CONTENTS} PARENT_SCOPE)
+diff --color -uprN orig/Tensile/Common.py Tensile-rocm-4.3.0/Tensile/Common.py
+--- orig/Tensile/Common.py 2021-08-18 17:48:00.075478470 +0800
++++ Tensile-rocm-4.3.0/Tensile/Common.py 2021-08-18 17:48:23.287478624 +0800
+@@ -179,7 +179,7 @@ globalParameters["PrintTensorD"] = 0
+ globalParameters["PrintTensorRef"] = 0 # Print reference tensor. 0x1=after init; 0x2=after copy-back; 0x3=both
+ globalParameters["PrintIndexAssignments"] = 0 # Print the tensor index assignment info
+ globalParameters["PrintWinnersOnly"] = False # Only print the solutions which become the fastest
+-globalParameters["PrintCodeCommands"] = False # print the commands used to generate the code objects (asm,link,hip-clang, etc)
++globalParameters["PrintCodeCommands"] = True # print the commands used to generate the code objects (asm,link,hip-clang, etc)
+ globalParameters["DumpTensors"] = False # If True, dump tensors to binary files instead of printing them.
+
+ # TODO - remove this when NewClient is mainstream
diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-change-default-Tensile-library-dir.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-change-default-Tensile-library-dir.patch
new file mode 100644
index 00000000000..1841424c6e5
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-change-default-Tensile-library-dir.patch
@@ -0,0 +1,39 @@
+change the default rocm tensile library search path
+--- orig/library/src/tensile_host.cpp 2021-08-21 17:56:47.040481580 +0800
++++ rocBLAS-rocm-4.3.0/library/src/tensile_host.cpp 2021-08-21 17:58:46.360482372 +0800
+@@ -489,34 +489,7 @@ namespace
+ }
+ else
+ {
+-#ifndef ROCBLAS_STATIC_LIB
+- Dl_info info;
+-
+- // Find the location of librocblas.so
+- // Fall back on hard-coded path if static library or not found
+- // [Use a C API (rocblas_sccal) *not* defined in this file to
+- // avoid compile-time resolution of the function pointer; cf.
+- // https://man7.org/linux/man-pages/man3/dladdr.3.html "BUGS"]
+-
+- if(dladdr((void*)rocblas_sscal, &info))
+- {
+- path = info.dli_fname;
+- path = std::string{dirname(&path[0])};
+- }
+- else
+-#endif
+- {
+- path = "/opt/rocm/rocblas/lib";
+- }
+-
+- // Find the location of the libraries
+- if(TestPath(path + "/../../Tensile/library"))
+- path += "/../../Tensile/library";
+- else
+- path += "/library";
+-
+- if(TestPath(path + "/" + processor))
+- path += "/" + processor;
++ path="@GENTOO_PORTAGE_EPREFIX@/usr/lib64/rocblas/library";
+ }
+
+ // only load modules for the current architecture
diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch
new file mode 100644
index 00000000000..a4d9f0bab34
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch
@@ -0,0 +1,25 @@
+https://sourceware.org/glibc/wiki/Release/2.32#Deprectation_sys_siglist.2C__sys_siglist.2C_sys_sigabbrev
+
+--- rocBLAS-rocm-4.1.0/clients/gtest/rocblas_test.cpp
++++ rocBLAS-rocm-4.1.0/clients/gtest/rocblas_test.cpp
+@@ -173,7 +173,7 @@ void catch_signals_and_exceptions_as_fai
+ // Set up the return point, and handle siglongjmp returning back to here
+ if(sigsetjmp(t_handler.sigjmp_buf, true))
+ {
+- FAIL() << "Received " << sys_siglist[t_handler.signal] << " signal";
++ FAIL() << "Received " << strsignal(t_handler.signal) << " signal";
+ }
+ else
+ {
+
+--- rocBLAS-rocm-4.1.0/clients/include/utility.hpp
++++ rocBLAS-rocm-4.1.0/clients/include/utility.hpp
+@@ -39,7 +39,7 @@
+ // puts, putchar, fputs, printf, fprintf, vprintf, vfprintf: Use rocblas_cout or rocblas_cerr
+ // sprintf, vsprintf: Possible buffer overflows; us snprintf or vsnprintf instead
+ // strerror: Thread-unsafe; use snprintf / dprintf with %m or strerror_* alternatives
+-// strsignal: Thread-unsafe; use sys_siglist[signal] instead
++// strsignal: Thread-unsafe; use strsignal(signal) instead
+ // strtok: Thread-unsafe; use strtok_r
+ // gmtime, ctime, asctime, localtime: Thread-unsafe
+ // tmpnam: Thread-unsafe; use mkstemp or related functions instead
diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-link-system-blas.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-link-system-blas.patch
new file mode 100644
index 00000000000..184b76d7ef3
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-link-system-blas.patch
@@ -0,0 +1,24 @@
+Link system blas libraries rather than the downloaded libraries (in install.sh)
+
+--- orig/clients/benchmarks/CMakeLists.txt
++++ rocBLAS-rocm-4.2.0/clients/benchmarks/CMakeLists.txt
+@@ -49,7 +49,7 @@ target_include_directories( rocblas-benc
+ $<BUILD_INTERFACE:${BLIS_INCLUDE_DIR}>
+ )
+
+-target_link_libraries( rocblas-bench PRIVATE rocblas_fortran_client roc::rocblas lapack cblas )
++target_link_libraries( rocblas-bench PRIVATE rocblas_fortran_client roc::rocblas lapack cblas -lblas )
+ if(LINK_BLIS)
+ target_link_libraries( rocblas-bench PRIVATE ${BLIS_LIBRARY} )
+ endif()
+--- orig/clients/gtest/CMakeLists.txt
++++ rocBLAS-rocm-4.2.0/clients/gtest/CMakeLists.txt
+@@ -129,7 +129,7 @@ target_include_directories( rocblas-test
+ $<BUILD_INTERFACE:${BLIS_INCLUDE_DIR}>
+ )
+
+-target_link_libraries( rocblas-test PRIVATE rocblas_fortran_client roc::rocblas lapack cblas ${GTEST_LIBRARIES} )
++target_link_libraries( rocblas-test PRIVATE rocblas_fortran_client roc::rocblas lapack cblas -lblas ${GTEST_LIBRARIES} )
+ if(LINK_BLIS)
+ target_link_libraries(