diff options
Diffstat (limited to 'sci-libs')
40 files changed, 971 insertions, 231 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 10d1b1b39ad0..4a001bec7af1 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index 586d695b597c..180714201641 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1,6 +1,5 @@ -DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f SHA512 5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364 DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c SHA512 fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2 -EBUILD cartopy-0.19.0.ebuild 1833 BLAKE2B 97c1bc9e16e40c882a9236294dc06120aa668edd7c467d258276dd2e4486c4acb5c9ad2082ba6c371db70a3760049ad49be1c3d0dcab4f87bb59deabf651ab0a SHA512 35f5d1dce3a2ec606d6b5322329b3a5b8345a7e5ad2d57fb17d485b00193c847e014e96cb94e119d679414408a45530d823e4dc4b6e1ece77bd0ec13847cd086 +DIST cartopy-0.20.2.tar.gz 10703222 BLAKE2B 18763971b33704c526bc98dede60077382de1e6855bd5dcc8901d729b9400eb2a3fdb2e6e2bd9b705ad2d43ab089e4837f12b7dc465429f1cdede21f174f8ef4 SHA512 1208c11a4b6d4b01b7ed7459ced7d79b0b60abc7be0f88562aa0d3826ac6bcebfe51cdf68213fd668353f4c269eb2c10fc2bf15e9db0b4c5802f629b76be3761 EBUILD cartopy-0.20.1-r1.ebuild 1872 BLAKE2B 9794536c59aed5a8b2f28195e5425012b82b801d3b67ce7c8c6047e87ca7954f4919a27f2762be273c092e6f1eb69bbf6b55b3e761a8119e5936f17dc68b63e8 SHA512 169937284eee56144f265579af0f175710818dc7c08c2f8c95f7b397adbab4b6e1afaa5bdda72eeda7ad37528fb1c5f699e1690144486b1fdb4be81aeebfc05b -EBUILD cartopy-0.20.1.ebuild 1872 BLAKE2B 7e6ca0fe2c7f841b2ae0c3eec8b90a07f6d2425592a19d64355b877a22deb192508855ce4005e8a77e2de91f2ba03414d5085ff97510537564348f26acd8ddc3 SHA512 ec4e0f11ff96c2450f7e493364183388bf0dea8f3462b373b1aa0135b58ccd5390610d9b94eb3200cf54bcfc02403fe99e7eab51ba0137409acb2d5f6c941352 +EBUILD cartopy-0.20.2.ebuild 1872 BLAKE2B cef799e4228dad513310095d7dc658991fdd1b0ddab8b7ee7764b6444a7f271eac15c8ee3116a159e44654a8a7596c51b58bc08dc176d1788ab65217a280f92c SHA512 21940423ab40bc699355f920e82c1854b3bc97c2df8e13fc51325c73ba787578889befda6c7ca14ae589c3d076bc42d951b19b7878c0437944d3028db4f0d2df MISC metadata.xml 603 BLAKE2B dc4da38fb25d4785362faa8475edb2d3b44aa99c0ce3f3f21ee3c1812a385a715a0d18ece3d58b63e298f997fdebd4762f8395335042bbac6e6fc2aadefee695 SHA512 3fb87e6057c17a7430519fc5e434847cfe13bdf06fa4aab6ed3b6aefe574a078c8750915c65a9d1ed12cecc8c25353e1218aae69dbe0a9e661b9d7499994dea3 diff --git a/sci-libs/cartopy/cartopy-0.19.0.ebuild b/sci-libs/cartopy/cartopy-0.19.0.ebuild deleted file mode 100644 index 613c5da6a598..000000000000 --- a/sci-libs/cartopy/cartopy-0.19.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 virtualx - -MY_PV=${PV/_beta/b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Python package for geospatial data processing and analysis" -HOMEPAGE="https://scitools.org.uk/cartopy" -SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/pyshp[${PYTHON_USEDEP}] - sci-libs/shapely[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/pillow[jpeg,${PYTHON_USEDEP}] - sci-libs/gdal[python,${PYTHON_USEDEP}] -" - -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - sci-libs/geos - <sci-libs/proj-8 -" - -distutils_enable_tests pytest - -DEPEND+="test? ( - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/flufl-lock[$PYTHON_USEDEP] - )" - -S="${WORKDIR}"/${MY_P} - -python_prepare_all() { - # drop test file requiring network access, which got not covered by markers - rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die - rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.py || die - # prepare matplotlib backend for test suite - export MPLCONFIGDIR="${T}" - echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die - distutils-r1_python_prepare_all -} - -python_test() { - cd "${BUILD_DIR}" - # drop all tests needing network access - virtx pytest -vv -m "not network and not natural_earth" || die "test failed" -} diff --git a/sci-libs/cartopy/cartopy-0.20.1.ebuild b/sci-libs/cartopy/cartopy-0.20.2.ebuild index 1fa38c496b97..10493288f17e 100644 --- a/sci-libs/cartopy/cartopy-0.20.1.ebuild +++ b/sci-libs/cartopy/cartopy-0.20.2.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 @@ -23,6 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} + sci-libs/geos dev-python/numpy[${PYTHON_USEDEP}] sci-libs/pyshp[${PYTHON_USEDEP}] sci-libs/shapely[${PYTHON_USEDEP}] @@ -31,15 +32,14 @@ RDEPEND=" dev-python/scipy[${PYTHON_USEDEP}] dev-python/pillow[jpeg,${PYTHON_USEDEP}] sci-libs/gdal[python,${PYTHON_USEDEP}] + dev-python/pyproj[${PYTHON_USEDEP}] + >=sci-libs/proj-8 " DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}] dev-python/cython[${PYTHON_USEDEP}] - sci-libs/geos - >=sci-libs/proj-8 - dev-python/pyproj[${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/sci-libs/coinor-clp/Manifest b/sci-libs/coinor-clp/Manifest index 323a1b5030bc..3cdfd4a2fd15 100644 --- a/sci-libs/coinor-clp/Manifest +++ b/sci-libs/coinor-clp/Manifest @@ -1,3 +1,5 @@ +AUX coinor-clp-1.17.6-remove-extern-C-for-MPI.patch 441 BLAKE2B 7543b6447044a434f6f3feb295a480c45a4ed16237ad7f61e2b0116dc8816b7c8d70171a35fdeb4e24bbfd89d61fa685c3ae3b212e069a80f87ad6acbec9421d SHA512 267b76ac10ca934d866eb4e8886bc8afc6af2b8e9b678bb5a300787b51616e1eabb4f8814060344150bd09f585da67553122938f8a1294f1dfa3a1ecf63f5e5b DIST coinor-clp-1.17.6.tar.gz 2158530 BLAKE2B b1bf6ecfdf3669ff4393e31c23d24f9160124dcd69df611c96feaa73acf796bc3a13a54542a5d0495e9a68789e762f5392bd7f23c0fee20c0699df2d0b084891 SHA512 8a799d87ba988a27e3ba526ded65425979b4364e374db4e943f41a523f3743efb88a9964eb575c058151e47f58be6ba0ac1b368177f0322850be3704be6f24d1 +EBUILD coinor-clp-1.17.6-r1.ebuild 3840 BLAKE2B d2e2c907cfc17fc84cae28b290bbc9774d6f54fed8dd0a10143f8383f019590d98d6aeaee2567ccdab404e8d8111f443776864b6fa07a77a8a8ce55d069a42cc SHA512 beb36900e1278fe763ac28b59dac6b3be5a73b475f14114a39b1177a08efc09431fde0079de936d08a7cefeb7541dd47447a7460e6468b82e89e6161fc7992bf EBUILD coinor-clp-1.17.6.ebuild 3774 BLAKE2B 93ae581cc8b89606016253634ff6cbeb6b8c46f0bbb886c04bd4a015898bb288c65d5e927aed677cca29b74b323fe25ce48d29aa443f716e22f1777d7de63992 SHA512 9f6db4bda4db2491059cf27a6123bb811086eb10f4e2d2fe02b1ff1827c7390f7c2e578bd110a63570b992b5049b3e80906f3b0e7507017e7665d52a246aeeef MISC metadata.xml 1119 BLAKE2B 7ae4adff772310ffe91c494ae83fbcf4b4d10f9c4e26b2a23d86f1a0a67f1f8e0fdc9f66960a095f33226c9b35b9f444c13b4bd3901528d21c9facc77f8190a0 SHA512 0306dbb1ef75a40edebe00cf6a0f8c11dfcc9857cf922f8a625b4c400d7bf6372ffbd208dbd72dbbb8d86cc028b6d85a3d250676e36f8f87d523ff4b43db5371 diff --git a/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild new file mode 100644 index 000000000000..0017e5702100 --- /dev/null +++ b/sci-libs/coinor-clp/coinor-clp-1.17.6-r1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" +DOCS_DIR="doxydoc" +DOCS_CONFIG_NAME="doxygen.conf" +inherit docs toolchain-funcs + +MY_PN=Clp + +DESCRIPTION="COIN-OR linear programming solver" +HOMEPAGE="https://github.com/coin-or/Clp" +SRC_URI="https://github.com/coin-or/Clp/archive/releases/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}" + +LICENSE="EPL-1.0" +SLOT="0/1" # major soname component +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="examples glpk metis mpi mumps sparse static-libs test" +REQUIRED_USE="mpi? ( mumps )" +RESTRICT="!test? ( test )" + +# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR +# packages contain a check for it. Gentoo bug 601648 and upstream issue, +# +# https://github.com/coin-or/CoinUtils/issues/132 +# +BDEPEND=" + virtual/fortran + virtual/pkgconfig + test? ( sci-libs/coinor-sample ) +" +DEPEND=" + sci-libs/coinor-osi:= + sci-libs/coinor-utils:= + glpk? ( sci-mathematics/glpk:= sci-libs/amd ) + metis? ( sci-libs/metis ) + mumps? ( sci-libs/mumps[mpi?] ) + sparse? ( sci-libs/cholmod ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + # Needed to make the --with-coin-instdir in src_configure happy. + dodir /usr + + mumpslibs="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps" + + if use mumps; then + if use mpi; then + # https://github.com/coin-or/Clp/issues/199 + eapply "${FILESDIR}/${P}-remove-extern-C-for-MPI.patch" + export CXX=mpicxx + else + # The file ClpCholeskyMumps.cpp does #include "mpi.h", and we + # need to point it to the right file. Our sci-libs/mumps ebuild + # is so ridiculous that I can't even tell if this is our fault + # or if it's something that should be reported upstream. + ln -s "${EPREFIX}/usr/include/mpiseq/mpi.h" src/mpi.h || die + mumpslibs="${mumpslibs} -lmpiseq" + fi + fi + + # They don't need to guess at this, but they do, and get it wrong... + sed -e "s|lib/pkgconfig|$(get_libdir)/pkgconfig|g" \ + -i configure \ + || die "failed to fix the pkgconfig path in ${S}/configure" + + default +} + +src_configure() { + # The --enable-aboca flag is temporarily disabled, because the build + # is broken with it (see https://github.com/coin-or/Clp/issues/139). + # There's a fix, but I'm not going to bother with a patch for an + # an experimental feature. + local myeconfargs=( + --enable-dependency-linking + --with-coin-instdir="${ED}"/usr + $(use_with doc dot) + ) + if use glpk; then + myeconfargs+=( + --with-amd-incdir="${EPREFIX}"/usr/include + --with-amd-lib=-lamd + --with-glpk-incdir="${EPREFIX}"/usr/include + --with-glpk-lib=-lglpk + ) + else + myeconfargs+=( --without-glpk ) + fi + if use sparse; then + myeconfargs+=( + --with-amd-incdir="${EPREFIX}"/usr/include + --with-amd-lib=-lamd + --with-cholmod-incdir="${EPREFIX}"/usr/include + --with-cholmod-lib=-lcholmod + ) + else + myeconfargs+=( --without-amd --without-cholmod ) + fi + if use metis; then + myeconfargs+=( + --with-metis-incdir="$($(tc-getPKG_CONFIG) --cflags metis | sed s/-I//)" + --with-metis-lib="$($(tc-getPKG_CONFIG) --libs metis)" + ) + else + myeconfargs+=( --without-metis ) + fi + if use mumps; then + myeconfargs+=( + --with-mumps-incdir="${EPREFIX}"/usr/include + --with-mumps-lib="$mumpslibs" + ) + else + myeconfargs+=( --without-mumps ) + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake all + docs_compile +} + +src_test() { + # NOT redundant! The build system has a "make check" target that does + # nothing, so if you don't specify "test" here, you'll get a no-op. + emake test +} + +src_install() { + emake DESTDIR="${ED}" install + einstalldocs + + # Duplicate junk, and in the wrong location. + rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die + + use examples && dodoc -r examples + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/coinor-clp/files/coinor-clp-1.17.6-remove-extern-C-for-MPI.patch b/sci-libs/coinor-clp/files/coinor-clp-1.17.6-remove-extern-C-for-MPI.patch new file mode 100644 index 000000000000..04e5c731a241 --- /dev/null +++ b/sci-libs/coinor-clp/files/coinor-clp-1.17.6-remove-extern-C-for-MPI.patch @@ -0,0 +1,18 @@ +--- a/src/ClpCholeskyMumps.cpp ++++ b/src/ClpCholeskyMumps.cpp +@@ -11,7 +11,6 @@ + #define JOB_INIT -1 + #define JOB_END -2 + #define USE_COMM_WORLD -987654 +-extern "C" { + #include "dmumps_c.h" + // In newer ThirdParty/Mumps, mpi.h is renamed to mumps_mpi.h. + // We get informed about this by having COIN_USE_MUMPS_MPI_H defined. +@@ -20,7 +19,6 @@ + #else + #include "mpi.h" + #endif +-} + + #include "ClpCholeskyMumps.hpp" + #include "ClpMessage.hpp" diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest index 27ef000b49c0..f76e4aff6141 100644 --- a/sci-libs/gmsh/Manifest +++ b/sci-libs/gmsh/Manifest @@ -1,4 +1,3 @@ -AUX gmsh-4.8.4-gcc11.patch 2821 BLAKE2B 21977c525d2359cddcc7dd189a8aa5fa74acb9bd9badd9accac7a7e8334311f4f2c007079c5580118e2f991d802af3ce4d54c93a8e9ada76dc5b41279cdfc848 SHA512 fdeced297f2188461d0d61bafdeb4bf0c2663a7d7cda9cc4aa61f4211173243cb7e6ea68f8db15ed45422a4d0914d628231060f6a3f30251765da768975b0f5b DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880 SHA512 4da61bdf03fb9466af80ac790e83c8888bab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484 -EBUILD gmsh-4.9.5-r1.ebuild 1842 BLAKE2B 416dc95a9ed6ee4d5331892198ce4fb429e20b8b051c12c879f7597cbc6695751a0e2b0ef3b5f6cb958a9c60530c00bcde8d363120a812ef96c93e69b2c93050 SHA512 47d4b689560a18b99eeebb6cf966012ba14df6436b6b6c6def839a1a0e5c7a787a7aa0880391f5bfae4e84c24b8b2def701a64d55d87be11f8a06b43d052cf76 +EBUILD gmsh-4.9.5-r1.ebuild 1839 BLAKE2B 410b50fbde4f16a87bf96c61a2971b43a8361e066755eefde825767a4766a7d37496a961a340ece6747f84ba50d8c93dd7c7308930782dc4d2931e00ab345c8d SHA512 d7aa4fb98209e3f1f447be4656148faa11c4dca0e0797defc7ca4ec86bde4140fd473d2d0449f1a6df15ee4a8c88ae002b58e16fbda3adbac1ecf1fae3f52bf4 MISC metadata.xml 802 BLAKE2B 5ddd7f70af792e529ca9b5197b80775cea3390fdb04fdc65df5e43333aac0ac3f1d5f2fc16c32c5eb5336f3ec12ad4b2fefd6b055a3f2361f42a2bd77aa83b47 SHA512 08356d610e96e262c6d2b49647835e8dfc96ebb7efa3b9c078f5d930c83eb23211c9b61bd57fdcdbc067d957b47ab0c8c650b15169fa40c3a8da5aab8b325666 diff --git a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch deleted file mode 100644 index 3f16ef476d7f..000000000000 --- a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch +++ /dev/null @@ -1,80 +0,0 @@ -https://gitlab.onelab.info/gmsh/gmsh/-/commit/e7cd675083f72c6c01701cb0f16d1639aca121ba -https://bugs.gentoo.org/800536 - -From: Tristan Carel <tristan.carel@epfl.ch> -Date: Wed, 28 Jul 2021 10:55:40 +0200 -Subject: [PATCH] Fix symbol conflict in picojson with GCC 11 internal macro - -Build issue on MacOS with GCC 11 from brew: -``` -/usr/local/Cellar/gcc/11.1.0_1/lib/gcc/11/gcc/x86_64-apple-darwin20/11.1.0/include/serializeintrin.h:37: note: macro "_serialize" defined here - 37 | #define _serialize() __builtin_ia32_serialize () - | -``` ---- a/Common/picojson.h -+++ b/Common/picojson.h -@@ -186,8 +186,8 @@ public: - private: - template <typename T> value(const T *); // intentionally defined to block implicit conversion of pointer to bool - template <typename Iter> static void _indent(Iter os, int indent); -- template <typename Iter> void _serialize(Iter os, int indent) const; -- std::string _serialize(int indent) const; -+ template <typename Iter> void serialize_(Iter os, int indent) const; -+ std::string serialize_(int indent) const; - void clear(); - }; - -@@ -549,11 +549,11 @@ template <typename Iter> void serialize_str(const std::string &s, Iter oi) { - } - - template <typename Iter> void value::serialize(Iter oi, bool prettify) const { -- return _serialize(oi, prettify ? 0 : -1); -+ return serialize_(oi, prettify ? 0 : -1); - } - - inline std::string value::serialize(bool prettify) const { -- return _serialize(prettify ? 0 : -1); -+ return serialize_(prettify ? 0 : -1); - } - - template <typename Iter> void value::_indent(Iter oi, int indent) { -@@ -563,7 +563,7 @@ template <typename Iter> void value::_indent(Iter oi, int indent) { - } - } - --template <typename Iter> void value::_serialize(Iter oi, int indent) const { -+template <typename Iter> void value::serialize_(Iter oi, int indent) const { - switch (type_) { - case string_type: - serialize_str(*u_.string_, oi); -@@ -580,7 +580,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const { - if (indent != -1) { - _indent(oi, indent); - } -- i->_serialize(oi, indent); -+ i->serialize_(oi, indent); - } - if (indent != -1) { - --indent; -@@ -608,7 +608,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const { - if (indent != -1) { - *oi++ = ' '; - } -- i->second._serialize(oi, indent); -+ i->second.serialize_(oi, indent); - } - if (indent != -1) { - --indent; -@@ -628,9 +628,9 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const { - } - } - --inline std::string value::_serialize(int indent) const { -+inline std::string value::serialize_(int indent) const { - std::string s; -- _serialize(std::back_inserter(s), indent); -+ serialize_(std::back_inserter(s), indent); - return s; - } - -GitLab diff --git a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild index af13e7d74515..902c8379230d 100644 --- a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild +++ b/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake fortran-2 python-any-r1 toolchain-funcs diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 555689253634..16b8d70fdbb8 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,6 +1,8 @@ AUX indilib-1.9.4-musl-stdint.patch 3712 BLAKE2B 6642d8dc96779aaba01cccbb4ef5f2ab280ce4f9d8076c244d52d085545679c56b8aa0490fb331617becd4ba2eed62aa1a8bd1f9f3bae9b94b145b5148dd7748 SHA512 31b9d57b2353e5876da74048839e3b94f35c087d38834429dd6955045ae64f8c7cbc6f8f3f5e6f7441044cc5b80655eec8476726cf10f5de0e1d6a07c4a4d2fb DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44 DIST indilib-1.9.4.tar.gz 2370816 BLAKE2B 4df98abfaecdfe226d889e063928d3d5a09f9141b7bbeb2798da8190f874d0137313ff05b9c524a645440298d79655f9627ac611ae3132ee30f902e46d2db34d SHA512 2331d49545cfeb5904529f74b52ba0454c81066cb644e158e159a8f3597269d6d48bb1a608162771108c30f2fdb7e21fc5c1078b152f0e2a640f2e10ad3f9142 +DIST indilib-1.9.5.1.tar.gz 2420537 BLAKE2B 1be0f19a92cfb9d36ba88fc51adf55f5c39743efc4da352d1f11f4eb9e8a82c0624d29de1032a0b2a0a96babb13b33e225ef453ef92d091c695cc0a62642900c SHA512 80e764eff9ce40754bd1ba3dc8a49714aeccb3fc2d2e623f50dff25d7bcef9f9744b48fa052c60a94105677479a1629cc80f452002e1e00fc9f6549c1809df65 EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468 EBUILD indilib-1.9.4.ebuild 1596 BLAKE2B 1a9be2d46147a85a30c01c96d12325e45a3713e1a7e212937564826222d2244052cdbc440cde002ee930d3c494c36f6aa7a2c1ef41df674293d562363e900882 SHA512 b3a896bc74c205043377901bb660f9852fa348e9637df0c3175c6174ea35d8cca6c817c325491473518b3a751ff11fe7f804df4765132f09466129b055bbd3f2 +EBUILD indilib-1.9.5.1.ebuild 1541 BLAKE2B 2eb032352d2c0de268a872be07553bbc1189b35f6da14eb019aa3b3b501b351b1cbe97ab8e3b72e80039464dd3e0705adb3bd9de037b2eaf1ef7dca4d1955c0f SHA512 f9c8bc335a4289332adbfc83c5aa7a1beb8830895210d470cb0af3d0f67ea07aed8c3fe8674294906d6faac0996c653f5e5937190dbd2a14249ca4e43ac9ed27 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f diff --git a/sci-libs/indilib/indilib-1.9.5.1.ebuild b/sci-libs/indilib/indilib-1.9.5.1.ebuild new file mode 100644 index 000000000000..b6d000763a3b --- /dev/null +++ b/sci-libs/indilib/indilib-1.9.5.1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev + +DESCRIPTION="INDI Astronomical Control Protocol library" +HOMEPAGE="https://www.indilib.org/" +SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/lib/}" + +LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" +SLOT="0/1" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="ogg rtlsdr test websocket" + +RESTRICT="!test? ( test )" + +RDEPEND=" + net-misc/curl + sci-libs/cfitsio:= + sci-libs/fftw:3.0= + sci-libs/gsl:= + sci-libs/libnova:= + sys-libs/zlib + virtual/jpeg:0 + virtual/libusb:0 + ogg? ( + media-libs/libogg + media-libs/libtheora + ) + rtlsdr? ( net-wireless/rtl-sdr ) + websocket? ( dev-libs/boost:= ) +" +DEPEND="${RDEPEND} + kernel_linux? ( sys-kernel/linux-headers ) + test? ( >=dev-cpp/gtest-1.8.0 ) + websocket? ( dev-cpp/websocketpp ) +" + +src_configure() { + local mycmakeargs=( + -DINDI_BUILD_QT5_CLIENT=OFF + -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d + $(cmake_use_find_package ogg OggTheora) + $(cmake_use_find_package rtlsdr RTLSDR) + -DINDI_BUILD_UNITTESTS=$(usex test) + -DINDI_BUILD_WEBSOCKET=$(usex websocket) + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=() + + if use ppc || use ppc64 || use sparc ; then + # Broken on big endian for quite some time. + # Reported upstream: file needs to be replaced w/ a normal library + # for b64. + # bug #763126 + myctestargs+=( + -E "(test_base64)" + ) + fi + + BUILD_DIR="${BUILD_DIR}"/test cmake_src_test +} diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index de96a4a63e0d..87707425025e 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,5 +1,7 @@ DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614 DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9 +DIST libqalculate-4.1.1.tar.gz 2172017 BLAKE2B e9dcc22ad2d102572610ddc103afc5a279cf4f63681750c6165dac40225c7e29ebb4ccdc4f54cb97031ca8684ef17e08e99478c6b200870c7858e832a7588f18 SHA512 7a0f2fac6c96247b40565bdd015f8b52dc250fa74a8d8ed4a52a6f2134fb2b628e469c0253723f22b433a8f575590a28be8c0d4aa6cfb473b58f1b2c63707956 EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6 -EBUILD libqalculate-3.22.0.ebuild 1775 BLAKE2B fed1cac3f14df25762147a2084dd5d22c567c0088ed3d2d81a19c3923359cfdc0a774758484fdfa3ee97f2a49fd1a682d63da6a4eb2168deb7defb49766e4bb2 SHA512 cc9ca2da917e0d1cd029795dfaf73fa5ee5d89a9eb5de589bc3dc57967b0cc6f966932aa8d315d610e87cfb1280a72cef46e2264ce29c0b6de3be741d4328b8d +EBUILD libqalculate-3.22.0.ebuild 1774 BLAKE2B 6722314fab7a62696124df0e3813b9d3f4309900c34dff7ef30dee9b0184e8cab34131ca45d3b26bb7137d53b5761347c1e80efd5fa1f2cc6294c6ea2bea49f4 SHA512 7a14d2b32fd478eb11a597a08bb7c7e9a5f0035c94ab7b2b5b36f3a0086807d4b4c6e844a91c8176ddf8cb2be574d031c54c8cc652ead9ad2c9d25e441a67e23 +EBUILD libqalculate-4.1.1.ebuild 1774 BLAKE2B 23f655bbecef591ab2fe8b12c0c4590c5e5bbe9465e7813207561fb8b94d4a042fd9901304e12ab324bbcfdc046ac3e5682d04224eed57e88046e6193058b5dc SHA512 2c45e268d85005c089d34c2f5e6dd76c44b182ceeca3d3a0267fb739cc721d9d49471362fa119d65a8e2e13daadc439273caf2a7e4017a2f02ebb94fa89576f8 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 2fc02de1fe5a..545711dca10d 100644 --- a/sci-libs/libqalculate/libqalculate-3.22.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild @@ -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/libqalculate/libqalculate-4.1.1.ebuild b/sci-libs/libqalculate/libqalculate-4.1.1.ebuild new file mode 100644 index 000000000000..793186d66e2e --- /dev/null +++ b/sci-libs/libqalculate/libqalculate-4.1.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bump with sci-calculators/qalculate-gtk! + +inherit toolchain-funcs + +DESCRIPTION="A modern multi-purpose calculator library" +HOMEPAGE="https://qalculate.github.io/" +SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +# 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" +IUSE="curl icu gnuplot readline test" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/gmp:= + dev-libs/libxml2:2 + dev-libs/mpfr:= + virtual/libiconv + curl? ( net-misc/curl ) + icu? ( dev-libs/icu:= ) + readline? ( sys-libs/readline:= )" +RDEPEND="${DEPEND} + gnuplot? ( >=sci-visualization/gnuplot-3.7 )" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + cat >po/POTFILES.skip <<-EOF || die + # Required by make check + data/currencies.xml.in + data/datasets.xml.in + data/elements.xml.in + data/functions.xml.in + data/planets.xml.in + data/prefixes.xml.in + data/units.xml.in + data/variables.xml.in + src/defs2doc.cc + EOF +} + +src_configure() { + # Needed for po-defs/Makefile + export CXX_FOR_BUILD="$(tc-getBUILD_CXX)" + export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E" + + # bug #792027 + tc-export CC + + econf \ + $(use_enable test tests) \ + $(use_enable test unittests) \ + $(use_with curl libcurl) \ + $(use_with gnuplot gnuplot-call) \ + $(use_with icu) \ + $(use_with readline) +} + +src_install() { + # docs/reference/Makefile.am -> referencedir= + emake \ + DESTDIR="${D}" \ + referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ + install + + einstalldocs + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest index d9c1675d7015..e2e8b64076ee 100644 --- a/sci-libs/med/Manifest +++ b/sci-libs/med/Manifest @@ -2,5 +2,5 @@ AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412 AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263 AUX med-4.1.0-0003-build-against-hdf5-1.12.patch 4749 BLAKE2B 3a606c27bce6130e83989dd4e16733ced50da0ef21dd40226ffb6f64abbd5f2eca2174f971b4bbf3204df0e6040b86706c007dbf6b821a5bb287b648078d9113 SHA512 ba2fa24e3aeb2be6fa1e7365d7ac57c9ebd8706dd19de7dba67507baafe1f48b7b00051169f27164b4a9e749816220619490d5f0796a0c02f25644569b26f366 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8 -EBUILD med-4.1.0.ebuild 3342 BLAKE2B fde2ce1741442e953a4d141a58b71226cf9e209d7b2941cbb859144dffcf3895740a1aa3b664738b6d0f34a6d450ea2a6f4c87258af557324c21daa694ce1c23 SHA512 8db224906fee79e35308b0445e450e239d34f73717370da0db6bfeb22084b5a99fc4b8fbd6c11fc1cb49352d088aaf74752a8e9b304a63286330d2b9491ee95c +EBUILD med-4.1.0.ebuild 3341 BLAKE2B 8228252546d19d0e40db39d95c64f369249bc613b329f2f3e0f1abdc40a1562313330b0d4a5cd3d8aa9b4c6945a12eb783835940f67bc3d28d3b8ae6bf15c65c SHA512 498fcb9efafb20912faac9ca627aa6c2ac16bc288d2043043ead1c5a479f23142001f02d71b9e7a5e796f0536bbc2d2273624e7d7c95845cb7e54f6b95a23474 MISC metadata.xml 636 BLAKE2B de5e1c1d3f715459d5ca0945d0d795c1c549e6e20c27283140190bdc24289f4ccc0c12940e00aa689b90fd9af53749f0eabab44cecaf6815ef37adc1795f43e9 SHA512 60a3c3afd0db34569993b73d795830d86eb51778f9a7f0375d0b196c6f0862ca10a77c4c33ad2c906c56c6715be6f4452b61ffab5a25c254e480e50b64c021e4 diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild index ec6eef42dc1e..28173589f16e 100644 --- a/sci-libs/med/med-4.1.0.ebuild +++ b/sci-libs/med/med-4.1.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=7 @@ -15,7 +15,7 @@ SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc fortran mpi python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test ) python? ( test )" diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index c197bb27d979..6fcc4a1563c9 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -5,8 +5,14 @@ AUX rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch 1254 BLAKE2B d3bcf526f374065ed0 AUX rocBLAS-4.3.0-link-system-blas.patch 1106 BLAKE2B 83f525072dc34edec01c56353d8c87f0f967c9cf07d054da8c1f4af632e095cd2af9562dea8eab8a2ddc7a71a9570e654b4a6b0f68c95508e92cc743350c8129 SHA512 94efab3d507fc90bd0d0b2cd0096e68b7669d1de2faf73fe0bfbc8c26c83db88596664bd61f394863194ad3108985b6206c4408c6d2ec93cd30ccec13b3b37f1 AUX rocBLAS-4.3.0-remove-problematic-test-suites.patch 2240 BLAKE2B bdaf0111083e62f15d907b3faa536b1418a7273b3733386c14625ffed4c505b7d6a2318ae24a0dda286d57d4dac6befefa8005ef58452a9eb3928b78d337e214 SHA512 565d29c193ed04d45dc179ce06bbbdb0d472d66fe989286f4ccf29ccce39c118d79225ca80d2dbcb022833347b87e7573a78dc573dfde73d368e62256526eb93 AUX rocBLAS-4.3.0-unbundle-Tensile.patch 863 BLAKE2B 223d7b54d61111443c9f90d66a2d53bc85414094a2b9c571d2e6fafc0d1260befb0783d6c761d4df0b22c31a4e85a029f5eed5d9d455488207791fdaa1c69952 SHA512 40e7cc604139b419b9a77ad1005a8bbfd1134909f2e0be67579dcc958d49c8239b1b7f573741c9ff04e310977fafbd2edce5b58f4bc4bffb2cd003e7fbab7437 +AUX rocBLAS-5.0.2-change-default-Tensile-library-dir.patch 2070 BLAKE2B b90c31653c68583432f54c3a17067a92e7fd91e66f902f37e96a7a413b885de57820b93c5a98458b1d6f4b4283138dac274ece1ec97f3fc0dd3ea00ce6002542 SHA512 946f9d66ac703628829ff585890ea9eae71f441e10bb1ff21f8dfad9a5d73279ed4880c4b96ac662be76af10ebe63ccbe0ef9f2c55fb2ebfc5c9087f32119b2a +AUX rocBLAS-5.0.2-cpp_lib_filesystem.patch 1546 BLAKE2B e9a794a87b76a41d059c755565ae5da9a361b0c4648a92dd5ce35f9b5bd8c743827fcf79752c393a786c30083cd7db59bc334599d414920ce72c24216d014124 SHA512 e80ac744ce44bc9023de2600290c37577bda6161bfe750ac2b746d8fea7b45334a96461baa74131d0e31db497f8dd123ccd5dc181a40b265c2e2c72e1e479e88 +AUX rocBLAS-5.0.2-unbundle-Tensile.patch 1352 BLAKE2B 48300030abee9898397919cbbea187fd16d770e20cdcfddd7665c160f47e362ad63acf9f443f86d824a999398d0c6f5aee8295a963dce2653bc94518c8ac9674 SHA512 39c4aff4fc60692e0450aa844ce979afe031c3ba3adb0cdf0866d0766714bf28a4c5664c18de7520b63d3fc2864de51939a596e864e97d0b8935681cabd7a84d +DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fccf1f8829ad41baf15ad31bbbb313b48825841834c7ec1b9f8ece794aebdf9fda42b54a38f642beb1bc1e374f2f3b4e43d8ba9dfd1eb6e3ece5 SHA512 8f6946cf9d68afd195640ae7e0da8dc33341c67f28813813b5361a56531fa2af4453d075703ea52c66d93a1936cf74688b86aa2fa62b52a7ed5f03272290c232 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47 DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e18c38e088a8b7db58156d478dd6718befbb82bb7fd43a38fe64a5427124c5ad5241fa37977f094e6efd195d168d3e5f65 SHA512 490ab1c1e98a8b311ad5630515c448d9bb0a2bf588a08bcbebee345e2954d616b4ffe7c2e03dadca82c590438c42afccb98fe8ba00856aece101b5ffe62ef1e0 +DIST rocm-rocBLAS-5.0.2.tar.gz 13295178 BLAKE2B e1abfa06b9ac1545732465857839dae3f3708af49439a306a2b5b1b1b392101c38c95815f2c05a0d9ed29d41b154bc2e16a4f9203a37f5e2f68ee12cc4b44a06 SHA512 2f4a74f49350ede0debcf32229a6b6b95505615723c3f2bee16e4c169a3bb966dfb1971819028f47c525f571bea5662b892e63f655b0d1d2b8f20746bc5fe770 EBUILD rocBLAS-4.3.0-r1.ebuild 3897 BLAKE2B 3100406bc65c2292c5b444760bb73bff4804181405d1a174397191ea31f41e8ecebe050bb2bee060a5be344ea5e514c0acde028f8fc483879dbff8b504a69454 SHA512 aab616bb0662c7983c0edd25fb12d79687c9c5f9b6552ac758156b756e8d4db764c50dd6534c92f02be0ba7ff45904586976d0918626b3ebb0d791d38445ec70 EBUILD rocBLAS-4.3.0.ebuild 4226 BLAKE2B 0e4814b92bf97e230dee8ff54565ca718d2482d12e3f31d194e6321a55b064f3653059dfef623d665ac5d25fadad20a8bca81ace83980c3ee8f5e62cb5c4cd24 SHA512 06528ef0cf5767ed0b9bc58794cddebfc7e247091ff78c4e0e8eeb8f75ed3cdfd5443044671837f9573cf0e576d8006ef6a7c1a96786f5d4a8f06657c5b6308c +EBUILD rocBLAS-5.0.2.ebuild 3732 BLAKE2B 75d6f4aad5aef0d4db271782f6b80a95c9a99404370e92a681e676810d00f904446fa161b0d101dd9823346b00307e1c50fb43d8d1c17f0a9a6a373fefd0fe0d SHA512 87210ab8f9eb45bcdacf4be4864e2b4dc3f55327f97190a08355250f1e21ffa23303f462d2428ce473b2a646c9595566f14bf3c0474b90b975ffdce9bcb2eecd MISC metadata.xml 654 BLAKE2B b8a1d40e2ccc2aadccb9a1200e9c78fccb37544fa01c353645372a4ed01a6d153c04ff5d0d96cd7661e80b09eb6c69e8cbc59e466fef117ea1ad5ef54b1334ae SHA512 b880f8f495aee8c337b7cac4054a30f877a1204d0cda03fa90aaa25e4ae163d435c113141f2afef62967f603dea372419b228655e1b26fff53c010c8efdcebf1 diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-change-default-Tensile-library-dir.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-change-default-Tensile-library-dir.patch new file mode 100644 index 000000000000..618847b8fb8d --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-change-default-Tensile-library-dir.patch @@ -0,0 +1,47 @@ +change the default rocm tensile library search path +Index: rocBLAS-rocm-5.0.1/library/src/tensile_host.cpp +=================================================================== +--- rocBLAS-rocm-5.0.1.orig/library/src/tensile_host.cpp ++++ rocBLAS-rocm-5.0.1/library/src/tensile_host.cpp +@@ -558,40 +558,8 @@ namespace + // Find the location of librocblas.dll/.so + // Fall back on hard-coded path if static library or not found + +-#ifndef ROCBLAS_STATIC_LIB +-#ifdef WIN32 +- // wchar_t wpath[MAX_PATH + 1] = {0}; +- // if(GetModuleFileNameW(GetModuleHandle("rocblas.dll"), wpath, MAX_PATH + 1)) +- // { +- // std::wstring wspath(wpath); +- // std::string tmp(wspath.begin(), wspath.end()); + +- std::vector<TCHAR> dll_path(MAX_PATH + 1); +- if(GetModuleFileNameA( +- GetModuleHandleA("rocblas.dll"), dll_path.data(), MAX_PATH + 1)) +- { +- std::string tmp(dll_path.begin(), dll_path.end()); +- std::filesystem::path exepath = tmp; +- if(exepath.has_filename()) +- { +- path = exepath.remove_filename().string(); +- } +- } +-#else +- dl_iterate_phdr(rocblas_dl_iterate_phdr_callback, NULL); +- if(rocblas_so_path.size()) +- path = std::string{dirname(&rocblas_so_path[0])}; +-#endif +-#endif // ifndef ROCBLAS_STATIC_LIB +- +- // Find the location of the libraries +- if(TestPath(path + "/../../Tensile/library")) +- path += "/../../Tensile/library"; +- else +- path += "/library"; +- +- if(TestPath(path + "/" + processor)) +- path += "/" + processor; ++ path="@GENTOO_PORTAGE_EPREFIX@/usr/lib64/rocblas/library"; + } + + // only load modules for the current architecture diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-cpp_lib_filesystem.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-cpp_lib_filesystem.patch new file mode 100644 index 000000000000..500abbacfdc2 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-cpp_lib_filesystem.patch @@ -0,0 +1,50 @@ +--- b/clients/common/utility.cpp 2022-01-26 03:31:42.000000000 +0800 ++++ a/clients/common/utility.cpp 2022-02-22 18:45:35.319732953 +0800 +@@ -23,6 +23,7 @@ + #include <fcntl.h> + #endif + ++#include <version> + #ifdef __cpp_lib_filesystem + #include <filesystem> + #else +--- b/clients/include/rocblas_data.hpp 2022-01-26 03:31:42.000000000 +0800 ++++ a/clients/include/rocblas_data.hpp 2022-02-22 18:44:51.275733070 +0800 +@@ -17,6 +17,7 @@ + #include <string> + #include <utility> + ++#include<version> + #ifdef __cpp_lib_filesystem + #include <filesystem> + #else +--- b/clients/include/singletons.hpp 2022-01-26 03:31:42.000000000 +0800 ++++ a/clients/include/singletons.hpp 2022-02-22 18:47:55.139732583 +0800 +@@ -3,6 +3,6 @@ + * ************************************************************************ */ + + // global for device memory padding see d_vector.hpp ++#include<cstddef> +- + extern size_t g_DVEC_PAD; + void d_vector_set_pad_length(size_t pad); +--- b/clients/include/testing_logging.hpp 2022-01-26 03:31:42.000000000 +0800 ++++ a/clients/include/testing_logging.hpp 2022-02-22 18:44:13.115733171 +0800 +@@ -22,6 +22,7 @@ + #include <unistd.h> + #endif + ++#include<version> + #ifdef __cpp_lib_filesystem + #include <filesystem> + #else +--- b/clients/include/testing_ostream_threadsafety.hpp 2022-01-26 03:31:42.000000000 +0800 ++++ a/clients/include/testing_ostream_threadsafety.hpp 2022-02-22 18:45:19.055732996 +0800 +@@ -30,6 +30,7 @@ + #include <sys/types.h> + #endif + ++#include <version> + #ifdef __cpp_lib_filesystem + #include <filesystem> + #else diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-unbundle-Tensile.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-unbundle-Tensile.patch new file mode 100644 index 000000000000..75f673f63d47 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-unbundle-Tensile.patch @@ -0,0 +1,25 @@ +Index: rocBLAS-rocm-5.0.2/CMakeLists.txt +=================================================================== +--- rocBLAS-rocm-5.0.2.orig/CMakeLists.txt ++++ rocBLAS-rocm-5.0.2/CMakeLists.txt +@@ -271,20 +271,6 @@ if(NOT SKIP_LIBRARY) + set( Tensile_ROOT "${CMAKE_BINARY_DIR}/virtualenv/Lib/site-packages/Tensile" ) + endif() + +- include(virtualenv) +- if (Tensile_TEST_LOCAL_PATH) +- virtualenv_install(${Tensile_TEST_LOCAL_PATH}) +- message (STATUS "using local Tensile from ${Tensile_TEST_LOCAL_PATH}, copied to ${Tensile_ROOT}") +- else() +- # Use the virtual-env setup and download package from specified repot: +- set( tensile_fork "ROCmSoftwarePlatform" CACHE STRING "Tensile fork to use" ) +- file (STRINGS "tensile_tag.txt" read_tensile_tag) +- set( tensile_tag ${read_tensile_tag} CACHE STRING "Tensile tag to download" ) +- virtualenv_install("git+https://github.com/${tensile_fork}/Tensile.git@${tensile_tag}") +- message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}") +- endif() +- message(STATUS "Adding ${VIRTUALENV_HOME_DIR} to CMAKE_PREFIX_PATH") +- list(APPEND CMAKE_PREFIX_PATH ${VIRTUALENV_HOME_DIR}) + if (TENSILE_VERSION) + find_package(Tensile ${TENSILE_VERSION} EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}") + else() diff --git a/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild new file mode 100644 index 000000000000..0600f90bac37 --- /dev/null +++ b/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="docs" +DOCS_DEPEND="media-gfx/graphviz" +inherit cmake docs prefix + +DESCRIPTION="AMD's library for BLAS on ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz + https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${P}-Tensile-asm_full-navi22.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="BSD" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-util/rocm-cmake:${SLOT} + dev-util/Tensile:${SLOT} +" + +DEPEND=" + dev-util/hip:${SLOT} + dev-libs/msgpack + test? ( + virtual/blas + dev-cpp/gtest + sys-libs/libomp + ) + benchmark? ( + virtual/blas + sys-libs/libomp + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-fix-glibc-2.32-and-above.patch + "${FILESDIR}"/${PN}-5.0.2-change-default-Tensile-library-dir.patch + "${FILESDIR}"/${PN}-5.0.2-cpp_lib_filesystem.patch + "${FILESDIR}"/${PN}-5.0.2-unbundle-Tensile.patch + ) + +src_prepare() { + cmake_src_prepare + cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die + # Fit for Gentoo FHS rule + sed -e "/PREFIX rocblas/d" \ + -e "/<INSTALL_INTERFACE/s:include:include/rocblas:" \ + -e "s:rocblas/include:include/rocblas:" \ + -e "s:\\\\\${CPACK_PACKAGING_INSTALL_PREFIX}rocblas/lib:${EPREFIX}/usr/$(get_libdir)/rocblas:" \ + -e "s:share/doc/rocBLAS:share/doc/${P}:" \ + -e "/rocm_install_symlink_subdir( rocblas )/d" -i library/src/CMakeLists.txt || die + + sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die + + eprefixify library/src/tensile_host.cpp +} + +src_configure() { + # allow acces to hardware + addpredict /dev/kfd + addpredict /dev/dri/ + addpredict /dev/random + + export PATH="${EPREFIX}/usr/lib/llvm/roc/bin:${PATH}" + + local mycmakeargs=( + -DTensile_LOGIC="asm_full" + -DTensile_COMPILER="hipcc" + -DTensile_LIBRARY_FORMAT="msgpack" + -DTensile_CODE_OBJECT_VERSION="V3" + -DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile" + -DTensile_ROOT="${EPREFIX}/usr/share/Tensile" + -DBUILD_WITH_TENSILE=ON + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" + -DCMAKE_SKIP_RPATH=TRUE + -DBUILD_TESTING=OFF + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} + ) + + CXX="hipcc" cmake_src_configure + + # do not rerun cmake and the build process in src_install + sed -e '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die +} + +src_compile() { + docs_compile + cmake_src_compile +} + +check_rw_permission() { + local cmd="[ -r $1 ] && [ -w $1 ]" + local error=0 user + if has sandbox ${FEATURES}; then + user="portage" + su portage -c "${cmd}" || error=1 + else + user="$(whoami)" + bash -c "${cmd}" || error=1 + fi + if [[ "${error}" == 1 ]]; then + die "${user} do not have read and write permissions on $1! \n Make sure ${user} is in render group and check the permissions." + fi +} + +src_test() { + # check permissions on /dev/kfd and /dev/dri/render* + check_rw_permission /dev/kfd + check_rw_permission /dev/dri/render* + addwrite /dev/kfd + addwrite /dev/dri/ + cd "${BUILD_DIR}/clients/staging" || die + ROCBLAS_TEST_TIMEOUT=3600 LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src" ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library" ./rocblas-test || die "Tests failed" +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dolib.so clients/librocblas_fortran_client.so + dobin clients/staging/rocblas-bench + fi +} diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index cf8d24cfc967..b12cbff2f402 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -1,6 +1,10 @@ AUX rocFFT-4.2.0-add-functional-header.patch 426 BLAKE2B 82c289bb6663690163c11950d05c21acf73ac3c759b9c081f30bd2f86e8416a1d9e064d6879e3e5624b44488a6caf3d6d215e8a3c37647e5bfb0d58b85985081 SHA512 09bcfe421f20a6e5ba66a0efc4beecbdb591b2422eecc851c99c6cde12da904ab2bb86c5985bbc68fe9a859fdc986b21f6ae855cb631eb5e15819b6f39e3ef00 +AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325dc3f0c8869b109cdeb46892d597346532dcae2bd51739b85b97ecb6982935ec38f1332a4857d719b1c7c9e3a1e83f60623d1 SHA512 f714ba071838ebba8c6ab32b92eab52430622ef5f7eeea04f7a8c71b8a2a547688faf0f8d93a9be90183aebb976ec51722bcee81d960545046c82fd3df9b6f01 +AUX rocFFT-5.0.2-unbundle-sqlite.patch 1997 BLAKE2B aee0737f52870d8b154b18b8961f0e8059d50d134afe014edf25439084f112b1f4d91a8123d5133fcde129305050447355df341898563ed950b80af3589d1153 SHA512 8dc74594c698e45a41a4632c2211a7c23c9f9ff4c2c3716b99c74888529414684d52e8e146853e69370d1c80893da35fcd1076a55cf9e7eddc9d2e6fb71296f7 DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017a38f72ee45b3b224fc3e46abd40b976aef645f4432601265b38cff8939456981c686360eba135349b5d28fb5 SHA512 db9a6b49162dfb7924aa5f5dc8d42c92a5a741e03c3c0b4ece2cfb72de7506a345f3d28d31a3d7755cfe78078c448c9f952ca671e472335a4301de8702916176 DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d +DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9 EBUILD rocFFT-4.0.0-r1.ebuild 1131 BLAKE2B 71aa2f8a3318d92ac9ec0739b0e921b10b54bd8d3b1416d23a9ac3e41b23401626c382cba34b1d9e1249e42951d8b7fdba9604cda01cb9e12cb0980850f1c997 SHA512 dbbc8c2cd0c79b16c90fbb41bdd0f901e61195b373d0ebcce5df0e9cb4eebb116af142c8f10a85ce68cc1cf9aeb1f7578eee3d360d80ecf0512ae7821db15aa2 EBUILD rocFFT-4.3.0-r1.ebuild 2798 BLAKE2B c4e243674c4eded667cce3d3e2e4a9f1a612e0e62e699e23a3afc3482e6b1b82038a9de253748220da8c0a01bde66bada55b9a5514a2cc9688e015dcd4d91915 SHA512 fb9f81f734cb7919f63640c04e399608a84dc2864dc51f415f886b684b27d68ac6b9b504961f7bf3ae9e1533cbca7e7a4182a3def9d0f85e78ba13b13a94d306 -MISC metadata.xml 600 BLAKE2B e5670764a33e77b02bcec492c068a8ec969f0b17888ae74fa09cf13fbac40012cf2ae7590e130012addbbcf2210f66391786395896a5c34f2d74ff977300507a SHA512 50e92e755a0b3b86eaceabc2884aebe14659913e104fc9fa915603b975b03350d66deef3c5455ed48f5ca67033050817f953a3d649161cf31a3088a77780cd38 +EBUILD rocFFT-5.0.2.ebuild 3990 BLAKE2B 6d7109e8378a68de6a95d56f61baf2b8322ce512ee3d24bec92228b17b9e42e399e3f4ebff26f079025d95d5debb43450526670810c6a91fea821bf07e166928 SHA512 54f3a877fa12d3d3cf1716135447fa48b3cfcd17c54f93433d2b940b58380f1b57c7252e3c541d8d969df688ec0f965381fbe20d0a300c9d14f1b5085a46e148 +MISC metadata.xml 791 BLAKE2B d61b1f8788dd0d531aebd0b3273072a1ef2cd2e13423dd3b040cb077a6f12b2790a22159c339f98ce4ee93ee674db83390066a05d93d23e6de9dd47283a59ac7 SHA512 a33e10d3fcb784a75bf2b1d3ecddd53cf80328c37a6829202c7b74001338a2a10bdb122ce7aea65c68315e3985a890889b833cd65f4d1fb14bbf6d9bd59752e8 diff --git a/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch b/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch new file mode 100644 index 000000000000..1a35126f1d8c --- /dev/null +++ b/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch @@ -0,0 +1,12 @@ +fix compilation issue: error: use of undeclared identifier 'ceil' 'floor' +=================================================================== +--- rocFFT-rocm-5.0.2.orig/library/src/device/generator/stockham_gen_base.h ++++ rocFFT-rocm-5.0.2/library/src/device/generator/stockham_gen_base.h +@@ -20,6 +20,7 @@ + + #pragma once + #include "stockham_gen.h" ++#include <math.h> + + // Base class for stockham kernels. Subclasses are responsible for + // different tiling types. diff --git a/sci-libs/rocFFT/files/rocFFT-5.0.2-unbundle-sqlite.patch b/sci-libs/rocFFT/files/rocFFT-5.0.2-unbundle-sqlite.patch new file mode 100644 index 000000000000..4da2b2092906 --- /dev/null +++ b/sci-libs/rocFFT/files/rocFFT-5.0.2-unbundle-sqlite.patch @@ -0,0 +1,54 @@ +Disable rocFFT fetching SQLite3 and link to system libsqlite.so +--- rocFFT-rocm-5.0.2/library/src/CMakeLists.txt ++++ rocFFT-rocm-5.0.2/library/src/CMakeLists.txt +@@ -134,31 +134,7 @@ set( rocfft_source + rtcsubprocess.cpp + ) + +-# SQLite 3.36.0 enabled the backup API by default, which we need +-# for cache serialization. We also want to use a static SQLite, +-# and distro static libraries aren't typically built +-# position-independent. +-include( FetchContent ) +- +-# embed SQLite +-FetchContent_Declare(sqlite_local +- URL https://sqlite.org/2021/sqlite-amalgamation-3360000.zip +- URL_HASH SHA256=999826fe4c871f18919fdb8ed7ec9dd8217180854dd1fe21eea96aed36186729 +-) +-FetchContent_MakeAvailable(sqlite_local) +-add_library( sqlite3 STATIC ${sqlite_local_SOURCE_DIR}/sqlite3.c ) +-set_target_properties( sqlite3 PROPERTIES +- C_VISIBILITY_PRESET "hidden" +- VISIBILITY_INLINES_HIDDEN ON +- POSITION_INDEPENDENT_CODE ON +- ) +- +-# we don't need extensions, and omitting them from SQLite removes the +-# need for dlopen/dlclose from within rocFFT +-target_compile_options( +- sqlite3 +- PRIVATE -DSQLITE_OMIT_LOAD_EXTENSION +-) ++find_package( SQLite3 REQUIRED ) + + set_property( + SOURCE rtc.cpp +@@ -170,7 +146,7 @@ prepend_path( ".." rocfft_headers_public + add_library( rocfft ${rocfft_source} ${relative_rocfft_headers_public} ) + add_library( roc::rocfft ALIAS rocfft ) + +-target_link_libraries( rocfft PRIVATE stockham_gen sqlite3 ) ++target_link_libraries( rocfft PRIVATE stockham_gen ${SQLite3_LIBRARIES} ) + if( NOT WIN32 ) + target_link_libraries( rocfft PRIVATE -lstdc++fs ) + endif() +@@ -203,7 +179,7 @@ endif() + target_include_directories( rocfft + PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/include> + $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/library/src/device> +- ${sqlite_local_SOURCE_DIR} ++ ${SQLite3_LIBRARIES} + PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/include> + $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> + $<INSTALL_INTERFACE:include/rocFFT> diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml index 3274277df8c4..825327b204eb 100644 --- a/sci-libs/rocFFT/metadata.xml +++ b/sci-libs/rocFFT/metadata.xml @@ -16,4 +16,8 @@ <upstream> <remote-id type="github">ROCmSoftwarePlatform/rocFFT</remote-id> </upstream> + <use> + <flag name="benchmark">Build and install [dyna-]rocfft-rider.</flag> + <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild new file mode 100644 index 000000000000..8d0cb72d3ed8 --- /dev/null +++ b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake check-reqs multiprocessing python-r1 + +DESCRIPTION="Next generation FFT implementation for ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT" +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask +RDEPEND=" +perfscripts? ( + >=media-gfx/asymptote-2.61 + dev-texlive/texlive-latex + dev-tex/latexmk + sys-apps/texinfo + dev-python/sympy[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] ) +${PYTHON_DEPS}" + +DEPEND="dev-util/hip:${SLOT} + ${PYTHON_DEPS}" + +BDEPEND=" + test? ( dev-cpp/gtest dev-libs/boost + >=sci-libs/fftw-3 + >=dev-util/cmake-3.22 + dev-util/rocm-cmake:${SLOT} +)" + +CHECKREQS_DISK_BUILD="7G" + +IUSE="benchmark perfscripts test" +REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/rocFFT-rocm-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.0-add-functional-header.patch" + "${FILESDIR}/${PN}-5.0.2-unbundle-sqlite.patch" + "${FILESDIR}/${PN}-5.0.2-add-math-header.patch" ) + +required_mem() { + if use test; then + echo "52G" + else + if [[ -n "${AMDGPU_TARGETS}" ]]; then + local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) # count how many archs user specified in ${AMDGPU_TARGETS} + else + local NARCH=7 # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future. + fi + echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required + fi +} + +pkg_pretend() { + return # leave the disk space check to pkg_setup phase +} + +pkg_setup() { + export CHECKREQS_MEMORY=$(required_mem) + check-reqs_pkg_setup + python_setup +} + +src_prepare() { + sed -e "s/PREFIX rocfft//" \ + -e "/rocm_install_symlink_subdir/d" \ + -e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \ + -i library/src/CMakeLists.txt || die + + sed -e "/rocm_install_symlink_subdir/d" \ + -e "$!N;s:PREFIX\n[ ]*rocfft:# PREFIX rocfft\n:;P;D" \ + -i library/src/device/CMakeLists.txt || die + + if use perfscripts; then + pushd scripts/perf || die + sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir + sed -e "/^top/,+1d" -i rocfft-perf suites.py || die + sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die + sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," -i perflib/pdf.py perflib/generators.py || die + popd + fi + + cmake_src_prepare +} + +src_configure() { + # Grant access to the device + addwrite /dev/kfd + addpredict /dev/dri/ + + # Compiler to use + export CXX=hipcc + + local mycmakeargs=( + -Wno-dev + -DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF) + -DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF) + ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} + ) + + cmake_src_configure +} + +src_test() { + addwrite /dev/kfd + addpredict /dev/dri + cd "${BUILD_DIR}/clients/staging" || die + einfo "Running rocfft-test" + LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device ./rocfft-test || die + + einfo "Running rocfft-selftest" + LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device ./rocfft-selftest || die +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/clients/staging || die + dobin *rider + fi + + if use perfscripts; then + cd "${S}"/scripts/perf || die + python_foreach_impl python_doexe rocfft-perf + python_moduleinto ${PN}_perflib + python_foreach_impl python_domodule perflib/*.py + insinto /usr/share/${PN}-perflib + doins *.asy suites.py + fi +} diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest index 7a2d485c013f..b53987c8563b 100644 --- a/sci-libs/scotch/Manifest +++ b/sci-libs/scotch/Manifest @@ -6,5 +6,5 @@ EBUILD scotch-6.1.0-r1.ebuild 4948 BLAKE2B 4856a6123e7663f65de9cef8855875b45faa1 EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e EBUILD scotch-6.1.1.ebuild 4957 BLAKE2B 66fe678726e0d48fa2e0d4eaa2147accd72088629b9ff7a250e7d2893a513e201032e3092a84b12b4150f6ef5005f5f6602fcd69bd57ef14e4bf56791c2db7b8 SHA512 c02acd26fa18fba7d8b04a4bb38e0b51b920abbc629c71033e2e1edfd65ad95a893c5309d96d90b660a58afa311aed898e7001a9767374452ec7d497299a2a5b EBUILD scotch-6.1.2.ebuild 4951 BLAKE2B 3d3e5e04719603bb8af5794a7f9b3cf650f142df1a8a30904e2d5791a32e99af5fe75f630aec51bbee425f8b49b0ce7b987c7f25439e5268c906a3eece0ab9bf SHA512 c3371fd91658a459675e945f0a5287967ead597af4d4f83243b1dba01ad84d754558f170cb480cefa65d0a03ddfc541346c2400846408ae486dc19e4f5d0185a -EBUILD scotch-7.0.1.ebuild 5026 BLAKE2B 0c4a3449686b1242916d187d898b41953f5438d41abbb3bb232d8c34572b1313abb1a3a66ca56f0213ec86826e86b184ede968d01d1ada12248e795578298367 SHA512 633c2f4b9da8e536cb73bb31f7ebc221f767aeda3ec763c798ed0bbb309d98a1a69c956a02f5927a990c11cd9c1c0c5813373644865bed3e8a567960fecd464c +EBUILD scotch-7.0.1-r1.ebuild 4955 BLAKE2B c0a41b850ecef6cf64045baabf46a5faa12b96f8d6f291115f5c927327ca1cd6ddb70b61d43baf56f6bb05a109c039596c8d24a0bdab0e6d84e19566927aad36 SHA512 f730bbf00a5b19f5b6760460b38fc7b3f10f383022c1b838c072338023489e3041d90cb298c87cfb99a6ca8130bc6f600b9ddab1b3187a504425dd458d5686d9 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b diff --git a/sci-libs/scotch/scotch-7.0.1.ebuild b/sci-libs/scotch/scotch-7.0.1-r1.ebuild index 5f7ec4a8c16f..ddd574b69a8f 100644 --- a/sci-libs/scotch/scotch-7.0.1.ebuild +++ b/sci-libs/scotch/scotch-7.0.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs flag-o-matic multilib @@ -87,7 +87,6 @@ src_compile() { 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 diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest index a5303081c5e3..427333217ed6 100644 --- a/sci-libs/stellarsolver/Manifest +++ b/sci-libs/stellarsolver/Manifest @@ -1,3 +1,6 @@ +AUX stellarsolver-2.2-fix-implicit-vasprintf-decl.patch 3269 BLAKE2B b20b91d09de085aa6473b9bce472054fc4aba1516d782694e4351beda79b763347ec8012312b1384fbf1894747071dc20b4a25ca7bb2894382281fba528bc30e SHA512 026fc39584b73d2b90a26a1ad9028f94a6e63095f793da8f3fd185d48a7d055369d8e257f4032271d9a4729a499ccb051c8df1e2c559ff77f21f2ec1767518de DIST stellarsolver-1.9.tar.gz 9117560 BLAKE2B dd458399bd53a6e9de50293ebe15538275fb494d8ef63699eb1234aaee5234fdbb81fe23a28cc1d264490ea8849569293342125461d9e638111c9acb9756fbdf SHA512 a618e551ec28bd8439a495ca6f2a69b857852f0129c8e7d692315bd124b7c7a5130763775264b3f6a7394b3d0480d4f95c1605fb02e311ab6c38b4c60bc6b9e3 +DIST stellarsolver-2.2.tar.gz 10971732 BLAKE2B 019b822d9a84401dfe2d01053da14c3f0eafb8a8b67e60c4f664ad64c0ffefe72f9dc086edef6dac5950f7fd99e655a641ecf781609b8b54e50cf3c0f8a516b5 SHA512 0b200437130ea8131ade9219e1055ea4265925168cbfb5a7bdcf3836e267a1b670df43f20d4657ef64dea2c1ef2314cfc0bcb8503eb4ead3f0cc3fae3267f7bc EBUILD stellarsolver-1.9.ebuild 604 BLAKE2B c0fbc8549a28b289eba9965f3c968c0517861d2f4868342112cf7168eb1a971da50d060f54e5e64323eae041e71ba63b49e0e709ae305d13710c07d08390fa80 SHA512 53064dad8130d864372c5c73fc5c9995090313c3e9b08ba3cd87c4efd4c0539fc06c24ba54b1d1c5a593e5dd9a2c75297d30f9f8242075538d519371ea24a37c +EBUILD stellarsolver-2.2.ebuild 728 BLAKE2B 104b43d93096e224b4ffd9985f3ca512fbbb78ae4f95b16ddda1bd4710280eab7cf04f38f9c1feaf9e32563b79476d8ac3785bad07121a0e82d0f9c92bef2b80 SHA512 201fe7ede6524be9f8860bae7c06753665a113a69d6e6834031911315aeae7ec2a2e6eb7fdce71069ec1adca1d2c8048765c6908f82444f705296a4e722e2bd3 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77 diff --git a/sci-libs/stellarsolver/files/stellarsolver-2.2-fix-implicit-vasprintf-decl.patch b/sci-libs/stellarsolver/files/stellarsolver-2.2-fix-implicit-vasprintf-decl.patch new file mode 100644 index 000000000000..b2625fe4429e --- /dev/null +++ b/sci-libs/stellarsolver/files/stellarsolver-2.2-fix-implicit-vasprintf-decl.patch @@ -0,0 +1,88 @@ +From acb58bd78388adec25eb6e09ce6434546de008b8 Mon Sep 17 00:00:00 2001 +From: Robert Lancaster <rlancaste@gmail.com> +Date: Wed, 16 Mar 2022 18:15:21 -0400 +Subject: [PATCH] Trying to eliminate vasprintf implicit declaration warning on + Linux + +--- + stellarsolver/astrometry/util/bl.c | 4 +++- + stellarsolver/astrometry/util/errors.c | 4 +++- + stellarsolver/astrometry/util/fitsioutils.c | 3 +++ + stellarsolver/astrometry/util/ioutils.c | 4 +++- + stellarsolver/astrometry/util/log.c | 4 +++- + 5 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/stellarsolver/astrometry/util/bl.c b/stellarsolver/astrometry/util/bl.c +index 1a0fee9..e84d74a 100644 +--- a/stellarsolver/astrometry/util/bl.c ++++ b/stellarsolver/astrometry/util/bl.c +@@ -2,7 +2,9 @@ + # This file is part of the Astrometry.net suite. + # Licensed under a 3-clause BSD style license - see LICENSE + */ +- ++#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library ++#define __STDC_WANT_LIB_EXT2__ 1 ++#endif + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +diff --git a/stellarsolver/astrometry/util/errors.c b/stellarsolver/astrometry/util/errors.c +index 94f5f9c..b7c4e9f 100644 +--- a/stellarsolver/astrometry/util/errors.c ++++ b/stellarsolver/astrometry/util/errors.c +@@ -2,7 +2,9 @@ + # This file is part of the Astrometry.net suite. + # Licensed under a 3-clause BSD style license - see LICENSE + */ +- ++#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library ++#define __STDC_WANT_LIB_EXT2__ 1 ++#endif + #include <stdlib.h> + #include <string.h> + #include <errno.h> +diff --git a/stellarsolver/astrometry/util/fitsioutils.c b/stellarsolver/astrometry/util/fitsioutils.c +index 7451c36..f2b20bc 100644 +--- a/stellarsolver/astrometry/util/fitsioutils.c ++++ b/stellarsolver/astrometry/util/fitsioutils.c +@@ -2,6 +2,9 @@ + # This file is part of the Astrometry.net suite. + # Licensed under a 3-clause BSD style license - see LICENSE + */ ++#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library ++#define __STDC_WANT_LIB_EXT2__ 1 ++#endif + #include <stdio.h> + #include <string.h> + #include <stdint.h> +diff --git a/stellarsolver/astrometry/util/ioutils.c b/stellarsolver/astrometry/util/ioutils.c +index ee17011..c490fb8 100644 +--- a/stellarsolver/astrometry/util/ioutils.c ++++ b/stellarsolver/astrometry/util/ioutils.c +@@ -2,7 +2,9 @@ + # This file is part of the Astrometry.net suite. + # Licensed under a 3-clause BSD style license - see LICENSE + */ +- ++#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library ++#define __STDC_WANT_LIB_EXT2__ 1 ++#endif + #include <stdio.h> + #include <errno.h> + #include <string.h> +diff --git a/stellarsolver/astrometry/util/log.c b/stellarsolver/astrometry/util/log.c +index 256d5a1..1a2b8db 100644 +--- a/stellarsolver/astrometry/util/log.c ++++ b/stellarsolver/astrometry/util/log.c +@@ -2,7 +2,9 @@ + # This file is part of the Astrometry.net suite. + # Licensed under a 3-clause BSD style license - see LICENSE + */ +- ++#ifdef __GNUC__ //# Modified by Robert Lancaster for the StellarSolver Internal Library ++#define __STDC_WANT_LIB_EXT2__ 1 ++#endif + #include <stdio.h> + #include <stdarg.h> + #include <stdlib.h> diff --git a/sci-libs/stellarsolver/stellarsolver-2.2.ebuild b/sci-libs/stellarsolver/stellarsolver-2.2.ebuild new file mode 100644 index 000000000000..3fd2a5f94878 --- /dev/null +++ b/sci-libs/stellarsolver/stellarsolver-2.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver" +HOMEPAGE="https://github.com/rlancaste/stellarsolver" +SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + sci-libs/cfitsio:= + sci-libs/gsl:= + sci-astronomy/wcslib:= +" +DEPEND="${RDEPEND}" + +# https://github.com/rlancaste/stellarsolver/issues/108 +PATCHES=( "${FILESDIR}/${P}-fix-implicit-vasprintf-decl.patch" ) diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest index 110e5f958176..65214ee0a5a2 100644 --- a/sci-libs/symengine/Manifest +++ b/sci-libs/symengine/Manifest @@ -7,5 +7,5 @@ DIST symengine-0.9.0.tar.gz 878574 BLAKE2B 32c37ca6575b3f7e37184c80c2df74ebf7bb7 EBUILD symengine-0.6.0-r1.ebuild 2216 BLAKE2B 4d9be11362f6b7b5a7727d32a7c78d95bc9d0a53287cedd127cb270f445b6e1b0af29c3414390c89ab21839c404310dc830ff4338cfbf66fa3504eb95e1fddef SHA512 135c11c561c74e6e337d0525ee8ad093fcd94ad3610d237a950c6f0e123aeeced09556201a34b893fe33e4f5d6115059f9ca422fd1441423447a30da8b61bcc9 EBUILD symengine-0.7.0-r1.ebuild 2307 BLAKE2B 58738cdf35d5656e25cbeec02bbba2d9d847ecb21fabb65163b957d52a5edf7a010628ced7891f79905a7f31a33452040c149b31a6525ddcde00707dadebf8b5 SHA512 1817320a9de0950a17295edb02bb1f0685e030916133d55039a9b8087bbfeb2d076a33b6dab22e79912a8bcbcfad7c457d850b5500ba1a43afd8934504189975 EBUILD symengine-0.8.1-r1.ebuild 2263 BLAKE2B f452bd2334c12daaa62d66fa0aa8af88fc712403ff00e6326c6974bcb723c717ebe162a26fa6b5dd36ab021e094b4abe2cc59ad4271f7326f0180b592407c8e6 SHA512 ee425d08b3f264ebae3ec28f829e0adb42dbc9e3abe2d83bf8f82b4db035559e5b87a887e7d9a6cb910e2ea0b69329029d96d8e26b4f6425ea7296e2e1565cee -EBUILD symengine-0.9.0.ebuild 2501 BLAKE2B cba01259aacbf94e13f8fda9560c2e353559aa6bfe809e050a2e52160b59dd23b174ae78fd94662d9c8e37dccea97ebed042bd9055b06ec5571dac0411b7d0a7 SHA512 514b20acd128513cad2d673dd40c7e4f80b4475fd575508ac9f7a8917b3243bf654ea9e52dcf2a9e5c00d83eb73b8dc57c69a0def7d23c47756aa7047edbc8d1 +EBUILD symengine-0.9.0.ebuild 2506 BLAKE2B 00dd886354362a51a34155046792477d415a7783c7a65be763206eb2bd84ecf71fbac16784d032245cb144e549ca0740acfa51d65685642c3f78bd027f932dc8 SHA512 bcc2feec0af7335c10499a4b0fed09bfc6e6eddc6b62e636665bad534802073ad8f8c348155fd293d184290982a426bc3d370178ebcadebb336203db2869c61e MISC metadata.xml 1270 BLAKE2B e52ff12980457252a05195ef47bd90e52816794948169473a597e263d744d163cbe42d35e995243daf6b8664f1ed7d41879b63927606187277cdf503fc7bf846 SHA512 4fd6f340d1d4952774eb0fcd47d9ed6e9f145bd83ba7bd04fe428faa96ec63b6cd62173b6ead116a649471fe9b6466be7bbb48c8e534b3203f232f9a7bae12b9 diff --git a/sci-libs/symengine/symengine-0.9.0.ebuild b/sci-libs/symengine/symengine-0.9.0.ebuild index 2c4ce7a66006..c4f5a9c49a23 100644 --- a/sci-libs/symengine/symengine-0.9.0.ebuild +++ b/sci-libs/symengine/symengine-0.9.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" # BUILD_FOR_DISTRIBUTION enables threads by default so do it here IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads" RESTRICT="!test? ( test )" diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest index 237b2b79d7e9..23d5b001cdac 100644 --- a/sci-libs/votca-tools/Manifest +++ b/sci-libs/votca-tools/Manifest @@ -1,7 +1,5 @@ -DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72 DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a DIST votca-tools-2021.2.tar.gz 115115 BLAKE2B 9ce16d96b6da7ee9cf9be60a69536555d21eebdad2260100bf35a0c4fe0a5b8cb76c2a3b54476fd843f5428ec5fb3fd33ae79b9fd6b27a90530637c550f06712 SHA512 84e756df4c6e355e149fd105835cfb0fd03935c824e2f7e4149ad92ed6fa81d5a43a7dd6aa532b5ee6e4a79794a94db08f8533e9f0cf99afa604c5ad9f7cb133 -EBUILD votca-tools-1.5.1.ebuild 1087 BLAKE2B 00c2358c8c4e36c34dcf359cbfb8cf9962ca5cdf413fa78b7c86fafc6333a4c4ed01892e18a91a2d0bb8b0bb7f3b1c527510eb207cb7ddd87e557b8489b13f0d SHA512 b3ca29f58b0c65642985506cf3f32c6850483ba7e8e0763cc9194957523931e9a6f51c3a441ffcd550f154bb6ac6f234a244c16bb431ab29feb93c242bb0cc53 EBUILD votca-tools-1.6.4.ebuild 749 BLAKE2B d5cd0bec7f6d8e375e1786d1c44c006276a9be8912498ae5b5f169bf9d44b097725915d44c1a2d55bd7f287182e597ad1eb4d35796544a971c47871c2109f106 SHA512 1f372e97bcd60d296aa9cc464ba23690ab9d8bed56ac6831f126bee24f3be33d1bf3cc1a5dcd2a90695dd38bc032022de1663e4f014a18068fb7bdf75c822d68 EBUILD votca-tools-2021.2.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4 MISC metadata.xml 456 BLAKE2B 872b69b5cc95376bf9a28d0c1a16ae7fa52b3b0c356ffef0f70f69ed95da623a335edf4e7917da06880747c469dce762ba5534e3c5854264d8b6895f530b33a5 SHA512 741e6734a956099207e96de6d1fce8db9601d0d3582130a2c45b6a7cb7b140ef56a300483b392d556d303aafbd39833e4f4dff7fd4d6605d39eb8d9a88c8b6aa diff --git a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild deleted file mode 100644 index 7c07b1f80ccd..000000000000 --- a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_MAKEFILE_GENERATOR="ninja" - -inherit cmake-utils multilib - -if [ "${PV}" != "9999" ]; then - SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux" - S="${WORKDIR}/${P#votca-}" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN/-//}.git" -fi - -DESCRIPTION="Votca tools library" -HOMEPAGE="http://www.votca.org" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc +fftw sqlite" - -RDEPEND=" - dev-libs/boost:= - dev-libs/expat - >=dev-cpp/eigen-3.3 - fftw? ( sci-libs/fftw:3.0 ) - sqlite? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - doc? ( >=app-doc/doxygen-1.7.6.1[dot] ) - >=app-text/txt2tags-2.5 - virtual/pkgconfig" - -DOCS=( NOTICE ) - -src_configure() { - mycmakeargs=( - -DWITH_FFTW=$(usex fftw) - -DWITH_SQLITE3=$(usex sqlite) - -DWITH_RC_FILES=OFF - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if use doc; then - cd "${CMAKE_BUILD_DIR}" - cmake-utils_src_make html - dodoc -r share/doc/html - fi -} diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 85847c919ace..c2ab330f934f 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -2,6 +2,7 @@ AUX vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch 634 BLAKE2B c143e943 AUX vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch 1529 BLAKE2B 6e3890d824cd3362439f3fdea0f3d01a37d7a5c1e871ed6ecbcecfb4e6e425ce4caf6176b122df4b80fbe1b95661a729428be0e3302205309949080894be7563 SHA512 1177b4815a800afbbaf8ee92a4d52df513c702fcc965cd0c12ba7f91cf58b2ed035277138ef2a091a4649eaf84e6f9b9275f8875385d4cfb89f6d3262c5eef4a AUX vtk-9.0.1-limits-include-gcc11.patch 2654 BLAKE2B 69eae5782234e46c2a38dbc3bf3d01082518314c62742996b953a6b17ceca9d85ca9a83a907c6820210bc0ff406640476dcafc1a533d90071e1c0517a06cc938 SHA512 ef16b3dea49f29d537bfbef26e62f91e59056288eac5c0c41191fee6c2181336dcceaa27b84a541c442d986b8ce1cdf3a9effdedcab1e1a1e242efad34954d00 AUX vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch 4152 BLAKE2B 7f757ed934e5684bdbe17e6214ac1ab55b024359cb3a4819ea11c086bbb5abcafc787fd37433cb1cae77d9284aa206b43fb5dc8fe5b8923c4d1944c4fc39d748 SHA512 dfe9c8651fc6b6e5c5c8aa81b0821fd5ceee73c728bee5add29cd28b2c19fd79dbe9f14124f789eb647975693679b80d7219ac0a3189b5b78c2818d5055a4b7b +AUX vtk-9.1.0-adjust-to-find-binaries.patch 998 BLAKE2B 2e2338aa0e918173776a6684ae344d8b75eac8bd514d38e7e1ba5ebfeede9b170f6ab76a2d2c003448673bfbf8c3a1aea58659580aa5e85cb0c5f0d1921233a1 SHA512 259953569d3e03b920783c882ee201b8eeb8c796103bbae25f2915084c26707b9d85e886874b61264da885506ee269edf839ea2da24aa5640ea46aeb8e6dbf5a DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2 DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6 @@ -12,6 +13,6 @@ DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa4 DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800 DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a -EBUILD vtk-9.0.3-r4.ebuild 14381 BLAKE2B 9eb0d2360469b68bd6a4bba2903a7a9ded361404058522341b264cd228ae8b61eb3b90ebd7c25dd313a24dce309d5c22061ad71391c26ae019a72a0c332162a6 SHA512 38f25a78709dacf862ea81059cdc60e80609097859225b3d2ceba991fcb17a6f1b2849cc3f82dabc633420562a056c8f6afe7edc782cfb3fe17e1b6e904c8a09 -EBUILD vtk-9.1.0.ebuild 16377 BLAKE2B 266f22690f51f050a171bef169679f0f0428bb9a95dcf850db3c24605797091267421b597ea8f6367188ff645e8ee3a5a9963e962901c0d48e461f33de6731bf SHA512 ae04515942067b0f6dbdd0ec2974bee009d7b4014a5f731c097478d98ed432025511f70b9e609f3e40ebcde9a196bf6913164597c2c60d3e82e6546ff2a790d1 +EBUILD vtk-9.0.3-r4.ebuild 14383 BLAKE2B 42e0a6bcc242fe05f0cf68bb2abcfb015eb97c3f8eb538e52c4dda965889ba3c14e12bd0fa15d18c3bdd8ea2600266777cce12ea9c40e77d80d85346f07c9821 SHA512 8cceabff7535339811fc9a02925dc437d1460311b32a6354227d1190bba4b7261c452cc44fd0b74f70bbf8970d59c04fec578dfb5619c2b3bfa90e92bb3d9973 +EBUILD vtk-9.1.0.ebuild 16427 BLAKE2B 7f616c51f2ed60d12f46003d64e6ae228db8c567e50fc05305fd688aa6a62669c620c762dbf3eaafc62492e64cbea10deeaca505bca1578916639607f5eaa059 SHA512 8a344d6651b4b1b4f9fc01decd63e7a2f602c3bcdf27c23ffd7cea8c506385ad7d5c6a8ddb0c9b7b0fa08cae7988cc095149800d63adc2650b4ec3881e3d6f69 MISC metadata.xml 1349 BLAKE2B 778c471328fddbece653650c6a54b002dc9a48f5de3eb391bd0a84c9e0720ab1b2715b8013af55e60aac11a244090fc6e1d152c57a2c7f16b0b5306043e71731 SHA512 f55cac1ad724a7440bae4e7c364d3869ba25e4668463d0757ca8eb14469b539471c2bd31bb2e874c3a7982df490d9fc1c43c8d854dd4c511d0bde43ec0dc4a0c diff --git a/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch new file mode 100644 index 000000000000..10d6d251ebf3 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch @@ -0,0 +1,25 @@ +From e59b8ff7b83cd6a58c226cb4f5d9661bcb29002b Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Thu, 31 Mar 2022 08:05:17 +0200 +Subject: [PATCH] adjust to find binaries + +Add compatibility for qt-5.15.3 with no qtchooser installed. QtCore exports +Qt5::{qmake,moc,rcc} which we use to get the path for binaries. + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/GUISupport/QtQuick/qml/CMakeLists.txt ++++ b/GUISupport/QtQuick/qml/CMakeLists.txt +@@ -60,8 +60,8 @@ file(GENERATE + # Generate the qmltypes file for the VTK QML plugin + + # First, find the qmlplugindump executable +-get_target_property(qt_core_location "Qt${vtk_qt_major_version}::Core" LOCATION) +-get_filename_component(qt_bin_dir "${qt_core_location}" PATH) ++get_target_property(qt_qmake_location "Qt${vtk_qt_major_version}::qmake" LOCATION) ++get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH) + if (APPLE) + get_filename_component(qt_bin_dir "${qt_bin_dir}" PATH) + endif () +-- +2.35.1 + diff --git a/sci-libs/vtk/vtk-9.0.3-r4.ebuild b/sci-libs/vtk/vtk-9.0.3-r4.ebuild index 0e926465c515..0848a5f8b4e5 100644 --- a/sci-libs/vtk/vtk-9.0.3-r4.ebuild +++ b/sci-libs/vtk/vtk-9.0.3-r4.ebuild @@ -7,7 +7,7 @@ EAPI=7 # - add USE flag for remote modules? Those modules can be downloaded # properly before building. -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) WEBAPP_OPTIONAL=yes WEBAPP_MANUAL_SLOT=yes diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0.ebuild index 7be370c13c6a..9a6ebbdaac51 100644 --- a/sci-libs/vtk/vtk-9.1.0.ebuild +++ b/sci-libs/vtk/vtk-9.1.0.ebuild @@ -143,6 +143,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch "${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch "${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch + "${FILESDIR}"/${P}-adjust-to-find-binaries.patch ) DOCS=( CONTRIBUTING.md README.md ) |