diff options
Diffstat (limited to 'sci-libs')
57 files changed, 851 insertions, 940 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 0294a37c8a7f..0b111a54cd03 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 687f6b1d0966..00431ec9b2ba 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,4 +1,5 @@ AUX cantera-2.5.1_env.patch 4600 BLAKE2B ed131f2b3d061102f197d50105176332fd07424ddff81b0af05bdc2eb3e514bcb17da85e285d80dd717d685a10a8eaa0a08769171cbb2df5103d2283519ef311 SHA512 92083e331a1ddd712d21602e50960cf0251ca688a90121f67c35b21b79851c7baa6d9373a67bec1beade53d44e6dfe2e0faf7385305d2c8cfdee2d9698b21c67 DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc EBUILD cantera-2.5.1-r1.ebuild 3436 BLAKE2B d961413b7a6ccf67f13d8d91d067264af2ddab2b5c351abdb8d41c85a2d013f9ca44ec8a34ddabf71cd9fd06e7a97664f081f03264871a2be811e1b70758656a SHA512 692d7df06f6f659465672f379d10ccab4f9f4f8b574b69636e992d3a8664d6087a7bdd73222ed6f5cdcfe86b000a99f8b1b7c36a79f9078b3beb1f81389caab4 +EBUILD cantera-2.5.1-r2.ebuild 3439 BLAKE2B 7fd7201d024892bc20aab3ae73e8f93776cc30d69714698826dccd72d23ed69f2bcad91e137896a05b26410183dcf0a3003392e3dc21e6903421fd06892cd48c SHA512 800a450a688c75abd12e16b15c896e80bcf81ecb797245a6907661ca095e13cc8b80e3d82e44cdb1db970a2a9db7a5eff0091ff88ebf42f46f85e2562059ae1d MISC metadata.xml 842 BLAKE2B 85e2a5268aa13a8a92e9f04212c3bcd66252a77c88dd2ddb7d81a34f486754c7faa352998484d4362b16a2bdccb85325337c13cc272a434be463a037eab846a1 SHA512 a9edb0347dc3b1510d3d2b767e7a0e96cd1d6cc50dd4e5c2830d29438dd25a0bdfa41994dbb43bbb7dc70ba3537f783b2d0a143723908dd91d434e1edb11a704 diff --git a/sci-libs/cantera/cantera-2.5.1-r2.ebuild b/sci-libs/cantera/cantera-2.5.1-r2.ebuild new file mode 100644 index 000000000000..f4fa50e5d5a0 --- /dev/null +++ b/sci-libs/cantera/cantera-2.5.1-r2.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD="77 90" + +inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs + +DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport" +HOMEPAGE="https://www.cantera.org" +SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+cti fortran lapack pch +python test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + python? ( cti ) + ${PYTHON_REQUIRED_USE} +" + +RDEPEND=" + ${PYTHON_DEPS} + lapack? ( virtual/lapack ) + cti? ( + $(python_gen_cond_dep ' + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + ') + ) + python? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) + dev-cpp/yaml-cpp + <sci-libs/sundials-5.9.0:0=[lapack?] +" + +DEPEND=" + ${RDEPEND} + dev-cpp/eigen:3 + dev-libs/boost + dev-libs/libfmt + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ') + ) + test? ( + >=dev-cpp/gtest-1.8.0 + python? ( + $(python_gen_cond_dep ' + dev-python/h5py[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + ') + ) + ) +" + +PATCHES=( "${FILESDIR}/${P}_env.patch" ) + +pkg_setup() { + fortran-2_pkg_setup + python-single-r1_pkg_setup +} + +## Full list of configuration options of Cantera is presented here: +## http://cantera.org/docs/sphinx/html/compiling/config-options.html +src_configure() { + scons_vars=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + cc_flags="${CXXFLAGS}" + cxx_flags="-std=c++11" + debug="no" + FORTRAN="$(tc-getFC)" + FORTRANFLAGS="${FCFLAGS}" + optimize_flags="-Wno-inline" + renamed_shared_libraries="no" + use_pch=$(usex pch) + ## In some cases other order can break the detection of right location of Boost: ## + system_fmt="y" + system_sundials="y" + system_eigen="y" + system_yamlcpp="y" + env_vars="all" + extra_inc_dirs="/usr/include/eigen3" + ) + use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" ) + use test || scons_vars+=( googletest="none" ) + + scons_targets=( + f90_interface=$(usex fortran y n) + ) + + if use cti ; then + local scons_python=$(usex python full minimal) + scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" ) + else + scons_targets+=( python_package="none" ) + fi +} + +src_compile() { + escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr" +} + +src_test() { + escons test +} + +src_install() { + escons install stage_dir="${D}" libdirname="$(get_libdir)" python_prefix="$(python_get_sitedir)" + if ! use cti ; then + rm -r "${D}/usr/share/man" || die "Can't remove man files." + else + # Run the byte-compile of modules + python_optimize "${D}/$(python_get_sitedir)/${PN}" + fi + + # We install static libs unconditionally here + # See https://github.com/gentoo/gentoo/pull/10017#discussion_r229210565 +} + +pkg_postinst() { + if use cti && ! use python ; then + elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml" + elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism." + fi + + local post_msg=$(usex fortran "and Fortran " "") + elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory." + + if use python ; then + elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories." + fi +} diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index 97681d581afb..ed2da5a89f9e 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -2,6 +2,6 @@ AUX dealii-9.1.1-fix_boost_177.patch 470 BLAKE2B 0e701500943bf400d021ac787e08948 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef -EBUILD dealii-9.3.1-r4.ebuild 5478 BLAKE2B a300b5267930af10f9218e4bf2c8ec0aa5ce11455aac32b904d6467cfe5aadc347ffcd908f4af3c46936f42c980a07131344ce5771cc6a4afb531902d001ee13 SHA512 2cdac16a058b06b6d9d40d6076c6bafd9bd35c3e1612857699c12fa98b7e0a99ac23cefed53195786c2b7228493a2ffc0db7ca0db6f344f98135f36233fb0c54 -EBUILD dealii-9999.ebuild 5385 BLAKE2B 775f8ab5e40eb5ac1d12c972c3518fddc212050f920588f68c6e6fa3cf4d4b5cb7d14c91a756770bbe4055f53a6dcf61ee3200e33f71068701ec67c82238323c SHA512 9de81d5d1b0b3fbd9aacb0562397bb373ec66bbf44711e6932908c9f79c45e5a61f05577982efcc7ae4d14ee4c996b631f3e24bb606d56278bf39376a763868b +EBUILD dealii-9.3.1-r4.ebuild 5153 BLAKE2B aba353f97cf2b1da9bdae7f7bd4ffc1e06c5d11c0a964aadf1869d61c6fda6e5c73270497de48433b909cee319ec6fae30660a845a2ab9f1ed267080314a280b SHA512 c65f30d2ac590dbac3f6bccdd87f7867a8d046d107fa873704124d2e614b0686cb1aef6db5f9e582d1899f33ff4f2ac76378b07d071bd5369ba3cce52204a3eb +EBUILD dealii-9999.ebuild 5157 BLAKE2B c975c52517a60db0c3ba27577f8f33220a8f5366443c0061164b9ad9e6ffdabb66a5df24197dd811d93426050ae2a6318e0acfd46bea1a35cce779065c2a13d6 SHA512 7723a4e89ddcd2701cda2f935cd7b84f2c23d5baacc679abbcc2a6296c1b449c2c7c0462fabc0aa4d2df00dfadd07b18e0250decc9616d8643d11d3d104688fd MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87 diff --git a/sci-libs/dealii/dealii-9.3.1-r4.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild index ebe0f99102e4..9edb8b2d5a83 100644 --- a/sci-libs/dealii/dealii-9.3.1-r4.ebuild +++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild @@ -40,11 +40,6 @@ REQUIRED_USE=" slepc? ( petsc ) trilinos? ( mpi )" -# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where -# the names of the correct include and library directories are not easily -# accessible. Just fix the version for the time being. -CAS_VERSION=7.5.3 - RDEPEND="dev-libs/boost:= app-arch/bzip2 sys-libs/zlib @@ -64,7 +59,7 @@ RDEPEND="dev-libs/boost:= ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) - opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= ) + opencascade? ( >=sci-libs/opencascade-7.6.0:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) @@ -128,13 +123,12 @@ src_configure() { -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" ) - # Do a little dance for purely cosmetic "QA" reasons. + # Do a little dance for purely cosmetic QA reasons. use opencascade && mycmakeargs+=( - -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}" - -DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}" + -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" ) - # Do a little dance for purely cosmetic "QA" reasons. The build system + # 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 diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild index f95f48acaaac..2e1f4a47b3ba 100644 --- a/sci-libs/dealii/dealii-9999.ebuild +++ b/sci-libs/dealii/dealii-9999.ebuild @@ -8,7 +8,7 @@ EAPI=7 # any of these modules: CMAKE_REMOVE_MODULES_LIST="" -inherit cmake multilib +inherit cmake flag-o-matic multilib DESCRIPTION="Solving partial differential equations with the finite element method" HOMEPAGE="https://www.dealii.org/" @@ -40,11 +40,6 @@ REQUIRED_USE=" slepc? ( petsc ) trilinos? ( mpi )" -# FIXME: The opencascade-7.5.1 ebuild uses a new file system layout where -# the names of the correct include and library directories are not easily -# accessible. Just fix the version for the time being. -CAS_VERSION=7.5.3 - RDEPEND="dev-libs/boost:= app-arch/bzip2 sys-libs/zlib @@ -65,7 +60,7 @@ RDEPEND="dev-libs/boost:= ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) - opencascade? ( ~sci-libs/opencascade-${CAS_VERSION}:= ) + opencascade? ( >=sci-libs/opencascade-7.6.0:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) @@ -129,21 +124,23 @@ src_configure() { -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" ) - # Do a little dance for purely cosmetic "QA" reasons. + # Do a little dance for purely cosmetic QA reasons. use opencascade && mycmakeargs+=( - -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade-${CAS_VERSION}" - -DOPENCASCADE_INCLUDE_DIR="${CASROOT}/include/opencascade-${CAS_VERSION}" + -DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade" ) - # Do a little dance for purely cosmetic "QA" reasons. The build system + # 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 ) + append-cxxflags "-mavx512f" elif use cpu_flags_x86_avx; then mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes ) + append-cxxflags "-mavx2" elif use cpu_flags_x86_avx; then mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) + append-cxxflags "-msse2" fi cmake_src_configure diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index 03e80e6ff3b1..eeaabe5fdddb 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -1,6 +1,4 @@ DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 -DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf EBUILD fftw-3.3.10.ebuild 4010 BLAKE2B af5c9c90eb31e8bd5a34fadfbe78e4fea3fc55c555f7e028c5511f0153974f4800fd638a6f78e71a0555f459ece00118be42ff1d3e7cfe0726fee5ead03618e0 SHA512 0c0602273d5a2e6f33fab9c02f8e54dbe83ea4cf337d5d8ea0f91dd5579ed670a65c6a40c2ae54c3711fd470151f47b87c17a5708a7291ca37641fedb7067389 -EBUILD fftw-3.3.9.ebuild 4145 BLAKE2B 0dd89a7a96ecb4209b9e45b11300b8b66b92c9123ae02965c243c6b07ed624e1ae836a9e673d331bc753a6b2309e93d8aa058b3a0d3f28d03aac8a6d52e19814 SHA512 4e668945d603046a785674dad1968bdb2b9d8369a5fd6c69af553cb02656ebc1237b3e96f287123df8a1ccd0612645db8610911b404a880af61493f8ac15375d EBUILD fftw-9999.ebuild 4012 BLAKE2B 4acc326f3ea2c3d68018aada983a6df9a82a60e8deaf2072b1c0649c4b6a673f3f9a96bfa2747d092de9c99199de4aed38bd07ce46bb8d9b5818cc4feed3ca29 SHA512 861ba96a2f2952dfc72b92db0647719f48443f11e7fbf39ebfe699acc231da40fcb325d29642b535811aa5bc3eb227afdb6eab64e547b85c23859e8807f5e844 MISC metadata.xml 960 BLAKE2B f9bd9e8190241bb5c757b521fc7c0d9adb608d3f616f4bd32c7fdba895a464e49c6eb3080d849c70ece5993f2999eaa22b08033954b60c33834ea1af8b646df7 SHA512 21ffca8724d5e4a73d9545bd1a73dad15d1341cc15a5340172315d1ace97cf5fda30973685890b7b18255feeb67f80317fde1b9d951c4f114b1d5e45a1587a7c diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild deleted file mode 100644 index e377ed60541c..000000000000 --- a/sci-libs/fftw/fftw-3.3.9.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# 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 - -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 )" - -S="${WORKDIR}/${MY_P}" -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/gdal/Manifest b/sci-libs/gdal/Manifest index 0b65f743aa19..714c97de6e54 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -4,10 +4,11 @@ AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee AUX gdal-3.3.0-configure-geos-disable.patch 6509 BLAKE2B 1a22658e0f0bb83dc409c82d9b25dc8d6ae5ee7c5551c500ede654884071c48862c0392ef2b129c40546fed1af9ba7cb756a0fa4e05709481a851be8d87d2df1 SHA512 5da36ea9ced5826ddc748141ad098c2c2151a9ea68c561105eb41530c76cf6a9094a4683310949931cfac58c91511f6219240d7c18f0348e1e0841683c384c55 AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4a35c79b896d838edcd497f17bf35ddfd3ab6de8e792a87ae8c012a91b1d2f0351d47e89f7d7fcf88a72647d38a SHA512 ee74ee86b8249abfbbce6e114f3a5f1c79a30a86aeb45761ca8637ebcae0e0df4c4961b292fdd1f49865da6445a8afaf161d80c28849dde6adf72cc3ed092852 AUX gdal-3.3.2-poppler-21.10.0.patch 1226 BLAKE2B 7475f40216fcf14417c5bb916b5508935e518e4428c8134099109b85af966935a83f807039ac2617f0a437ff1594ded0d403d447ceacdf53e77f74973bf866f1 SHA512 760f6ba7746496b2f72562ff3dad6067f67d1a612ecb713c1b9526dc335f4ecdcd97d406e8e6f395ad10b5a66a1febbe12579a52aab3d4518807999def361de4 +AUX gdal-3.4.1-poppler-22.01.0-c++17.patch 759 BLAKE2B bfb9cfc97fb56a18eda0f0d20e83f8e48ba44bab80fa7253c3883cac0a6a6460345745aaf4e63c750e4c0d8e3866c2978da382ea9889c9ff638b697e6398ad84 SHA512 bc95a835093b9b8bb3ed44d82a9c4b0fb987f1299d572e05f6791df2bd14c279853cfc877e41a012367bb4089b4e81ea359bc44d1ae11e67048063d2a1105a1a DIST gdal-3.3.3.tar.gz 19600111 BLAKE2B 2d4558062b35016372d6964884296878fdcef0afa83fb03b10cd902ce101ec52f551d48014d95b391d19b8db13d7ca1d639575b39e9421780f4212bef02dd51f SHA512 c49e4555e598e4182e6419758c31df08d46b8b061480f08be09d61e840057529bd833338eaa8c1ecfe1c6a0cc8cd6a073bf15fa6cdae003e4475485cf3851145 DIST gdal-3.4.0.tar.gz 20008930 BLAKE2B b4dad7226d2cfee3bdcab9782d2d35355501c1dd830d247099f6a8030311b86e7620e90f7bba675bf49dc47d166ab586fabe45ba02d9d7e9a73829194da6b360 SHA512 e363258172cff9647804be11f28ebec1614ddfbfc6eed72d44700c23aea674267e413099555d25e784d567ea915b5fb9092ff74b98d890dfcb8aae56b0575eb6 DIST gdal-3.4.1.tar.gz 20022859 BLAKE2B fe6da8b3f098839bc5da9e49932a7a8e172b5dcb79f34eaa5f82a336cab3666223ae6f354c7847d1090e312838cc2e121e357c914cca3375541ee8ed31746edc SHA512 dcfd5f5ceac633838db2a92af6f6eb1c9fca55216885f071c7d8df8fc119aa800b2854c6e5ae84cdeea531e7e61296ad4378d798107c19d80d2ba4e1094299bf EBUILD gdal-3.3.3.ebuild 7852 BLAKE2B 03a04b87e0099452c748d0400a4c21a9369a04f01948b298a39dd9a938c3b2264e00827b3cf0ca7d7719f35a90974c493fcc5a99efb111789c684249c58dcafd SHA512 28738878e2f1cb78f5ab1a25553e445563a4b17e555bf87808de1ff0d373b6b309ad561d6514e1b9b02f5391bb19c7f0519c31d490d4465f8eccef0f1cbc0945 EBUILD gdal-3.4.0.ebuild 8033 BLAKE2B cf27f9b230f4fba647892383bd51112a9ba072424a834189569027faea7852476fc2f627837759d99c126d6307deacdf951ddaa2d88dcaf120ef4c8455ef2424 SHA512 9633034b855d9b640de491fc1e9c7d64eb149114787dcebfa76fec083b2772ba45e59cfb87154f35e4ce6544607fff515decc4bd4ce574c237f2ade914498361 -EBUILD gdal-3.4.1.ebuild 8033 BLAKE2B 0be979fe6c87eb39f5db25dcad069ef8458f49a5177301204831372f4dba0f86abb8ece3c599961a2b9f467e19d0f321b8e0cbd675ff4b3cb6ca31278d3f5121 SHA512 30c2c0a9feb6337e6004d8e0feabfff68ccde64b329dc4aa209305b196b735ffac73f577370f558fe5fe1895e722737768bd7a80b1bb87a83b2acabd73b5f9b8 +EBUILD gdal-3.4.1.ebuild 8078 BLAKE2B d50663cd04ba8fd0280806246ea2fa5f412d65b1efd9f1affd822d0028f40805de6a70a2bde4e04123646e7f51a9c95abba4b1860b889335e7fe86971956eef4 SHA512 4efce335625ca1f19c1a95d817ca5be4be7982d429d8d639c022c9c36bdc085dde28169d5d6a47d71d801273fc109c57dc4c6709bd06d3afa902d5a9680a05a0 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch new file mode 100644 index 000000000000..dac3bd3776d9 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/830883 +https://github.com/OSGeo/gdal/commit/3f528f2b5f9244698c89d31b74155765538ef362 + +From: Even Rouault <even.rouault@spatialys.com> +Date: Sat, 8 Jan 2022 14:25:09 +0100 +Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes + #5071) + +--- a/frmts/pdf/GNUmakefile ++++ b/frmts/pdf/GNUmakefile +@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle + endif + + ifeq ($(HAVE_POPPLER),yes) ++# Poppler 2022.1 requires c++17 ++ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0) ++CXX := $(subst -std=c++11,,${CXX}) ++CXX := $(subst -std=c++14,,${CXX}) ++CXX := ${CXX} -std=c++17 ++endif + CPPFLAGS += -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION) + endif + diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild index 620283cbc410..dccda0046d7f 100644 --- a/sci-libs/gdal/gdal-3.4.1.ebuild +++ b/sci-libs/gdal/gdal-3.4.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz" # subslot is libgdal.so.<SONAME> SLOT="0/30" LICENSE="BSD Info-ZIP MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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 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=" @@ -91,6 +91,7 @@ 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-22.01.0-c++17.patch" ) src_prepare() { diff --git a/sci-libs/getdata/Manifest b/sci-libs/getdata/Manifest index e99a4ea1b50d..b2db6b2c7fdf 100644 --- a/sci-libs/getdata/Manifest +++ b/sci-libs/getdata/Manifest @@ -1,4 +1,6 @@ AUX getdata-0.9.0-remove-python-test.patch 257 BLAKE2B bc60176d361d2cb891742c0ee8b443d0cb5c1350478bec1047e56d6a38b50021096ad8bab6ed4b1205744785f002227b22a80a4ab888c4bd52d517de8503e12b SHA512 7a8b5e8e1f2164fca9caba81c7b24f705c6caac036f8f2a3c6dd436961311e4dc34aa6a669eb0bd9e50fb50c09a8b22d32fe04961085c983a29da00e438cbc7c +DIST getdata-0.11.0.tar.xz 1060324 BLAKE2B b758447429f95d53d6ce3e32eb5591d0141c218f5b3a3c391fb713722f8dc12fba2add078d75be1b2957b2d27b7d843cb51450fc49394da130548721f5df9384 SHA512 cf301449288c2b0e337a356f03ac8d295a4f5a32eb6c2a29c15c6fcc434a9eea8661a8070defbbf1d751e64e1f616e4353863b13d350fa8df6837631d86bc932 DIST getdata-0.9.0.tar.xz 920652 BLAKE2B d5f0659474dfab9f4e589a28a7788b5a51de3c0064b58de37bdb11dad27b56daa05d8e705da743c5da271bd8c4e1343ac6ac41adfdfabfcaef0006e46c45d2bf SHA512 28d720141e34cc56a5166594d0a6ac293144d123706988ed170e40dd9d7aaf13b920305e8bd8343ecd7cbe43eee5d83720e3e5f5d2da0cdccdc1444725cc6844 +EBUILD getdata-0.11.0.ebuild 1326 BLAKE2B 06e622338dbb24b15b59efa7c969a101c8289d27d85910cbd69df9520f9cf502de421d22625468215ef9f5571b9af058f121559396b2c423b8174b6229fb3e79 SHA512 9ae6ed1f14dfd7f4c1abdeb52f6c0ece8041fed040eb89fb73391507751fbc7a0893711f7f3a560ad7d960b1707f3743bfc1e9eac899f403ffcdc82b128e6870 EBUILD getdata-0.9.0-r3.ebuild 1383 BLAKE2B 931c18c18d5574dc15f5c2f84273a8e8f7a5acc7186008bd220ac5000c476412b8ffb47bf6030090a71ed45b0acb4e5a7a06c88cf587ec1593de5e2fd089f288 SHA512 71f543bc927435e080df36db6ec59e7bafa0033bb4763207425e0832549e32cd638b4b89d1c6c22c79455d62de5cbf84dd4b18c320a028d43ae17e7c3f62a096 MISC metadata.xml 661 BLAKE2B 982315bbce2f794d62accad5153357defa40a530eb9ab58aea2754cfe64c13084417be013ee05188d9f0ccd93fe4f8a432ca658313912e23123e41d839496137 SHA512 267db8fd5b4068163da6f81242950935a38f25c38a1630bfcc48fabdca7e726742e65a6f5319bde83b8a5b52dff82ed3b0efef9aee601f62e067860e535823ce diff --git a/sci-libs/getdata/getdata-0.11.0.ebuild b/sci-libs/getdata/getdata-0.11.0.ebuild new file mode 100644 index 000000000000..b80fd2fefb1b --- /dev/null +++ b/sci-libs/getdata/getdata-0.11.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="95" +FORTRAN_NEEDED=fortran +inherit autotools fortran-2 flag-o-matic + +DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data" +HOMEPAGE="http://getdata.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz" + +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 cxx debug flac fortran lzma perl static-libs" + +DEPEND=" + bzip2? ( app-arch/bzip2 ) + lzma? ( app-arch/xz-utils ) + perl? ( dev-lang/perl ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # GCC 10 workaround + # bug #723076 + append-fflags $(test-flags-FC -fallow-argument-mismatch) + + econf \ + --disable-idl \ + --disable-matlab \ + --disable-php \ + --with-libz \ + --without-libslim \ + --without-libzzip \ + $(use_with bzip2 libbz2) \ + $(use_enable cxx cplusplus) \ + $(use_enable debug) \ + $(use_with flac libFLAC) \ + $(use_enable fortran) \ + $(use_enable fortran fortran95) \ + $(use_with lzma liblzma) \ + $(use_enable perl) \ + $(usex perl --with-perl-dir=vendor) \ + --disable-python \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index 8e6d01213eb1..5cd9737cd090 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -1,6 +1,6 @@ DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5 -EBUILD gsl-2.7.1-r1.ebuild 1491 BLAKE2B fdc04dace80cb6559ae818c8745b4d0ef5819c768db3dd22aec091787c8f50dec9f9f92fe1ffc834f0483822d80d8548f9163fe4b90a719cabf4f6eedae129da SHA512 34af5b2a22be49309281f1ded21f5026cb548a286c65222e4136f761a0d15dcd94fe48b9514b51b68a31d05cc2c91f62cf72d2e18a357ee7167ac4b0c92f340f +EBUILD gsl-2.7.1-r1.ebuild 1487 BLAKE2B ea66fb94f1a2fd8de35a93cc55779466acb5fea3c38eb5bed87524aa1503526ff618fe4fb0e83401628e7ab3ac3468fe4b16165c6e7721e222b9288312b6c4dd SHA512 e345af890021ec80f07444a13f1f545bbe2676bb0a84835acc579158d57524cd8553f8f2a7318d6bce76cb1461c51537f1945b990cc3e2d82d12c2cbab8c6624 EBUILD gsl-2.7.ebuild 1456 BLAKE2B b5fb1ef6587526b39804ce175d0f67a7917a0f48a90ff3585577b51ba7547b026e3518801fb66f43cff5c8228142189e65cfe5e1bf0ef7cdb3c166b9532b5231 SHA512 14e1f9ee0d3d7b3e9942082b143971426352011c27ff4cfdeb9e63294c68598e38b2ff8074f4431909b1d06603b8120288a4504981732c6e8beb2fb0e597dcf3 MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2 diff --git a/sci-libs/gsl/gsl-2.7.1-r1.ebuild b/sci-libs/gsl/gsl-2.7.1-r1.ebuild index f12a875ff1a2..be2b46d449a7 100644 --- a/sci-libs/gsl/gsl-2.7.1-r1.ebuild +++ b/sci-libs/gsl/gsl-2.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-3" # Usually 0/${PV} but check SLOT="0/27" -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/hdf/Manifest b/sci-libs/hdf/Manifest index 0650692a4bac..c75c042936ce 100644 --- a/sci-libs/hdf/Manifest +++ b/sci-libs/hdf/Manifest @@ -1,13 +1,6 @@ -AUX hdf-4.2.11-enable-fortran-shared.patch 1287 BLAKE2B 4b1b7aab9a2eb958684418a01067f37b46c38ad1f8c983caace0f01b29a26d1f0c787cfb80045f228a91cb962dd997995e6e5ada1df28e6e1d0bbc70d332265c SHA512 787260127abff6695e5cddbbd75290c2349ae150c01dd1c74e83539e78d503bbcb017ea8aba8f808d846e7e291e4cb13ef69d4186ff1e38780c75e0046ca6734 -AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24cf1f428d5d130f9aebfc261e6108d19cbd7846fc2d90820c993d03fab5c7943b032afb3c8d0b2053ef1665a94f6e38403c60f SHA512 44342b4e7680a002a3dd9ae2a56dcb6689ee57824476436dc5ef5ff1884174e9de6c98972fccc88296f376a354f92e049d64c493df81da2d08ace6271cd2292a -AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d73827e4974248747c1a21206149ededbfe8cfd087c862f321e55a23b5d7187b202ac6256edee84c9dee3cad6357081a7ae86d75 SHA512 dd99f0c0a5fe858a717c1373c75c84867383511e91fb5c703353feb22410ea561f84fe03c5c7578d27817a74579516e60331f5d14a1ad3ea38ab1376e396b5c8 -AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1 AUX hdf-4.2.15-enable-fortran-shared.patch 1271 BLAKE2B bdeb5214a92618b0587472db79d6bef7677cf51ceeb77d9b8593fc374547ee4f63eb7e614c621043670236151731fcdcaac2f3e1fc18b4f577cceca24e38aa37 SHA512 daa6bf33cf5b0f9445c1e96c67907463f2a3813d2d6528a0fd19a57db98253794c3d147e736c3568766e87d01ff41a492ecd18fcef3d85af2adb77315d770be8 AUX hdf-4.2.15-fix-rpch-location.patch 550 BLAKE2B a88448fa6f454fcac9567b05270f637d144dae5c88d4a88d19a5cc3897f7e20c61e36678dee730ee80bece1c05cd69514f87658e6a691826dce233cdbe9ff49e SHA512 77855e3e7562412fa18e102385264af42605d462690bbe4fbc867268c1cd1837eb012546294b433c4de8e98ddfdeb58c2a5480a7418252563579d6ee26808f88 -DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657 DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B 461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff SHA512 616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67 DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6 SHA512 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9 -EBUILD hdf-4.2.13-r1.ebuild 1945 BLAKE2B dcb348ffbc90a69e6230b6ea72625e9f7c11f2ca1c7dfe015a5bdfb60b0e7b702296fa55da8b57118168b45be8f86ad33f71b14f9e155312928d04d9d987dddf SHA512 6b547d1d5f46318ec1c5c01393cf759efeeea6409c4ff5e1fe8e341958e656ae9cd6baaa8e39ace87be83f35f18c28e8663117880eac7db3fdbbe154c9642cbd EBUILD hdf-4.2.15-r1.ebuild 2150 BLAKE2B 2768f3fddfa0263e2219f0d1a81233ceb138f50a1d66a01fc6a7811b28ea948dbaffdffc993cb418690b885eae02f921db250cd92d811abdec4eaf6d87baf2d6 SHA512 d420f0da3bf58169c16c13fb5f2682b7258a6571183b5701f3839e5f9903ea38dc5b1ce8c31f90375b701fc718fbf0415309fde4f73e7728083cb9b9aa083d7b -EBUILD hdf-4.2.15.ebuild 1831 BLAKE2B 8d5f55e659c146b95440d564f7cc302ed08cde2284046bf940e7002fb4fc584a7482a1222fab3bd388d66cdb9b57369700c419d4fc5bba738888c5bd6536d0cd SHA512 4476149b967d343324d3cbb2c3fa04542632f348ba8df9977711ef0b5d4da264209a8b2073de7be5bdf9174262fa7311426c2156f0caef85617777322fc4819d MISC metadata.xml 860 BLAKE2B 1eb04b174ac26dabb6191f30549b69e408ae6ecc7b166199662413dc918e24617d54bf3f5ee52a010bdcd763b8ec96d2d53d028a4aa8fa4f64d5758f0a6bb2c6 SHA512 e815da5354aa39a8391cbf15eaed3376aac4774a836c843dda81c0933123648f2f5b1208164740a701a9db8f1721ba4e31bf5d1d8c331635dcfe0d5dd9f6dbf8 diff --git a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch deleted file mode 100644 index 7d48a8a0ca97..000000000000 --- a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000 -+++ hdf-4.2.11/configure.ac 2016-03-16 20:15:56.767311873 +0000 -@@ -224,20 +224,6 @@ - ## Build static libraries by default. Furthermore, fortran shared libraries - ## are unsupported. Disallow a user from enabling both shared libraries and - ## fortran. --if test "X${enable_shared}" != "Xyes"; then -- enable_shared="no" --fi -- --if test "X${enable_shared}" = "Xyes"; then -- if test "X${BUILD_FORTRAN}" = "Xyes"; then -- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) -- fi --fi -- --AC_PROG_INSTALL --AC_PROG_LN_S -- --AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH]) - - AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], []) - -@@ -847,11 +833,6 @@ - ## ------------------------------------------------------------------------ - ## Check to see if libtool has enabled shared libraries. Set a conditional - ## as some Makefiles will build based on availability of shared libraries. --if (./libtool --features | grep '^enable shared libraries' > /dev/null); then -- enable_shared=yes --else -- enable_shared=no --fi - - ## ------------------------------------------------------------------------ - ## Specify shared library extension the host machine should recognize. diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch deleted file mode 100644 index 4486eb959b82..000000000000 --- a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000 -+++ hdf-4.2.11/configure.ac 2016-03-16 22:08:06.232711036 +0000 -@@ -473,12 +473,14 @@ - yes) - HAVE_SZIP="yes" - AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP]) -- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then -+ if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then - AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) - fi - - if test -z "$HAVE_SZIP"; then - AC_MSG_ERROR([couldn't find szlib library]) -+ else -+ USE_COMP_SZIP="yes" - fi - ;; - no) -@@ -525,7 +527,7 @@ - AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) - fi - -- if test -z "$HAVE_SZIP"; then -+ if test "x$HAVE_SZIP" != "xyes"; then - AC_MSG_ERROR([couldn't find szlib library]) - else - USE_COMP_SZIP="yes" diff --git a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch deleted file mode 100644 index a4514ab267ec..000000000000 --- a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: hdf-4.2.13/configure.ac -=================================================================== ---- hdf-4.2.13.orig/configure.ac -+++ hdf-4.2.13/configure.ac -@@ -676,7 +676,7 @@ case "$host" in - *) ;; - esac - --if test "X$BUILD_XDR" != "Xyes"; then -+if test "X$BUILD_XDR" = "Xyes"; then - AC_TRY_LINK([ - #include <rpc/types.h> - #include <rpc/xdr.h>], [xdr_int], diff --git a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch deleted file mode 100644 index 963388f66982..000000000000 --- a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: hdf-4.2.13/configure.ac -=================================================================== ---- hdf-4.2.13.orig/configure.ac -+++ hdf-4.2.13/configure.ac -@@ -673,6 +673,9 @@ case "$host" in - *-pc-cygwin*) - LIBS="$LIBS -ltirpc" - CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;; -+ *-pc-linux*) -+ LIBS="$LIBS -ltirpc" -+ CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;; - *) ;; - esac - -@@ -703,6 +706,14 @@ if test "X$BUILD_XDR" != "Xyes"; then - HAVE_RPC="yes" - AC_CHECK_HEADER([rpc.h],[:], [unset HAVE_RPC]) - AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC]) -+ if test -z "$HAVE_RPC"; then -+ AC_MSG_ERROR([couldn't find tirpc library]) -+ fi -+ ;; -+ *-pc-linux*) -+ HAVE_RPC="yes" -+ AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_RPC]) -+ AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC]) - if test -z "$HAVE_RPC"; then - AC_MSG_ERROR([couldn't find tirpc library]) - fi diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild deleted file mode 100644 index cf5dc153dc11..000000000000 --- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_NEEDED=fortran - -inherit fortran-2 toolchain-funcs autotools flag-o-matic - -MYP=${P/_p/-patch} - -DESCRIPTION="General purpose library and format for storing scientific data" -HOMEPAGE="https://www.hdfgroup.org/hdf4.html" -SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2" - -SLOT="0" -LICENSE="NCSA-HDF" -KEYWORDS="amd64 ~ia64 ppc -sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples fortran szip static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( szip )" - -RDEPEND=" - net-libs/libtirpc - sys-libs/zlib - virtual/jpeg:0 - szip? ( virtual/szip )" -DEPEND="${RDEPEND} - test? ( virtual/szip )" - -S="${WORKDIR}/${MYP}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch - "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch - "${FILESDIR}"/${PN}-4.2.13-fix-xdr-configure.patch - "${FILESDIR}"/${PN}-4.2.13-linux-tirpc.patch -) - -src_prepare() { - default - sed -i -e 's/-R/-L/g' config/commence.am || die #rpath - eautoreconf -} - -src_configure() { - [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check - # GCC 10 workaround - # bug #723014 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - econf \ - --enable-shared \ - --enable-production=gentoo \ - --disable-netcdf \ - $(use_enable fortran) \ - $(use_enable static-libs static) \ - $(use_with szip szlib) \ - CC="$(tc-getCC)" -} - -src_install() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt - - cd "${ED}"usr - if use examples; then - mv share/hdf4_examples share/doc/${PF}/examples || die - docompress -x /usr/share/doc/${PF}/examples - else - rm -r share/hdf4_examples || die - fi - - mv bin/ncgen{,-hdf} || die - mv bin/ncdump{,-hdf} || die - mv share/man/man1/ncgen{,-hdf}.1 || die - mv share/man/man1/ncdump{,-hdf}.1 || die -} diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild deleted file mode 100644 index 7f129df09b6b..000000000000 --- a/sci-libs/hdf/hdf-4.2.15.ebuild +++ /dev/null @@ -1,77 +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 toolchain-funcs autotools flag-o-matic - -DESCRIPTION="General purpose library and format for storing scientific data" -HOMEPAGE="https://www.hdfgroup.org/hdf4.html" -SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2" - -SLOT="0" -LICENSE="NCSA-HDF" -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 )" - -RDEPEND=" - net-libs/libtirpc - sys-libs/zlib - virtual/jpeg:0 - szip? ( virtual/szip )" -DEPEND="${RDEPEND} - test? ( virtual/szip )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2.15-enable-fortran-shared.patch - "${FILESDIR}"/${PN}-4.2.15-fix-rpch-location.patch -) - -src_prepare() { - default - sed -i -e 's/-R/-L/g' config/commence.am || die #rpath - eautoreconf -} - -src_configure() { - [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check - # GCC 10 workaround - # bug #723014 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - econf \ - --enable-shared \ - --enable-production=gentoo \ - --disable-netcdf \ - $(use_enable fortran) \ - $(use_enable static-libs static) \ - $(use_with szip szlib) \ - CC="$(tc-getCC)" -} - -src_install() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt - - cd "${ED}/usr" || die - if use examples; then - mv share/hdf4_examples share/doc/${PF}/examples || die - docompress -x /usr/share/doc/${PF}/examples - else - rm -r share/hdf4_examples || die - fi - - mv bin/ncgen{,-hdf} || die - mv bin/ncdump{,-hdf} || die - mv share/man/man1/ncgen{,-hdf}.1 || die - mv share/man/man1/ncdump{,-hdf}.1 || die -} diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest index 4214d4a96adf..9a103676acae 100644 --- a/sci-libs/inchi/Manifest +++ b/sci-libs/inchi/Manifest @@ -1,6 +1,5 @@ -AUX inchi-1.03-shared.patch 804 BLAKE2B f76a320c3bdd88075f5717e2bcfa717a7acd2b17f8ae4f105aef71e9716548f63937a0de5dae7c03df6e9224f1ef7aec3bfec34be4e28640bc543e1f80ad8d66 SHA512 58fef060fd199cd12f62135a139d0e09a5e50c7b0e8e3c992c698ab10ad88f938f18e002b5f590d0f4346b4a801b62906bdb0dd6391ad8e53e9c59f62a465085 -AUX inchi-1.04-static.patch 570 BLAKE2B 33ef224a8fe2304143b51fc57188b8e30b08797a9495c665d76f9cc4436ef8ee6804b50cda1bcf2b11b56acf829599a5b0d8318e75e434a90eedddcbc3e5ebb0 SHA512 0bc4aaf5ff4565517dbef481ca89069f3e91bd8d2b02f8e2591519183feca8725004a51375bec4560002d35b030483a21d9e36a1eb8202e3692186e23dcb7078 +AUX inchi-1.03-shared.patch 590 BLAKE2B 5dec4ce552bca56e517a03f7e9ce72df4c81ecac8510c7ed7c80f7ac9fbd2d8cdf2712b9f87371a6261861ac409f2967c77f5fbb9c4de13c59474eecaddd5690 SHA512 aaf71df8de4081a03e123190ddad8682754c4e6e7b57952c5376c58723679677d76c9c976100af12616a4c6a223ff9d4eac90e7324858fe707c0d59edbad4912 DIST inchi-1.04-doc.zip 2128303 BLAKE2B 041ee948e8a852b66e64c8b04a52a4b4972a750ebdc0e31ce68e6bacfae4d81e49e8356cde766fc87affacc6839c015d5e578e9bacff486605ce5d6b63ed1552 SHA512 930fe10ac2bae11074b7e47446b5af9c01e2aa55f891d04912c71c76e214871c78cc22b3dafea99b57eede5080ac0cfaa6b6d35a73242c8549bea8ffa86e7df7 DIST inchi-1.04.zip 2701930 BLAKE2B 12e5153fdefffdd97794b3942936f93742729cd195a1be0687762263e1d8aa9b0130a79cc1c8a652d2cad67b14a175b8f5ad968c83094f9ebf250f43bcebc18c SHA512 c5a1c2f08d472fcde603acbd898a9a8880407474869eadf0089444503693ae89ff805c579161cb3ee9d7f18e891289a21c4b8a65cc7ece69ee730f7f4e283be4 -EBUILD inchi-1.04.ebuild 1861 BLAKE2B 63da8fc04f9e8d9c20e9a6d9f4c56ee22150eca3dc144d881df58c99c71a0d777c3941c5e55fd86aa6de68c609b4e985edc928e80d492ccdb291f9b472063a2c SHA512 f3bed4d4b5e4220ab7309c78417786f301e51ae65e9fa8bb5e7669753be556b8d3981015e7ffc4d652c8bfba2341fa2f55c9db6dd263e1d3d436ca856e5d4718 +EBUILD inchi-1.04-r1.ebuild 1623 BLAKE2B d2213f27ab2c9a2860d45a7b9c84c517a87ef41a19f14de3837b839f84b35c5d70745001bddb5479bb57b73dcb7cd62feccf799b470f849af36c9aa113182f69 SHA512 6be6a4716a60cfb0667aa35b956fd53ad3f77bbe164866d9f7ccb73ca88ad289221842f4fc681881a638acc92b43e6db232cc448cf1460399a7d78d1603fdd6a MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c diff --git a/sci-libs/inchi/files/inchi-1.03-shared.patch b/sci-libs/inchi/files/inchi-1.03-shared.patch index 6f4619d86bd9..6a47ce99c294 100644 --- a/sci-libs/inchi/files/inchi-1.03-shared.patch +++ b/sci-libs/inchi/files/inchi-1.03-shared.patch @@ -1,8 +1,3 @@ - INCHI_API/gcc_so_makefile/makefile | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/INCHI_API/gcc_so_makefile/makefile b/INCHI_API/gcc_so_makefile/makefile -index dd8e53c..cd617ad 100644 --- a/INCHI_API/gcc_so_makefile/makefile +++ b/INCHI_API/gcc_so_makefile/makefile @@ -213,9 +213,11 @@ $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS) diff --git a/sci-libs/inchi/files/inchi-1.04-static.patch b/sci-libs/inchi/files/inchi-1.04-static.patch deleted file mode 100644 index a367c153824a..000000000000 --- a/sci-libs/inchi/files/inchi-1.04-static.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- INCHI_API/gcc_so_makefile/makefile 2012-05-13 14:52:53.587632989 +0300 -+++ INCHI_API/gcc_so_makefile/makefile 2012-05-13 14:52:11.668635419 +0300 -@@ -209,6 +209,14 @@ - - else - -+ifdef STATIC -+ -+libinchi.a: $(INCHI_LIB_OBJS) -+ $(AR) rcs $(INCHI_LIB_PATHNAME).a $(INCHI_LIB_OBJS) -+ $(RANLIB) $(INCHI_LIB_PATHNAME).a -+ -+else -+ - $(INCHI_LIB_PATHNAME).so$(VERSION): $(INCHI_LIB_OBJS) - $(SHARED_LINK) $(SHARED_LINK_PARM) -o \ - $(INCHI_LIB_PATHNAME).so$(VERSION) \ -@@ -219,6 +226,8 @@ - - endif - -+endif -+ - # === InChI Library compile rule ========= - - %.o: $(P_LIBR)%.c diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04-r1.ebuild index c41a1e5ee2dc..5a19ed1854a7 100644 --- a/sci-libs/inchi/inchi-1.04.ebuild +++ b/sci-libs/inchi/inchi-1.04-r1.ebuild @@ -1,30 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit epatch toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Program and library for generating standard and non-standard InChI and InChIKeys" HOMEPAGE="http://www.iupac.org/inchi/" SRC_URI=" http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP -> ${P}.zip doc? ( http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-DOC.ZIP -> ${P}-doc.zip )" +S="${WORKDIR}"/INCHI-1-API LICENSE="IUPAC-InChi" SLOT="0" KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" +IUSE="doc" -DEPEND="app-arch/unzip" -RDEPEND="" +BDEPEND="app-arch/unzip" -S="${WORKDIR}"/INCHI-1-API +PATCHES=( + "${FILESDIR}"/${PN}-1.03-shared.patch +) -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.03-shared.patch \ - "${FILESDIR}"/${PN}-1.04-static.patch +src_configure() { tc-export AR RANLIB } @@ -43,31 +42,23 @@ src_compile() { ISLINUX=1 ) for dir in INCHI/gcc/inchi-1 INCHI_API/gcc_so_makefile; do - pushd ${dir} > /dev/null + pushd ${dir} > /dev/null || die emake \ "${common_opts[@]}" - popd > /dev/null + popd > /dev/null || die done - if use static-libs ; then - pushd INCHI_API/gcc_so_makefile > /dev/null - emake libinchi.a \ - "${common_opts[@]}" \ - STATIC=1 - popd > /dev/null - fi } src_install() { dodoc readme*.txt if use doc ; then - cd "${WORKDIR}/INCHI-1-DOC/" + cd "${WORKDIR}"/INCHI-1-DOC || die docinto doc dodoc *.pdf readme.txt fi dobin "${S}"/INCHI/gcc/inchi-1/inchi-1 - cd "${S}/INCHI_API/gcc_so_makefile/result" || die + cd "${S}"/INCHI_API/gcc_so_makefile/result || die rm *gz || die dolib.so lib*so* - use static-libs && dolib.a lib*a doheader ../../inchi_main/inchi_api.h } diff --git a/sci-libs/ipopt/Manifest b/sci-libs/ipopt/Manifest index b61a390f57f3..8ce8a33e78c4 100644 --- a/sci-libs/ipopt/Manifest +++ b/sci-libs/ipopt/Manifest @@ -1,3 +1,5 @@ DIST Ipopt-3.12.12.tgz 4530034 BLAKE2B 8a8e24e4e5d8ad5bc1fcfa2de525e1e39c88a4c6dd77b51c0549249f517b3d6a1279e355a7cb606ebd8e606551031b653b78cd4d1cb51dd369e051ffa010011f SHA512 c543695feaa39a69b01e0025ebcd8a8772deb369ea1072f17da4ba34c1b522d322959067f3a6cfc40446e00c2e6dd2d6704a55623aba5d61dff44333727368cb +DIST ipopt-3.14.4.tar.gz 1843885 BLAKE2B 83f6a983db282ced6e52237ff326c860a92df2c92dbd53db7581110d3003fd7b557a68453c74e48d780832d2c9c55d9eb4ea54e68f504c161952fce6bb81caaf SHA512 a27a08ae24c94da96efcfa236034cec79d79111d7dc9c028d808b412d5abb21495a0011f075a87db65b91ba69e191653552e7f99fe8da88c3b580d971eac3652 EBUILD ipopt-3.12.12.ebuild 2080 BLAKE2B 2c3fa37450613d141645906d21c5776064bb6bd6a862014000f99862c7bad432387f43b25dce44667e71ec19fbe0d52a9995ce86c374222510b55bc8c69bbf48 SHA512 52656a3149d8f7582cdd5157faea9c034fc27d436abb5b5de7859361310daebe461c560c9efab87a9cef9abca36247e0db322a828d482c3a63cf822d16f683d3 -MISC metadata.xml 843 BLAKE2B 4eac8500ceabe46f61acbb6dd928503ce4b9e80e7e5c3c239f8dbffba97eda36c02bb6fd776e50e5281d9b9054e5454609b431176dda147341c8e1ad6ebc0046 SHA512 007cd4d7195111e24000d5145db3431ff64a209111523a1f911fb00281119adccc65c2a3f02e7449cea5a161907f18395c50dee4b97e684d493902b472334afa +EBUILD ipopt-3.14.4.ebuild 1734 BLAKE2B 25133ba41dab04662c53ed268e4e8392307e1a0012f168f65ee64fe75c70c7f8ad37065ffc5dcbccfc5d1dfa44ddaa542321fd181e98de4b5aaa47e65e95fd3b SHA512 e9fcd4f104fc8df872c0eae55bb6b4b748728136dc35745d00ebe1bc71f97c2d13d2a3b77981afc2e6d305fd34b0a7d6d613c4c600a53242630ec97f7e580015 +MISC metadata.xml 967 BLAKE2B 8a3fc8addf0130148ddca1bcfb4732e1bf60b52d5de28e2ee6ce9b8e4352358424b39aa585ba177592b4a5744bf2f52e16ab393e2a80617333a48e385eb55a2d SHA512 aa538e824ce3cc926f28554dc268f6d109bebd382b35bb2db8aee75fa82cc81bf9171ace022aaf441602bf8b150fa7bf80ad04e4563d2c3b83e25d80d8780574 diff --git a/sci-libs/ipopt/ipopt-3.14.4.ebuild b/sci-libs/ipopt/ipopt-3.14.4.ebuild new file mode 100644 index 000000000000..6a2bac46ff03 --- /dev/null +++ b/sci-libs/ipopt/ipopt-3.14.4.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED="mumps" +DOCS_BUILDER="doxygen" +DOCS_DIR="doc" +DOCS_DEPEND="media-gfx/graphviz" + +inherit docs fortran-2 toolchain-funcs + +DESCRIPTION="Interior-Point Optimizer for large-scale nonlinear optimization" +HOMEPAGE="https://github.com/coin-or/Ipopt" +SRC_URI="https://github.com/coin-or/Ipopt/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/Ipopt-releases-${PV}" + +LICENSE="EPL-1.0 hsl? ( HSL )" +SLOT="0/1" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="hsl +lapack mpi mumps static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + virtual/blas + hsl? ( sci-libs/coinhsl:0= ) + lapack? ( virtual/lapack ) + mpi? ( virtual/mpi ) + mumps? ( sci-libs/mumps:0=[mpi=] )" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( sci-libs/coinor-sample sci-libs/mumps )" + +src_prepare() { + if use mpi ; then + export CXX=mpicxx FC=mpif77 F77=mpif77 CC=mpicc + fi + default +} + +src_configure() { + local myeconfargs=( + $(use_with doc dot) + ) + + if use lapack; then + myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" ) + else + myeconfargs+=( --without-lapack ) + fi + if use mumps; then + myeconfargs+=( + --with-mumps-incdir="${EPREFIX}"/usr/include$(usex mpi '' '/mpiseq') + --with-mumps-lib="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps" ) + else + myeconfargs+=( --without-mumps ) + fi + if use hsl; then + myeconfargs+=( + --with-hsl-incdir="${EPREFIX}"/usr/include + --with-hsl-lib="$($(tc-getPKG_CONFIG) --libs coinhsl)" ) + else + myeconfargs+=( --without-hsl ) + fi + econf "${myeconfargs[@]}" +} + +src_compile() { + default + docs_compile +} + +src_install() { + default + dodoc -r examples +} diff --git a/sci-libs/ipopt/metadata.xml b/sci-libs/ipopt/metadata.xml index 465f5eae75b3..f5b474167afc 100644 --- a/sci-libs/ipopt/metadata.xml +++ b/sci-libs/ipopt/metadata.xml @@ -2,20 +2,24 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> </maintainer> <longdescription lang="en"> - Ipopt is a solver for large-scale nonlinear continuous - optimization. It can be used from modeling environments, such as - AMPL, GAMS, or Matlab, and it is also available as a callable library with - interfaces to C++, C, and Fortran. Ipopt uses an interior point - method, together with a filter linear search procedure. Ipopt is - part of the larger COIN-OR initiative (Computational Infrastructure - for Operations Research). + Ipopt is a solver for large-scale nonlinear continuous + optimization. It can be used from modeling environments, such as + AMPL, GAMS, or Matlab, and it is also available as a callable library with + interfaces to C++, C, and Fortran. Ipopt uses an interior point + method, together with a filter linear search procedure. Ipopt is + part of the larger COIN-OR initiative (Computational Infrastructure + for Operations Research). </longdescription> <use> - <flag name="hsl">hsl</flag> - <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag> + <flag name="hsl">hsl</flag> + <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag> </use> +<upstream> + <bugs-to>https://github.com/coin-or/Ipopt/issues</bugs-to> + <remote-id type="github">coin-or/Ipopt</remote-id> +</upstream> </pkgmetadata> diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index 42c7ceeeb0bb..de96a4a63e0d 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,5 +1,5 @@ DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614 DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9 EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6 -EBUILD libqalculate-3.22.0.ebuild 1779 BLAKE2B e7c473a397155083881de30343ca2324957decd20f0ed03871c89d34733d4b741a14c9a3f057272f2f6e147c27c69ffd5c00439a7f89874f98079cab1164c2b1 SHA512 08333db34e338e746bfb83fe39a5d124073fc7705367dc3f7da197457ebeabef82eedb0d966d31dfffe1ab589ae2f332baa703a03e6aaa19d92237f7583da0e0 +EBUILD libqalculate-3.22.0.ebuild 1775 BLAKE2B fed1cac3f14df25762147a2084dd5d22c567c0088ed3d2d81a19c3923359cfdc0a774758484fdfa3ee97f2a49fd1a682d63da6a4eb2168deb7defb49766e4bb2 SHA512 cc9ca2da917e0d1cd029795dfaf73fa5ee5d89a9eb5de589bc3dc57967b0cc6f966932aa8d315d610e87cfb1280a72cef46e2264ce29c0b6de3be741d4328b8d MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94 diff --git a/sci-libs/libqalculate/libqalculate-3.22.0.ebuild b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild index 0ffd8ea2aa13..2fc02de1fe5a 100644 --- a/sci-libs/libqalculate/libqalculate-3.22.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz LICENSE="GPL-2" # SONAME changes pretty often on bumps. Check! SLOT="0/22" -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="curl icu gnuplot readline test" RESTRICT="!test? ( test )" diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index 475be9d63a97..cf08fed50c63 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -3,5 +3,6 @@ AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092 EBUILD libsigrok-0.5.2-r2.ebuild 3912 BLAKE2B 402bef147d2b91b20934d43fdee761f07ae73c6973f06f6c37097beacc172cdc236bab38f7647fd25424a96364a7f8cdd0f847929bb70929e8724769cc1b15b1 SHA512 a80e0d58c2262204f879f38cdaa97e4cb862bbe1b3801f31bb675e69376f871cfafee3720ec56457c5340bd7f6b7c06e1e7511acfda4f970d52eeac305d3ae99 -EBUILD libsigrok-9999.ebuild 3676 BLAKE2B 66dc520e44e8315956b11fd188f636fe5f3d7a0396fac2b806d2272e518db52356e70a1584accecea29a015c93aaf68cd44bfdb8df660a98431b21a9ff0a5ade SHA512 fd11ed14b08f4e1f584c7bc56c1c256409d687d2c4a730b2715f31823028b7a33d24cbe6b2857bfa0f4a98a4fa3e5efa1140b68c719f04d8b13a56a3dee580a8 -MISC metadata.xml 702 BLAKE2B 14ee168c6f76641e8057b310fe70dbda5075963de77de02b2cbc503634de9cf8c5f30aa46efe31206fddb4821d499ad2a7e63529370f37b29d0d2d7892686fbb SHA512 3efde6829bcd822729b1eb21c64d216b79dadb79006d04f119bef32e315cafb6db885b051925df818cfdaead1299b0b25c94d40f9b1f04c58bea2c90d212dc81 +EBUILD libsigrok-0.5.2-r3.ebuild 4057 BLAKE2B a43f9b774de8cb3c6df5198b7f155d40a3c149396bfaa5346625c302f99ada5ae69440e5dfd29f11f1f8c3ac04b014920f8c7aa8dcc4a3370da078d00f9a1605 SHA512 ba85487744ada2c18c51ee97c9139eb62f9c93fdac05f1651864b3f1ac1ac7cbcfc0e57302b2f90ed04fc40fce0bc8cfa3b7687d1ecb7cefec70514d3ec49681 +EBUILD libsigrok-9999.ebuild 3931 BLAKE2B 498c6b13b08da5cb4eb54a3e1853555fd7b8741a48a6810f1436883c07aa5700ce5812d03397fa2cc803d3388f3a59584a4e8028d764f9e7c35081c5306b8529 SHA512 dc586a2ebc8cf5bef64e5458d0330573f5f5d3070aed60e1da0d3fd4fef5dae0a15d99a63b5a782ad7b6cddbb61fdfd21d36e02dedba089747d44535609e0b6f +MISC metadata.xml 886 BLAKE2B cb7cece1f79a4affb612e55f147eb93895a805e43aed6bbabfed2e3b925b0714d64651c00294da2742f8c09ce9984a58888b89025d73712400c8bd026296b2cb SHA512 79c9697b3fe6954108cb60ae79c06cee280ef6d73bcd9e35ab148750a4fa55c8e5118c21cdb4e3ae009d4c160a26c98132448476ef90ac6d7a19a79138c3b2f6 diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild new file mode 100644 index 000000000000..8c206cfc5d79 --- /dev/null +++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +USE_RUBY="ruby26 ruby25" +RUBY_OPTIONAL="yes" + +inherit autotools python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://sigrok.org/${PN}" + inherit git-r3 +else + SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support" +HOMEPAGE="https://sigrok.org/wiki/Libsigrok" + +LICENSE="GPL-3" +SLOT="0/4" +IUSE="bluetooth +cxx ftdi hidapi java parport python ruby serial static-libs test +udev usb" +REQUIRED_USE="java? ( cxx ) + python? ( cxx ${PYTHON_REQUIRED_USE} ) + ruby? ( cxx || ( $(ruby_get_use_targets) ) )" + +RESTRICT="!test? ( test )" + +# We also support librevisa, but that isn't in the tree ... +LIB_DEPEND=" + >=dev-libs/glib-2.32.0[static-libs(+)] + >=dev-libs/libzip-0.8:=[static-libs(+)] + bluetooth? ( >=net-wireless/bluez-4.0:= ) + cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) + ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) + hidapi? ( >=dev-libs/hidapi-0.8.0 ) + parport? ( sys-libs/libieee1284[static-libs(+)] ) + python? ( + ${PYTHON_DEPS} + >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] + ) + ruby? ( $(ruby_implementations_depend) ) + serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) + usb? ( virtual/libusb:1[static-libs(+)] ) +" +RDEPEND=" + java? ( >=virtual/jre-1.8:* ) + !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) + static-libs? ( ${LIB_DEPEND} ) +" +DEPEND="${LIB_DEPEND//\[static-libs(+)]} + cxx? ( app-doc/doxygen ) + java? ( + >=dev-lang/swig-3.0.6 + >=virtual/jdk-1.8:* + ) + python? ( + >=dev-lang/swig-3.0.6 + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + ) + ruby? ( >=dev-lang/swig-3.0.8 ) + test? ( >=dev-libs/check-0.9.4 ) + virtual/pkgconfig +" + +S="${WORKDIR}"/${P} + +PATCHES=( + # https://sigrok.org/bugzilla/show_bug.cgi?id=1527 + "${FILESDIR}/${P}-swig-4.patch" + # https://sigrok.org/bugzilla/show_bug.cgi?id=1526 + "${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074 + "${FILESDIR}/${P}-check-0.15.patch" +) + +pkg_setup() { + use python && python_setup + use ruby && ruby-ng_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_unpack() { + [[ ${PV} == *9999* ]] && git-r3_src_unpack || default +} + +sigrok_src_prepare() { + eautoreconf +} + +each_ruby_prepare() { + sigrok_src_prepare +} + +src_prepare() { + if use ruby; then + cp -rl "${S}" "${WORKDIR}"/all || die + ruby-ng_src_prepare + fi + default + sigrok_src_prepare + use python && python_copy_sources +} + +sigrok_src_configure() { + econf \ + $(use_with bluetooth libbluez) \ + $(use_with ftdi libftdi) \ + $(use_with hidapi libhidapi) \ + $(use_with parport libieee1284) \ + $(use_with serial libserialport) \ + $(use_with usb libusb) \ + $(use_enable cxx) \ + $(use_enable java) \ + $(use_enable static-libs static) \ + "${@}" +} + +each_ruby_configure() { + RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python +} + +each_python_configure() { + cd "${BUILD_DIR}" + sigrok_src_configure --disable-ruby --enable-python +} + +src_configure() { + sigrok_src_configure --disable-ruby --disable-python + use ruby && ruby-ng_src_configure + use python && python_foreach_impl each_python_configure +} + +each_ruby_compile() { + emake ruby-build +} + +each_python_compile() { + cd "${BUILD_DIR}" + emake python-build +} + +src_compile() { + default + use ruby && ruby-ng_src_compile + use python && python_foreach_impl each_python_compile +} + +src_test() { + emake check +} + +each_ruby_install() { + emake ruby-install DESTDIR="${D}" +} + +each_python_install() { + cd "${BUILD_DIR}" + emake python-install DESTDIR="${D}" + python_optimize +} + +src_install() { + default + use python && python_foreach_impl each_python_install + use ruby && ruby-ng_src_install + use udev && udev_dorules contrib/*.rules + find "${D}" -name '*.la' -type f -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild index 02994b07b73a..126dd3c3d52f 100644 --- a/sci-libs/libsigrok/libsigrok-9999.ebuild +++ b/sci-libs/libsigrok/libsigrok-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) USE_RUBY="ruby26 ruby25" RUBY_OPTIONAL="yes" @@ -22,7 +22,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok" LICENSE="GPL-3" SLOT="0/9999" -IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb" +IUSE="bluetooth +cxx ftdi hidapi java nettle parport python ruby serial static-libs test +udev usb" REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )" @@ -33,8 +33,11 @@ RESTRICT="!test? ( test )" LIB_DEPEND=" >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] + bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) + hidapi? ( >=dev-libs/hidapi-0.8.0 ) + nettle? ( dev-libs/nettle:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( ${PYTHON_DEPS} @@ -97,7 +100,10 @@ src_prepare() { sigrok_src_configure() { econf \ + $(use_with bluetooth libbluez) \ $(use_with ftdi libftdi) \ + $(use_with hidapi libhidapi) \ + $(use_with nettle libnettle) \ $(use_with parport libieee1284) \ $(use_with serial libserialport) \ $(use_with usb libusb) \ diff --git a/sci-libs/libsigrok/metadata.xml b/sci-libs/libsigrok/metadata.xml index 125e899de100..d9f21398e7c8 100644 --- a/sci-libs/libsigrok/metadata.xml +++ b/sci-libs/libsigrok/metadata.xml @@ -11,7 +11,9 @@ as well as input/output file format support. </longdescription> <use> - <flag name="ftdi">Enable drivers that need libftdi</flag> + <flag name="ftdi">Enable drivers that need <pkg>dev-embedded/libftdi</pkg></flag> + <flag name="hidapi">Enable drivers that need <pkg>dev-libs/hidapi</pkg></flag> + <flag name="nettle">Enable drivers that need <pkg>dev-libs/nettle</pkg></flag> <flag name="parport">Enable drivers that are parallel (IEEE1284) based</flag> <flag name="serial">Enable drivers that are serial (RS232) based</flag> </use> diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest index 992435caae37..ff81cd2ab597 100644 --- a/sci-libs/libsigrokdecode/Manifest +++ b/sci-libs/libsigrokdecode/Manifest @@ -1,4 +1,4 @@ DIST libsigrokdecode-0.5.3.tar.gz 892783 BLAKE2B 45bae2488e4872be3bb891813083ed540617ac88558bb6c2d971fbb0c05585d3fcb74192fc83ce7d67ee466bc04c61fbccf6f475e549b80c86fe5f0cc191c7c1 SHA512 23393504b68135ed4ae8e8a654df024620af02e84fa3955956c61899388812229108155b4ae8d946e61f33dc8a8807db090d608350548a7a717d966442b07b9e -EBUILD libsigrokdecode-0.5.3-r1.ebuild 1001 BLAKE2B 453731066d29addd3c263a9c7eb87b2fc7c33231e311a9471c8aee58452ddb43b8894b6e8c38b68db24f32101066fedfed2c9c69b4d385cae5c1f1fa5f7ca345 SHA512 50cbba99c644faa080b44adbc0054f5cf35cf6dcab6d3e7a1a12c8c9bf8ea78d94126e48cdf063bf86770da44d037237c8a0ded238e49c5d33f359423138675f -EBUILD libsigrokdecode-9999.ebuild 1004 BLAKE2B 033bbf684e9f31c6512604fc950380d15834bbf9c7085d7018980b750e02b79687328a2d388fb4fc3dd2d9d9f0f99e8010de8a9209fe29eb1ce8c4a177b724fe SHA512 4fd88d2ae5d24709ce17e7aa1e2f7d3d83311582d4ecf2cb77d79b6246a4c8a7d4d8f2d053a289ee153527ec0d2c5f71df673a32df28af741fdbc860c22c314a +EBUILD libsigrokdecode-0.5.3-r2.ebuild 1036 BLAKE2B 081153624bc2805ab54b5dfb5c2acb48a3b3f60edb9f85dcc6aeaacddcb9749e2ac18d8b4c391e0c3e0376b24cb4bef1d3f80db49c23f7c991c82bbd89d9f064 SHA512 4b48e4c0a97f8428d41cd61c948084413d307a3edb51dc3f20c7cd9617d22ee91ee7496245fe23d83ca5233a069aec0299a8c5339235650a2ad2b74c5d435b91 +EBUILD libsigrokdecode-9999.ebuild 1039 BLAKE2B c7224883b74a582e3c5f24d139a150519ca190d5658605f70a0636beb683e5ba7684ae5dde81c96a84ebff1238335d10fe1351a34873dc75f12486bd1a9b161e SHA512 3258b86e74a4cf08a125a48cb6a3d5f1432aef961ca4ff747a85842ba3751d26b9ab7fed3b5688099afeb649b5d3406c24c5ea025d481090b11a6e9cc5497f58 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5 diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild index 94adf3d75fe7..f947b0423941 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r1.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ src_prepare() { default # bug #794592 - sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die + sed -i -e "s/\[SRD_PKGLIBS\],\$/& [python-${EPYTHON#python}-embed], [python-${EPYTHON#python}],/" configure.ac || die eautoreconf } diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild index 71b414a4c1ad..e7f21f3ff1e0 100644 --- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild +++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ src_prepare() { default # bug #794592 - sed -i -e 's/\[SRD_PKGLIBS\],$/& [python3-embed], [python3],/' configure.ac || die + sed -i -e "s/\[SRD_PKGLIBS\],\$/& [python-${EPYTHON#python}-embed], [python-${EPYTHON#python}],/" configure.ac || die eautoreconf } diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest index 150870eceb9d..e37ce6bb5f21 100644 --- a/sci-libs/libxc/Manifest +++ b/sci-libs/libxc/Manifest @@ -5,5 +5,5 @@ DIST libxc-5.1.7.tar.gz 46172191 BLAKE2B e18acd864a5de7c93ce5499b79f60db473851ac EBUILD libxc-5.1.0.ebuild 752 BLAKE2B 37da5534623ea30c51c80d269d9132de218329f5960abe52d8f2ed5b135cc2eb0b8749f63b89b82fbdeba28bf2c9802747bbbd7006a8ba4262bc17f16b6649d4 SHA512 43452f6781c300ada25e69d2459b4e9f6f80a770b035e5f3737a80161864cfca4cec74c0c9f495749037b735d183a59e0d5e4db9a550a5e0ba80d2500224df13 EBUILD libxc-5.1.4.ebuild 753 BLAKE2B af1a4fe2041accdb77040a1eb8051bfb0142a214c53bdd8268d7b3bb4a5812e54b32bfeb97f9231159ee5ffcef874e940a7c4a804c7a3c79d82054cc8843d3c2 SHA512 daca4b601869aeb62ac6304cc015a3f53f0c59ad6add0c29a46be4c68422a407860a18b86cb35d5007b21fa683cf9e32a7f6306bcc2f9bc0893cf965dfad9c44 EBUILD libxc-5.1.6.ebuild 753 BLAKE2B 8a0e13d6553666886cb11c12d3df82b09096e1dc231df71727f22059a3a323a0e7b7de64e8fe10bc41966ad29942231186155ca642e4a4e7ee79851116d97d03 SHA512 85be3aac7311925f8332d9bbabb6801f8d0c41365795d50d259528e473f1b9124a5ffa046e7afa537d69d5c47374d5e4d49cc6ec1133488e903b16abbb41221f -EBUILD libxc-5.1.7.ebuild 735 BLAKE2B d6228aa9608f9da364a815cd01800fd82e14bc9916c1eb0c21bf6a43579074bc1e3d52da4819973b31de21ed353aec2a2b85502937c4444d8a3b8f4bdd554bb4 SHA512 de17cdc3ee8b24ea57a33d98ae7ada6cdf67847c10d17e561cf6c2c9a45859a020ee7cda759fec38a707495573975df27cc7d659efd143356a71d34e86598ba2 +EBUILD libxc-5.1.7.ebuild 734 BLAKE2B 43b9abad10ea44bb85067563232d61e32f49291ad358d816c6b5cfea6446f033608c66c6a7cd7e9aaccdb1fb685e2f43bdf82ef767463f4568757e88c8529d8a SHA512 9e459b93dea49558f3c36a9cc8711c2679700e807105f2a68f926224838bfaad9a0b79d29c65b0f9e8ca3e43e03bc52284df32d32f2287e6e6bb5576e63ea5d8 MISC metadata.xml 1354 BLAKE2B 42f0a7dcce10dd20c3796ba2576097f639062e4854f0e035dc40fa4ca1f7c94841624531334953229c1b3514f8b481fab68d67f0fc215033d7bd1dfed05960f4 SHA512 ba2e5fde19b864b5b77b47dafaaae59e4fa2536c4eeac21fa830fb201c84ff07edd1c89c909eb0d33e1841f4c0ec741dd8d5215e789cb2b87648af32528d7050 diff --git a/sci-libs/libxc/libxc-5.1.7.ebuild b/sci-libs/libxc/libxc-5.1.7.ebuild index 47698dd02b85..36073ef2e6eb 100644 --- a/sci-libs/libxc/libxc-5.1.7.ebuild +++ b/sci-libs/libxc/libxc-5.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest index 44ebd47adad5..48d70f48d8a4 100644 --- a/sci-libs/netcdf-fortran/Manifest +++ b/sci-libs/netcdf-fortran/Manifest @@ -1,5 +1,5 @@ -DIST netcdf-fortran-4.4.3.tar.gz 1286951 BLAKE2B 6e68505359328bac4155065419cb9c2fb2df0de875210c0eb9a4e63312b2ec272d63ecfa73b5dcebe7cf75b58a184d1a0ccb2c06c45869d3f4573590d610d9e0 SHA512 94f51b4be889d6a9d6a86e3fcb2639ac58288969160d0f334ed6965e3c9cbacff7289b1fc54ed06e6ec8b845b19f5c409fbdcab432c8edf5c96efde887920924 DIST netcdf-fortran-4.5.3.tar.gz 1805683 BLAKE2B f32a36a77872e039a0c03a1f1ccdbb00761309dc7d255a1203b0a1971464e75d87f56230f28a5d5928ca3e7e388f52c4622836c2cea3d35b286161b8044e375b SHA512 fe4b2f6f8c44bf4fdeebe3cbd57ee44ccee15a70075428bb68f0d33b70f9291b68b542965634a27fb4be5a59c756d672a3d264f2628391861edb98a244e072b4 -EBUILD netcdf-fortran-4.4.3.ebuild 937 BLAKE2B 2ccb918d39570ade14e367cee764a6e3a9fdd166c87eb7c3124fef20f8c18015b95a8cb16b8e75f918d350594a001103f2306320c5e4afc174332ac22b531f59 SHA512 58f0e5ae08fe063a66847757fa737d856de2d7d213623fda7f3b00546a26841edb760e8534e6905393fe5e8e62fd8dd67c84b583681d316e76a4c93c470101da +DIST netcdf-fortran-4.5.4.tar.gz 2011867 BLAKE2B bc98522be63c705193a22ce877c41abdc064a05afab2186891d8a0bbe9da8f0ba3f7eae6610e8b4e006b26ad8e3ea5fd8d57349054949a38f3a2fd9dfefb85c5 SHA512 a704f6483f2c8b8bf2353615a3e4b784294bd790588cfc13193c617e776e330edb17fa16da69e1a0b6c767308992321e01399ba2067c32f6ae6b3cb9ff72c3ee EBUILD netcdf-fortran-4.5.3.ebuild 1136 BLAKE2B 18dbe075b340157b64dae7600f8fe151d2cf370f59c8b129919952a6468e5e674086d7c0d80473699df301c53ede93081117a2485b35549bd0e22947af51c114 SHA512 a76df5cdddf2fc151052321141105656e0b532e4baf293906f9cab184917efe7419fc0e9fb01fb9bd26b42534c37856fc5487d281382c9a0674ab64626adcc0b +EBUILD netcdf-fortran-4.5.4.ebuild 919 BLAKE2B fd474d4710fa2ba8098f75e452e2b940acdc2da3791c8d03bc0352d1452fba8381b73216a6bfc4655a8128b7b98a5b63da997e48e52c47caba0045a2006328df SHA512 ec8d06f3820e9afbf75142fe69c012f6f9ea911d1a735675b681e70c2334b4accf8a2868900fed58288d0d424b604f19ae2d9ffff686a28331265482159d67a0 MISC metadata.xml 839 BLAKE2B d1e207fbff3f9156dae38cf50061bcd12c6020597f015d513997c6781a111b21af791ad77536b16f6f4ba8a6caeeb69932f763cd23d3f488d362dfd46ecf3265 SHA512 9e14fb6d6eae551b58eecd88156ce33a47267e8e57dcd024b70ee31993d8026bc4a1e4a42f3d63a9f91a43dca5e80bb435f926692dcf2ec215d1f544826f40f8 diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild index b2463eb94be9..2e163ea93b82 100644 --- a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild +++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild @@ -1,40 +1,39 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 FORTRAN_STANDARD="77 90" -inherit autotools fortran-2 flag-o-matic +inherit autotools fortran-2 DESCRIPTION="Scientific library and interface for array oriented data access" HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" SRC_URI="https://github.com/Unidata/netcdf-fortran/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="UCAR-Unidata" -SLOT="0/6" +SLOT="0/7" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples static-libs" +IUSE="doc examples static-libs" RDEPEND="sci-libs/netcdf" DEPEND="${RDEPEND} - dev-lang/cfortran -" + dev-lang/cfortran" +BDEPEND="doc? ( app-doc/doxygen )" src_prepare() { - # use system cfortran - rm libsrc/cfortran.h || die - default + eautoreconf } src_configure() { - # GCC 10 workaround - # bug #723274 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - econf $(use_enable static-libs static) + econf \ + --disable-valgrind \ + --with-temp-large="${T}" \ + --disable-dot \ + $(use_enable doc doxygen) \ + $(use_enable static-libs static) } src_install() { diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest index 02a31a6a054a..957c09140cc9 100644 --- a/sci-libs/netcdf/Manifest +++ b/sci-libs/netcdf/Manifest @@ -4,5 +4,5 @@ AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42 EBUILD netcdf-4.7.4.ebuild 1703 BLAKE2B 33294c879140f07bce3943cf77ec41b36045dd9df219d0cf1f3784a683b6392a6c3adb5561c6b2f18048379580fd28c6782bea986a5b5f422c5ec103a7c64b13 SHA512 7d6ea028a446b4f0d8a5cfd8b22c15f582722ae3f6f839c28a42e3a45ed9ed7952ff8c3bd5b43471c02ba237d06707d8cba8399e489eb1cb1849a9fa7f3f39d8 -EBUILD netcdf-4.8.1-r1.ebuild 1814 BLAKE2B cd579bee19e8c30b3ce2021a88cef416cf2973c4c5a49b905d50486717286c22ebef5fcbc7fc0cf81a588e29323f79317c8fb1266a0eb9cc46c7c46cfc8c6b84 SHA512 c06ddc46438fe617de21b57fa7ed29608c687013cbb9a2888a65e031c21695b3350badbe76c7b58232d916f65fd391beecaf4fc1993cc1d38cbdf49bf4ab4c23 +EBUILD netcdf-4.8.1-r1.ebuild 1812 BLAKE2B ac9f188172be4add4eda8cf4a6c3e574e4eaab98e7e2bef1155ac1aa2f1eaa5180d69bc90920be68629118a3fc2cf0d17f14e92f43744b7d9a6e156a2dc30ff0 SHA512 0a33c8512857ceae5436827d33d87cc1a8e0efdc34bfc758bb0f52143771a9479aebee2bdfc5df3c67e273bb72f0d2c5e47105c716483f2a69b3033125722bda MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b diff --git a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild index 0dd095346a26..bc4be534b016 100644 --- a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild +++ b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-c-${PV}" LICENSE="UCAR-Unidata" # SONAME of libnetcdf.so SLOT="0/19" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" +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/numkit/Manifest b/sci-libs/numkit/Manifest index 475bc78184cc..1619e8857f81 100644 --- a/sci-libs/numkit/Manifest +++ b/sci-libs/numkit/Manifest @@ -1,3 +1,3 @@ DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034 -EBUILD numkit-1.1.2-r1.ebuild 591 BLAKE2B 98d1ec8ae01647e6329b185b60f245f1ddaaeb6d001282fb54eed076290198dcdcfc966589a978280c44d744900c2cf5dbf5fd150d4e4ad66d5abf0feeb9a79e SHA512 d2a87964d0835888bed7a8177f86c26c1fc2022246b66545771feb1f7f744b244c82011539a492770b014726215b7988779d31c076af96b27282ea904247d7e4 +EBUILD numkit-1.1.2-r1.ebuild 592 BLAKE2B 398cf2e06717da85420abf7fe8da192ae024cdd5142b0d2d9ac0e18a333432d7b85b9fbd34b4ff5db90948a10074625fe050a06dfc9a445e897a0b3a00d1eb35 SHA512 fd6f1ed9463f1bd4ede8d0f704a1517a02423d40dd22afece78df734f08375cf6e64cf39ae41dbdf6dbc138118ef63148be4da6289e6f8d9d586af21ade1381a MISC metadata.xml 500 BLAKE2B af9eab253bd3cfc520d5027f7a201f2b046c5433a297802607051a9292c58823d7819c51f0aa1552e894a317467b89089bdadde4f31394eba72bfffa0a7c21fd SHA512 b218c8d323e51bd06ecf3fed6621263597a61591e4890507b825e28a431c6045efed114bc91eca906405c84331ced93912c02d06b14c98368e5897b0d1856f30 diff --git a/sci-libs/numkit/numkit-1.1.2-r1.ebuild b/sci-libs/numkit/numkit-1.1.2-r1.ebuild index 80b313603db7..a47312e24d4f 100644 --- a/sci-libs/numkit/numkit-1.1.2-r1.ebuild +++ b/sci-libs/numkit/numkit-1.1.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit distutils-r1 DESCRIPTION="Numerical first aid kit (with numpy/scipy)" diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest index 3a5c7e6b0c42..6154aae3a8ed 100644 --- a/sci-libs/opencascade/Manifest +++ b/sci-libs/opencascade/Manifest @@ -5,9 +5,11 @@ AUX opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch 2207 BLA AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 01b0ec99fb9ad032d6a90cceabb50900528abd0528b53e976484bf02f04eac9bc02b063bce5c221ae88782a126103e8077db9e90aa7f64f4f187dad00354d4d2 SHA512 fb3c374fe8aff8d2bac039a0eef754f2e823a97bfd7860bdd7e047c1b357202abfca0e37b46afc32220c7e354b5edb54805fbbbffde015bb4be2d7f4ded4a8da AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7 AUX opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch 5749 BLAKE2B 9176a738ec6b39a1cd5da61f2d72d096b09f6019f63a5b7733c5aa00796529f2cc5e3becdf5c24cfa01e4ff5b9da5ae9cd359372e6974eeaae7bcdf87e8c03c8 SHA512 5f7970e1461652966c34b1adb6e2580cfd7e3e230abbf108193027f67afbd5e78fc7451b50bf632fa3889174626384e4a0044d693e4f49ab9ece84a2ec6bd04a -AUX opencascade-7.5.env.in 4683 BLAKE2B 4c7c3764e56110c34c9acb9ecb860936049cf03f4ed99d708a8f631b5d3dc7cfa95ca7f8fe8b259986fa637243fe80a6888a2db6a2ad6f80b3b2175a9bb8680f SHA512 773b213e8d7752fc028d951d2a5d5aa610c96ee916499c3655e60f0ec485d393c3bf13a85cae104653242829d8abb9fea451f17bf1b902e1c1fa0bf5b329f08b +AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47 -EBUILD opencascade-7.5.2-r2.ebuild 4640 BLAKE2B e6934f327c65b6add9f1c4f04db820543ca5ae02c636828380966eaa97635d7d2d380c4a966181dbaac54e6647361cf6b1369ce48e9cac57230b95eca92f5479 SHA512 7372ef935034a25f13c78fa88d5605e34d3a927241f2248ff360b341816688c8fe03c04afedd778d0c7ef4645b1b7f0de4c6d363977a02d693be707b521e2185 -EBUILD opencascade-7.5.3-r3.ebuild 4640 BLAKE2B f65b18f0554650c7eb60ad8f8f7684b8ce8ffada6c2e054a5bfffb7ebccc9b5d115eceb372c81f20bac021da0f1169735ff27a2fbf2cafe22361db670ce09d25 SHA512 845d39bbb2871b807b943da578d8fd08f77fea06688ed89bb754b7064f5818b0fdb3711a715e59d3c6ef79a67ef714a58c19a031d329327210578c346a3f1671 -MISC metadata.xml 979 BLAKE2B f5a7d51dd3a85f7409d97671fe8b3ca8675d11f78f3de4c8511d3e7be8d95b7f37bf3993dc21a2e33de0ac8412a57cb4385ec9cd7a37d2dbe3772fbbca298b13 SHA512 eb9673f62eee92feaf2da8ff42887c3cfd7d74558b8a35a5d482809a196211c2a6953c6f23558fdd74f10d6db3f493a4c022a5f8d7b1764e39e473394cf671d6 +DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd SHA512 6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be +EBUILD opencascade-7.5.2-r5.ebuild 4730 BLAKE2B d0fa916eed671b5f1069eb52e474a8dd1d81bf56ede75ac60c3a8cab74a173530bca9b568b3ef9c665323ecd32c4f01508dcb5bf544c910fe057a1b1572d8c23 SHA512 489eacdda65c0eaabb18448200578c10dd7aa3876001efa2df81c1a2924de036127f6c6281c8259412e793cff6677b1d2f63d4369b3b027621885c3c5cf7052e +EBUILD opencascade-7.5.3-r6.ebuild 4730 BLAKE2B f56506fc176a6a2ff8aa238e321bc59ee92367aa40c1138931fee15ab2954290a96bf438338a213cb192a8dec326fca035b350ea7cc280e134a47929932e2b8f SHA512 b09a996e7c4e27f457b0c6a4c1c2bf93d93bef87b20eaa603bc018286e3aab0116e25b94e6c1a4bfd530c8075b67ccd332f574b2ada29d5af6c1b20bbb1f4731 +EBUILD opencascade-7.6.0-r2.ebuild 4423 BLAKE2B 4034cbc3b50261524a61f92fd7d92ad0e380bd58d0ce95c82425b9d634c368530ec4c46d891f979050885b3b11ac95f5d2d51ab2e4b48c41fab6493459011423 SHA512 ea1d6c2233a40dfebad4b610ba9a29719b84ee52479db0a449532d69f07663959bc8c868a15d4f49b610bd071f46d9fdb026f0e73739b59ca628094079c7c396 +MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8 diff --git a/sci-libs/opencascade/files/opencascade-7.5.env.in b/sci-libs/opencascade/files/opencascade.env.in index d7148c241f11..28006d724806 100644 --- a/sci-libs/opencascade/files/opencascade-7.5.env.in +++ b/sci-libs/opencascade/files/opencascade.env.in @@ -10,8 +10,8 @@ # define the root directory of Open CASCADE Technology (needed) CASROOT="VAR_CASROOT" -PATH="VAR_CASROOT/lib/opencascade-VAR_PV/bin" -LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV" +PATH="VAR_CASROOT/lib/opencascade/bin" +LDPATH="VAR_CASROOT/lib/opencascade" ############################################################################# # The MMGT_* variables are used to determine how memory management will work @@ -79,21 +79,21 @@ LDPATH="VAR_CASROOT/lib/opencascade-VAR_PV" # The following CSF_* variables define various directories and files where # OCCT is looking for resources. -CSF_GraphicShr="VAR_CASROOT/lib/opencascade-VAR_PV/libTKOpenGl.so" -CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource/MigrationSheet.txt" -CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Textures" -CSF_PluginDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" -CSF_StandardDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" -CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" -CSF_XCAFDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/StdResource" -CSF_XmlOcafResource="VAR_CASROOT/share/opencascade-VAR_PV/resources/XmlOcafResource" +CSF_GraphicShr="VAR_CASROOT/lib/opencascade/libTKOpenGl.so" +CSF_MIGRATION_TYPES="VAR_CASROOT/share/opencascade/resources/StdResource/MigrationSheet.txt" +CSF_MDTVTexturesDirectory="VAR_CASROOT/share/opencascade/resources/Textures" +CSF_PluginDefaults="VAR_CASROOT/share/opencascade/resources/StdResource" +CSF_StandardDefaults="VAR_CASROOT/share/opencascade/resources/StdResource" +CSF_StandardLiteDefaults="VAR_CASROOT/share/opencascade/resources/StdResource" +CSF_XCAFDefaults="VAR_CASROOT/share/opencascade/resources/StdResource" +CSF_XmlOcafResource="VAR_CASROOT/share/opencascade/resources/XmlOcafResource" # The below values might be optional. -CSF_IGESDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource" -CSF_ShadersDirectory="VAR_CASROOT/share/opencascade-VAR_PV/resources/Shaders" -CSF_SHMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/SHMessage" -CSF_STEPDefaults="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSTEPResource" -CSF_UnitsDefinition="VAR_CASROOT/share/opencascade-VAR_PV/resources/UnitsAPI/Units.dat" -CSF_XSMessage="VAR_CASROOT/share/opencascade-VAR_PV/resources/XSMessage" +CSF_IGESDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource" +CSF_ShadersDirectory="VAR_CASROOT/share/opencascade/resources/Shaders" +CSF_SHMessage="VAR_CASROOT/share/opencascade/resources/SHMessage" +CSF_STEPDefaults="VAR_CASROOT/share/opencascade/resources/XSTEPResource" +CSF_UnitsDefinition="VAR_CASROOT/share/opencascade/resources/UnitsAPI/Units.dat" +CSF_XSMessage="VAR_CASROOT/share/opencascade/resources/XSMessage" # TODO: check those # they were defined in the original ebuild but the directories and files diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml index fe7ad33b9523..d1b713a48a87 100644 --- a/sci-libs/opencascade/metadata.xml +++ b/sci-libs/opencascade/metadata.xml @@ -10,6 +10,10 @@ <name>Proxy Maintainers</name> </maintainer> <use> + <flag name="eigen"> + Enable support for eigenvalues through the header-only + <pkg>dev-cpp/eigen</pkg> package. + </flag> <flag name="freeimage"> Enable support for image i/o via <pkg>media-libs/freeimage</pkg> </flag> diff --git a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild index cf90cc0c8aa1..8bf1c6acd11e 100644 --- a/sci-libs/opencascade/opencascade-7.5.2-r2.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,9 +14,9 @@ SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta S="${WORKDIR}/occt-V${MY_PV}" LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="${PV_MAJ}" +SLOT="0/${PV_MAJ}" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk" +IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk" REQUIRED_USE="?? ( optimize tbb )" @@ -25,7 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )" RESTRICT="test" RDEPEND=" - app-eselect/eselect-opencascade + !app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl @@ -49,13 +49,11 @@ RDEPEND=" tbb? ( <dev-cpp/tbb-2021.4.0 ) vtk? ( sci-libs/vtk:=[rendering] ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" + +BDEPEND=" dev-cpp/eigen dev-libs/rapidjson -" -BDEPEND=" - app-eselect/eselect-opencascade doc? ( app-doc/doxygen ) examples? ( dev-qt/linguist-tools:5 ) " @@ -90,20 +88,25 @@ 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_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" -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_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF -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_GLES2=$(usex gles2-only) -DUSE_RAPIDJSON=$(usex json) -DUSE_TBB=$(usex tbb) -DUSE_VTK=$(usex vtk) @@ -119,7 +122,13 @@ src_configure() { fi if use vtk; then - if has_version ">=sci-libs/vtk-9.0.0"; then + if has_version ">=sci-libs/vtk-9.1.0"; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + elif 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 @@ -132,13 +141,12 @@ 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 + -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ + < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || 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 + sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die fi # use internal optimized memory manager and don't clear memory with this @@ -146,26 +154,19 @@ src_configure() { 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 + -i "${T}"/99${PN} || die fi } src_install() { cmake_src_install - # respect slotting - insinto "/etc/env.d/${PN}" - doins "${T}/${PV_MAJ}" + doenvd "${T}/99${PN}" # remove examples if use !examples; then - rm -r "${ED}/usr/share/${P}/samples" || die + rm -r "${ED}/usr/share/${PN}/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/opencascade/opencascade-7.5.3-r3.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild index 0296150b6b01..1bec9312ad8d 100644 --- a/sci-libs/opencascade/opencascade-7.5.3-r3.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,9 +14,9 @@ SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/ta S="${WORKDIR}/occt-V${MY_PV}" LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )" -SLOT="${PV_MAJ}" +SLOT="0/${PV_MAJ}" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug doc examples ffmpeg freeimage gles2 json optimize tbb vtk" +IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk" REQUIRED_USE="?? ( optimize tbb )" @@ -25,7 +25,7 @@ REQUIRED_USE="?? ( optimize tbb )" RESTRICT="test" RDEPEND=" - app-eselect/eselect-opencascade + !app-eselect/eselect-opencascade dev-lang/tcl:= dev-lang/tk:= dev-tcltk/itcl @@ -49,13 +49,11 @@ RDEPEND=" tbb? ( <dev-cpp/tbb-2021.4.0 ) vtk? ( sci-libs/vtk:=[rendering] ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" + +BDEPEND=" dev-cpp/eigen dev-libs/rapidjson -" -BDEPEND=" - app-eselect/eselect-opencascade doc? ( app-doc/doxygen ) examples? ( dev-qt/linguist-tools:5 ) " @@ -90,20 +88,25 @@ 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_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" -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_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF -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_GLES2=$(usex gles2-only) -DUSE_RAPIDJSON=$(usex json) -DUSE_TBB=$(usex tbb) -DUSE_VTK=$(usex vtk) @@ -119,7 +122,13 @@ src_configure() { fi if use vtk; then - if has_version ">=sci-libs/vtk-9.0.0"; then + if has_version ">=sci-libs/vtk-9.1.0"; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + elif 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 @@ -132,13 +141,12 @@ 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 + -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ + < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || 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 + sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || die fi # use internal optimized memory manager and don't clear memory with this @@ -146,26 +154,19 @@ src_configure() { 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 + -i "${T}"/99${PN} || die fi } src_install() { cmake_src_install - # respect slotting - insinto "/etc/env.d/${PN}" - doins "${T}/${PV_MAJ}" + doenvd "${T}/99${PN}" # remove examples if use !examples; then - rm -r "${ED}/usr/share/${P}/samples" || die + rm -r "${ED}/usr/share/${PN}/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/opencascade/opencascade-7.6.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild new file mode 100644 index 000000000000..595c605bc985 --- /dev/null +++ b/sci-libs/opencascade/opencascade-7.6.0-r2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_PV="$(ver_rs 1- '_')" +MY_SLOT="$(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="0/${MY_SLOT}" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc eigen 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-2021.4 ) + vtk? ( sci-libs/vtk:=[rendering] ) +" +DEPEND=" + ${RDEPEND} + eigen? ( dev-cpp/eigen ) + json? ( dev-libs/rapidjson ) +" +BDEPEND=" + doc? ( app-doc/doxygen[dot] ) + examples? ( dev-qt/linguist-tools:5 ) +" + +PATCHES=( + "${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 +) + +src_prepare() { + cmake_src_prepare + + 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) + + -DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}" + -DINSTALL_DIR_DATA="share/${PN}/data" + -DINSTALL_DIR_DOC="share/doc/${PF}" + -DINSTALL_DIR_INCLUDE="include/${PN}" + -DINSTALL_DIR_LIB="$(get_libdir)/${PN}" + -DINSTALL_DIR_RESOURCE="share/${PN}/resources" + -DINSTALL_DIR_SAMPLES="share/${PN}/samples" + -DINSTALL_DIR_SCRIPT="$(get_libdir)/${PN}/bin" + -DINSTALL_DIR_WITH_VERSION=OFF + -DINSTALL_SAMPLES=$(usex examples) + -DINSTALL_TEST_CASES=NO + + -DUSE_D3D=NO + # no package yet in tree + -DUSE_DRACO=OFF + -DUSE_EIGEN=$(usex eigen) + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FREEIMAGE=$(usex freeimage) + -DUSE_FREETYPE=ON + -DUSE_GLES2=$(usex gles2) + # no package in tree + -DUSE_OPENVR=OFF + -DUSE_RAPIDJSON=$(usex json) + -DUSE_TBB=$(usex tbb) + -DUSE_VTK=$(usex vtk) + -DUSE_XLIB=ON + ) + + 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.1.0"; then + mycmakeargs+=( + -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 + -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) + ) + elif 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 + + sed -e "s|lib/|$(get_libdir)/|" \ + -e "s|VAR_CASROOT|${EPREFIX}/usr|" \ + < "${FILESDIR}"/${PN}.env.in > "${T}"/99${PN} || die + + # use TBB for memory allocation optimizations + if use tbb; then + sed -e 's|^#MMGT_OPT=0$|MMGT_OPT=2|' -i "${T}"/99${PN} || 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}"/99${PN} || die + fi +} + +src_install() { + cmake_src_install + + doenvd "${T}/99${PN}" + + docompress -x /usr/share/doc/${PF}/overview/html +} diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest index 847588b6391b..8e66359d08ff 100644 --- a/sci-libs/scotch/Manifest +++ b/sci-libs/scotch/Manifest @@ -3,8 +3,6 @@ AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89 DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c DIST scotch-v6.1.2.tar.gz 6395320 BLAKE2B 07aa4f56c097cf364d7d63613f3c5d5d3f2a8419ce27da95a4a20d5ea48fcf2f036acaa62ab1f591b5d1dc672151562bc0721a66f203c60d5ee26a501cf90352 SHA512 dcf63c65bf8155590a70483f80ad21b4a303debf50d47a3c154983935dc056f3df93a61c3d88304f3d1a4517ab3a355e176d72b3835382cd65c1556fbbd21702 -DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2 -EBUILD scotch-6.0.4-r2.ebuild 5042 BLAKE2B 3482237b7fcfaa11a4c1b0845d780059823ad509c823d41f052991b6a8977d6cea0ba1e96e5270a6d983a313300a6cb6e41ce7a94d7bb8316d3c38be521f1e9f SHA512 c376bc48a33a468921001462b116a2de43717d33b18e018e45f04efffcce034ea3c64b1eedae31f5a92e744d41bcff39cfc50ef0ca0f76f1062f814d40eeef46 EBUILD scotch-6.1.0-r1.ebuild 4948 BLAKE2B 4856a6123e7663f65de9cef8855875b45faa1dcd208e6a9833d4a255ca7cda7a82222e64a21ca3cfa9a1c9955af69e83ef13241c103ae81593fefb72be3b3187 SHA512 a469054850e7bc409d1f5e69f98d3d52337b4108f88aa0ed9fc9136c407e950be912b9c16aec452c010eee8ad77c3db3ce36035c83c0e143e9dacf79f006513c EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e EBUILD scotch-6.1.1.ebuild 4957 BLAKE2B 66fe678726e0d48fa2e0d4eaa2147accd72088629b9ff7a250e7d2893a513e201032e3092a84b12b4150f6ef5005f5f6602fcd69bd57ef14e4bf56791c2db7b8 SHA512 c02acd26fa18fba7d8b04a4bb38e0b51b920abbc629c71033e2e1edfd65ad95a893c5309d96d90b660a58afa311aed898e7001a9767374452ec7d497299a2a5b diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild deleted file mode 100644 index aba2e29dcc6b..000000000000 --- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit epatch toolchain-funcs versionator flag-o-matic multilib - -# use esmumps version to allow linking with mumps -MYP="${PN}_${PV}_esmumps" -# download id on gforge changes every release(!) -DID=34618 -SOVER=$(get_major_version) - -DESCRIPTION="Software for graph, mesh and hypergraph partitioning" -HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/" -SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz" -S="${WORKDIR}/${P/-/_}" - -LICENSE="CeCILL-2" -SLOT="0/${SOVER}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc int64 mpi static-libs test tools threads" -# bug #532620 -REQUIRED_USE="test? ( threads )" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-libs/zlib - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -static_to_shared() { - local libstatic=${1}; shift - local libname=$(basename ${libstatic%.a}) - local soname=${libname}$(get_libname ${SOVER}) - local libdir=$(dirname ${libstatic}) - - einfo "Making ${soname} from ${libstatic}" - if [[ ${CHOST} == *-darwin* ]] ; then - ${LINK:-$(tc-getCC)} ${LDFLAGS} \ - -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \ - -Wl,-all_load -Wl,${libstatic} \ - "$@" -o ${libdir}/${soname} || die "${soname} failed" - else - ${LINK:-$(tc-getCC)} ${LDFLAGS} \ - -shared -Wl,-soname=${soname} \ - -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \ - "$@" -o ${libdir}/${soname} || die "${soname} failed" - [[ $(get_version_component_count) -gt 1 ]] && \ - ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version)) - ln -s ${soname} ${libdir}/${libname}$(get_libname) - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-as-needed.patch - epatch "${FILESDIR}"/${P}-flex-2.6.3-fix.patch - use int64 && append-cflags -DIDXSIZE64 - if use threads; then - append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)" - else - append-cflags "-DSCOTCH_PTHREAD_NUMBER=1" - sed -i \ - -e 's/ -DSCOTCH_PTHREAD//' \ - src/Make.inc/Makefile.inc.i686_pc_linux3 || die - fi - - # Be careful with replacing here, bug #577272 - sed -e "s/= gcc$/= $(tc-getCC)/" \ - -e "s/-O3/${CFLAGS} -pthread/" \ - -e "s/= ar$/= $(tc-getAR)/" \ - -e "s/= ranlib$/= $(tc-getRANLIB)/" \ - -e "s/LDFLAGS/LIBS/" \ - src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die -} - -src_compile() { - emake -C src CLIBFLAGS=-fPIC scotch esmumps - static_to_shared lib/libscotcherr.a - static_to_shared lib/libscotcherrexit.a - static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr - static_to_shared lib/libesmumps.a -Llib -lscotch - static_to_shared lib/libscotchmetis.a -Llib -lscotch - - if use mpi; then - emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps - export LINK=mpicc - static_to_shared lib/libptscotcherr.a - static_to_shared lib/libptscotcherrexit.a - static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt - static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch - static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch - fi - if use static-libs; then - emake -C src clean - emake -C src - use mpi && emake -C src ptscotch - fi -} - -src_test() { - LD_LIBRARY_PATH="${S}/lib" emake -C src check -} - -src_install() { - dolib.so lib/lib*$(get_libname)* - use static-libs && dolib.a lib/*.a - - #install metis headers into a subdir - #to allow usage of real metis and scotch - #in the same code - insinto /usr/include/scotch/metis - doins include/*metis* - rm include/*metis* - insinto /usr/include/scotch - doins include/* - - cat <<-EOF > scotchmetis.pc - prefix=${EPREFIX}/usr - libdir=\${prefix}/$(get_libdir) - includedir=\${prefix}/include - Name: scotchmetis - Description: ${DESCRIPTION} - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch - Private: -lm -lz -lrt - Cflags: -I\${includedir}/scotch/metis - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins scotchmetis.pc - - # not sure it is actually a full replacement of metis - #alternatives_for metis scotch 0 \ - # /usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc - - if use mpi; then - cat <<-EOF > ptscotchparmetis.pc - prefix=${EPREFIX}/usr - libdir=\${prefix}/$(get_libdir) - includedir=\${prefix}/include - Name: ptscotchparmetis - Description: ${DESCRIPTION} - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch - Private: -lm -lz -lrt - Cflags: -I\${includedir}/scotch/metis - Requires: scotchmetis - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins ptscotchparmetis.pc - # not sure it is actually a full replacement of parmetis - #alternatives_for metis-mpi ptscotch 0 \ - # /usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc - fi - - dodoc README.txt - - if use tools; then - local b m - pushd bin > /dev/null - for b in *; do - newbin ${b} scotch_${b} - done - popd > /dev/null - - pushd man/man1 > /dev/null - for m in *; do - newman ${m} scotch_${m} - done - popd > /dev/null - fi - - use doc && dodoc doc/*.pdf -} diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest index 3dc7305e282d..267e3d658817 100644 --- a/sci-libs/superlu_mt/Manifest +++ b/sci-libs/superlu_mt/Manifest @@ -1,6 +1,5 @@ AUX superlu_mt-3.1-duplicate-symbols.patch 7284 BLAKE2B 6402f745b280c02dfb4b0fadee120c9def38819d01c5e00406f68a812a06f3d86d4ac0ee799e3abe7b081737d2566bfb6ad981f7768ac29b3a2ad0b0bc147ee1 SHA512 b233677071ce175116454614b6289faa80f60ef0dfeee728bc4a1a7603ce8490c93e63ba635d1db231c92a055dee5cdbeff2793a2e138fa688efc18bd72b693f AUX superlu_mt-3.1-fix-predefs.patch 606 BLAKE2B e372ddc40a61c09203a439e28becb91e720909f481212b2dda2a9dfe9a924aa218b2c34e066f9d9617a84c7d1cc3658f1bc09d9bd2d8415be47d374d7946d8c6 SHA512 8242236118033bcd9b4fb0562f2820c2d42d72c887d2124cdd9a224e2946266371b3fe3f6717a46b89e2af35ad76facd22dc75e931ece804df2deda7d5926810 DIST superlu_mt_3.1.tar.gz 1824440 BLAKE2B 6355c624eca13a6ad7fa0e6100b3a548215d93aafc5958b9a0e693b3333006e4b1e98facddf352f62ef1632c8528cb39a85ca15509abf046d32f8d97335749c5 SHA512 41b8d9808f6a9c3f8d9e983ab253b0c5aec486df1cc419d043a201bd950034fa4bdd5465410e1198a2314d072b92cb388fc117165a06f820922f04060c755971 -EBUILD superlu_mt-3.1-r1.ebuild 2612 BLAKE2B d030a830b2ae86401dea2ac65135d8c3412aac933c922698772523d00a2eaa80e65c6c76793506115d1fa6722e7a45c23a363e1767c33ecd538d3f262b27baec SHA512 c1e617c05748626fe998dcd7151a2156e5f1e5d77ad7d2e3574c7126b58c094ee5a739ae04f8010afc556e5f52391bf84240335fa0e1bb32a6a17c09fde04f48 -EBUILD superlu_mt-3.1.ebuild 2560 BLAKE2B 3361cc3649f14163ab64825def63f8c51fc38b90155c0f6ab59b9db301f9e5caa2383701b625d480ecc82d21cb87dc1f75d07a9ca2e1df0355ce0a04eaa0811d SHA512 95a807ed73442f5cf7d11640f1b0d2d808c68745b00d95a962b4f63947e2d272db68d765575a51d81fb36f0581d02fabc0a3396c97d3ee44a751651f19576add +EBUILD superlu_mt-3.1-r1.ebuild 2611 BLAKE2B 824d313c659e08572febb2b414e76ce9b92685af597401264fc2d1ef11a5331546f9928f466925c445047c318657ee8ab9abf08ce707579e113aa7b1e33c2980 SHA512 f71a15f038b44ed53d500380ddbbcfd04478113f5be0243e692474fcad94c7f816c4d34106b9f1adb16668c801e0b429ca65dc7a53ab9ad7e20498ab0a5dd36a MISC metadata.xml 1472 BLAKE2B 75500639996e0b9e541913a3e8c65b094f38e79615e8cc07cb99c6b889259458c0cff14414004452fe320034bb7c442efa112b9eab75a853890a0c780b4850b8 SHA512 914c5f3d6e8e00e678db0c266278971a7586f7ddc06441954c6b31c272efb2e45fce7e5d93017fdee3075337a0b01f653d4d1854fc028a8e850f448ba729d969 diff --git a/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild index a37f5a808568..631f199b5ca3 100644 --- a/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild +++ b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI="https://portal.nersc.gov/project/sparse/superlu/${PN}_${PV}.tar.gz" LICENSE="BSD" SLOT="0/${SOVERSION}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples int64 openmp static-libs test threads" RESTRICT="!test? ( test )" REQUIRED_USE="|| ( openmp threads )" diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild deleted file mode 100644 index eab8a2ad999d..000000000000 --- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_PN=SuperLU_MT -SOVERSION=$(ver_cut 1) - -DESCRIPTION="Multithreaded sparse LU factorization library" -HOMEPAGE="https://portal.nersc.gov/project/sparse/superlu/" -SRC_URI="https://portal.nersc.gov/project/sparse/superlu/${PN}_${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/${SOVERSION}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples int64 openmp static-libs test threads" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( openmp threads )" - -RDEPEND="virtual/blas" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - test? ( app-shells/tcsh )" - -S="${WORKDIR}/${MY_PN}_${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-3.1-duplicate-symbols.patch ) - -pkg_setup() { - if use openmp && ! use threads; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - CTHREADS="-D__OPENMP" - [[ $(tc-getCC) == *gcc ]] && LDTHREADS="-fopenmp" - else - CTHREADS="-D__PTHREAD" - LDTHREADS="-pthread" - fi -} - -src_prepare() { - default - cat <<-EOF > make.inc - CC=$(tc-getCC) - LOADER=$(tc-getCC) - ARCH=$(tc-getAR) - RANLIB=$(tc-getRANLIB) - PREDEFS=${CPPFLAGS} -DUSE_VENDOR_BLAS -DPRNTlevel=0 -DDEBUGlevel=0 $(use int64 && echo -D_LONGINT) - CDEFS=-DAdd_ - CFLAGS=${CFLAGS} ${CTHREADS} \$(PIC) - BLASLIB=$($(tc-getPKG_CONFIG) --libs blas) - MATHLIB=-lm - NOOPTS=-O0 \$(PIC) - ARCHFLAGS=cr - LOADOPTS=${LDFLAGS} ${LDTHREADS} - SUPERLULIB=lib${PN}.a - TMGLIB=libtmglib.a - EOF - SONAME=lib${PN}.so.${SOVERSION} - sed -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \ - -e '/:.*$(SUPERLULIB)/s|../lib/$(SUPERLULIB)||g' \ - -e 's|../lib/$(SUPERLULIB)|-lsuperlu_mt|g' \ - -i EXAMPLE/Makefile || die -} - -src_compile() { - # shared library - emake PIC="-fPIC" \ - ARCH="echo" \ - ARCHFLAGS="" \ - RANLIB="echo" \ - superlulib - $(tc-getCC) ${LDFLAGS} ${LDTHREADS} -shared -Wl,-soname=${SONAME} SRC/*.o \ - $($(tc-getPKG_CONFIG) --libs blas) -lm -o lib/${SONAME} || die - ln -s ${SONAME} lib/libsuperlu_mt.so || die - - use static-libs && rm -f SRC/*.o && \ - emake PIC="" superlulib -} - -src_test() { - emake -j1 tmglib - LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \ - emake SUPERLULIB="${SONAME}" testing -} - -src_install() { - dolib.so lib/*so* - use static-libs && dolib.a lib/*.a - insinto /usr/include/${PN} - doins SRC/*h - dodoc README - use doc && dodoc DOC/ug.pdf - if use examples; then - docinto /examples - dodoc -r EXAMPLE/* make.inc - fi -} |