summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/Manifest.gzbin43127 -> 43145 bytes
-rw-r--r--sci-libs/caffe2/Manifest3
-rw-r--r--sci-libs/caffe2/caffe2-2.5.1-r5.ebuild4
-rw-r--r--sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch8
-rw-r--r--sci-libs/cantera/Manifest8
-rw-r--r--sci-libs/cantera/cantera-3.0.1-r1.ebuild (renamed from sci-libs/cantera/cantera-3.0.1.ebuild)2
-rw-r--r--sci-libs/cantera/cantera-3.0.1-r2.ebuild (renamed from sci-libs/cantera/cantera-3.0.0-r1.ebuild)11
-rw-r--r--sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch75
-rw-r--r--sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch46
-rw-r--r--sci-libs/cantera/files/cantera-3.0.1_fix_fmt_with_c++20.patch323
-rw-r--r--sci-libs/libbraiding/Manifest4
-rw-r--r--sci-libs/libbraiding/libbraiding-1.2.ebuild20
-rw-r--r--sci-libs/libbraiding/libbraiding-1.3.ebuild2
-rw-r--r--sci-libs/pcl/Manifest4
-rw-r--r--sci-libs/pcl/pcl-1.14.1-r1.ebuild2
-rw-r--r--sci-libs/pcl/pcl-9999.ebuild2
16 files changed, 397 insertions, 117 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e79912f5ad07..043c223c6bba 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
Binary files differ
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index efd3fad16b5e..1eb44df131b8 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -7,6 +7,7 @@ AUX caffe2-2.5.1-fix-functorch-install.patch 448 BLAKE2B f8b0ebfe0cdb8318bc376d8
AUX caffe2-2.5.1-gentoo.patch 5181 BLAKE2B 146e49ea90dbdd3bfb12a8f1b135b9ac8ed849c408a81081a5308c8dd761e1b3a8e714b905c2b88a785f436123347899b7a72eccacc2fbc54d9efad2d1dc3550 SHA512 885e79edc67d7eff1e895bdd3589704220714b6024635444dac1452e41a947c2b2a4a33866acbfc19af66d42f340038395aeb53d1477294712578e4bdbe06673
AUX caffe2-2.5.1-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8ff65ef9ca9ea1e5ad93ecef3cbaa595808105bbf6c8d3dcb9047559d23bc0398cda5922fb41e29a7588644c90c90fd8 SHA512 5873f11930ae5947c7dfbb19d0377d5535e395fcc1ab213e3c65c77b2e3bd911efc11cde2ca3e7134e9e7798ca7a483910113f331c0a23b73a5546aaaded40c5
AUX caffe2-2.5.1-install-dirs.patch 542 BLAKE2B 7a96287f826a44c7a1eee3f44516c5e4e3011a5ddf864aeb7c4ae9a363d89d393fec4c2c86677c2cd3cc38c345323eba3d6b4c9d6686ee13e16a1c4acbdc1f18 SHA512 79de43b4bdcf1cb609bf953f3d698a38231a76f299296b1cc131639f6b0e1d29f634ac9c6858d52742e988c94d39cb5a3daa1bf36d6dc1bf6a1354ca055e5edf
+AUX caffe2-2.5.1-newfix-functorch-install.patch 441 BLAKE2B 0caa9e43432aecba83e3ae1cc2974d8eeb9262c8547bd1a72b0651b80a5057adb0d2bbbd2f77b773fe1036bd933dadb9f4a40e886e363f5d0a961ace69e6d16a SHA512 b8b9262db9e76768e8a114857d9bfcae67528568b5e3b90a0330dc246329439da56600689a289e9bb8aee06bd5a9708bdc2b49f79abc139aaec2778b6d68458b
AUX caffe2-2.5.1-unbundle_fmt.patch 499 BLAKE2B 06550f8e7ae3a932a585f8abe7653ac0b574d9ce1160c190a39f96b7d76e3a9e7a4e62b9e5e967e5884d0e38668f60af7737ea3c715d718deb7a634de98ccebd SHA512 afcb5f1123cbe5eeebdb2c5e312e37956dbc33a926cf379f531896f2c75fbb4b4dfa2c9d276a98bbad51bc587886bb572c3221be06e5116443c8ab44e1d12da5
AUX caffe2-2.5.1-unbundle_kineto.patch 830 BLAKE2B 80c9ebc30d0ca3b964141a5d9a7cb3662e6dc8472454ceabc2725f47277211cd495c4146dc9c2046cc5c5505909cf4e30c780685fceebdb05319aba5c4366346 SHA512 9645b11b5395f7a4626f17edae22c718c73d2e2f3de56e98653932a3c66f417942d54fd1dadc99112337c11513ac707a96d0caac4bf3d100db8f7079609b9b68
DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
@@ -15,5 +16,5 @@ DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a0
DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
EBUILD caffe2-2.4.0-r1.ebuild 8334 BLAKE2B d867632884fad33fb7c19344574ce30e70651474650b2f5a6e79576a7338e501989bc4628c1a04f2b2ebf3a611226df68892abdabf856ab74e67df85db74a9f0 SHA512 52e8c0e3535a1a8b90cce9143f4ff8da398de9119d2f23ffeeb0a419dadc29dae68f5e993b1a854066f63ed4809a41a98f098447e318252ff316e70fc6498b32
EBUILD caffe2-2.4.1-r4.ebuild 8557 BLAKE2B 2cefd7d0c818fb431b3eb6bc2be0a1b225790271b1108169256f8dccac99707fac3d36dc98b7e19a688c66053627d0a222d67e7f65eb6a600ed251677df5490a SHA512 ded17bc1e912f4691bfeee75c66676d331d03c21fe9c9c7416c874ef435e624bdc6109c128f0b5dbe9a5a5be81e648767c6020cd570b94e74f47061e5839f9b3
-EBUILD caffe2-2.5.1-r5.ebuild 8621 BLAKE2B cfb136392f069316ae4f020360022f7560a12d9965efcd0ccae86aaab2e72cc33af60b1a5faf14550e41adc77b0a840e761563c23adeea6bbc1ce8e95af7ea9f SHA512 c1cff4b536f2de013c727d02c1795dc4825b8deac6e847ea70973da63cf9a9913459935c1e65186ccc702f455f7a266574ab8bed2d8e86ae4ed933895cfa8c0b
+EBUILD caffe2-2.5.1-r5.ebuild 8560 BLAKE2B 44dd033db92d6c2ba8f14e81423c0edcd54fa2e96bc3060626bbcd623b4e03ad942861779ee113eec0f56962f3d9cfe60b479f5023de54a5c3f88560dd9a4db7 SHA512 952bec6d94e235f9915b875950cd1f170ed5a259d41ff58ccc827c2ebfedfecb943bf230795a4f02536547f8b48c7b1869e66680479d4dc9569e09719914a2c7
MISC metadata.xml 1081 BLAKE2B 57800165612fd555263cab4cf0bb0521acd7d41f0023da501a50ccc5a479d25ad7087661a6eec500333c3cf9cc3a85d7be8e9385869c14d92f351d8d9df68556 SHA512 71cc785a5b1688b6a0ac971d31d5fa85bef86966aa80009c34e97caa385c81a7c2fb64ae34d0a39c21548d8238efd008da24bd838a47886bfa3f0d952246b76e
diff --git a/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
index a6ed84f182da..8f23871b42b1 100644
--- a/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
+++ b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch
"${FILESDIR}"/${P}-glog-0.6.0.patch
+ "${FILESDIR}"/${P}-newfix-functorch-install.patch
)
src_prepare() {
@@ -295,9 +296,6 @@ src_install() {
# Used by pytorch ebuild
insinto "/var/lib/${PN}"
doins "${BUILD_DIR}"/CMakeCache.txt
- mv "${D}${S}"/functorch/functorch.so \
- "${D}"/var/lib/${PN}/functorch.so || die
- rm -r "${D}"/var/tmp || die
dostrip -x /var/lib/${PN}/functorch.so
rm -rf python
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch b/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
new file mode 100644
index 000000000000..499a3c74c87f
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
@@ -0,0 +1,8 @@
+--- a/functorch/CMakeLists.txt 2024-11-10 11:18:29.151992840 +0100
++++ b/functorch/CMakeLists.txt 2024-11-10 11:20:19.642389982 +0100
+@@ -42,4 +42,4 @@
+ if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "")
+ set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS})
+ endif()
+-install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}")
++install(TARGETS ${PROJECT_NAME} DESTINATION "/var/lib/caffe2/")
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 62e741b6cb60..6e7b2e8f262f 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,7 +1,7 @@
-AUX cantera-3.0.0_enable_python-3.12.patch 3182 BLAKE2B 30d2af004ee4d5097bf114fc1f8cd8e5589c9a0d643d87da544a9de0d824df1c04f461f89415dfc6b27c385e520c9b8f53ce82fcc7c4ca5dbb59f03a4a443544 SHA512 65261a618d93f0f84a3ba9a2aad8cccfee8490c78a44acddc4cc7c8ff3065bbde2370b6fcf06e8c1091efa9f244553a3810d362553194699104b19fed8647aea
AUX cantera-3.0.0_env.patch 1439 BLAKE2B 8f4cd901f24f0b526887501ba16a0552acf8572f154f8494d66d3dd8096434621d6f2baaa57f905233919fc1b7872993bada9f373950330663c8315075d507b9 SHA512 065cdbcf620a3036c1bb0bb8b79503f76dbe7e6b2522e9f53fc582c15e5e10f1790f1b40cf0315d64cab4f858764446f4094370124bb9b5c4ee6dbcfd5e61b87
-DIST cantera-3.0.0.tar.gz 2451103 BLAKE2B 094d7a4f0b8fd0f1a45d9f8c13e1390cf7fc62110e424e1287030e97382c1cdc016a5119adc4d5c7bbc222420a3b447db93fee8350643cb3a0907a838fbc1ddf SHA512 dffd696628210ae5c7b08e394e9a97262cfa6aa07ac2e6faa48591ecfee5bb11e7c2b6928563007fd581a1fd9cae999f7c1414ab5d5a312a823e155573df7aca
+AUX cantera-3.0.1_add_fmt11_support.patch 1465 BLAKE2B 42130ee99361fab47f3fd41e3bec8f4994f503daffee1a6ecbb0dfd75cce2429c6020061ec27eda5078ff67e4613d95b635c4bfc1a39fc76a2c8abed096f0251 SHA512 dd929eaf899564f8d06263b45eec1ec33245090c2c5a5128098ab2b9ec35eaa36f5025cce1726ceede0e35a8f9cca3fe279199ac083473d0ee2c72e8e63a864c
+AUX cantera-3.0.1_fix_fmt_with_c++20.patch 13515 BLAKE2B e32655074dc2780ad765d96f297957c54ced57279b6f1b90e968b408b628cb46f688a21720f0738fbaef815ab72e0f04ecc359a5dfe1c236b7569026f8b7ada4 SHA512 7ca318959f86be4436d9923bc7611fb0b0f17ebeaea1c919df2282858ba2a51946cbb7dfcfc3a9ab5098d15fac0a9bc0169b20f9072cbc0177d81898a8037941
DIST cantera-3.0.1.tar.gz 2451841 BLAKE2B b05771021a81d5266dfed382e2a6357e5b70653c6d9cfb5f03a6755095f4f8f4e7c0f78b79e0bf131c01fefce46bbc647c790ee412b6457c515cda39d4fc3054 SHA512 fa993b33867c6c0a0ca539f52116c4cdea739dfcd30deb5d2f66042f290f7f2f60112d7a37c38fbd8a38a119e5af00a7a85fd80b6e36388202b666be0ddd7715
-EBUILD cantera-3.0.0-r1.ebuild 3450 BLAKE2B 60c406b5ed46e5d42373711fe0fe33e8e8afcecf480b76dea6084bd14c9b776994752e3d7ba643558b89da35f537e7863d919395038b6a9b7ec215ea0129a1f4 SHA512 0e3c295bbf671195b607d08f19227a6b6e9e161c25dcd297b09bf6f199f61b20a743b7fd6880680671a8062c7e592aaf4b54152d1012f09e1867edc9be6fcf56
-EBUILD cantera-3.0.1.ebuild 3412 BLAKE2B e6a31765ee38637e24c73f803a071c89898116a022a02a56f586ff9a8112924dc291b9138ed12faaa831bea1dfbecfd4807fbd800b6ebee8fe0668ab759d8555 SHA512 3b28b36c905cfd63af476c63a5e1103946396bcf8404a02e2fc9c529650531bc5992e5f82f8d18c09e7d7ff711da51938620c50deb430809bf3826b9909360d6
+EBUILD cantera-3.0.1-r1.ebuild 3416 BLAKE2B 67c638a33afe183ed672426bb38b8a91128ea8e6910fa39c0df986bfcb0842ac9f2f209f4bfb350f7cd40de6d88314b51d22e980a9fd38003783fefebca8b0a0 SHA512 53cec4ecb207e97faa92e204dea3a180c65b23aec570b5b261c0bc753900954165c4c5cb98ee973629e1332a407d9a3d3b616ddacd34c4aa7f29e498df7671d2
+EBUILD cantera-3.0.1-r2.ebuild 3502 BLAKE2B d05ab5655059653d2f6db34b82dcac637adb29ca57426c96b810ffa2269f4a861a6270a8c29545ea5def545fc8f794e31a10e450b8a93d36a08ff6f4a8c02613 SHA512 daa644d36c411ae0ed67e9de1f5373bb7432d2b3aac10da51051f61fc60be3ce36c96689fc55077b47404cf09b2b47cbc5143607a61405a465807aef27769ab7
MISC metadata.xml 884 BLAKE2B 0f67510f6c09c58b0af3b820c9b38b88b0c60b0adb28c64148550f07df085cd8ea3d46f5afb59105c56bb7ccf2ca3fee4f2000bee2592ebafb835b9cf415b660 SHA512 0cdbc4cbd0dfdc90bb74c79f06d5f5d28a4edd0dcfacbddcc83ed804c592694eba27f337ce20a2a57248dd0456517bab2298faa22b78154f03e9369973fc174b
diff --git a/sci-libs/cantera/cantera-3.0.1.ebuild b/sci-libs/cantera/cantera-3.0.1-r1.ebuild
index 581e7d48888d..e1291d9791a8 100644
--- a/sci-libs/cantera/cantera-3.0.1.ebuild
+++ b/sci-libs/cantera/cantera-3.0.1-r1.ebuild
@@ -45,7 +45,7 @@ DEPEND="
${RDEPEND}
dev-cpp/eigen:3
dev-libs/boost:=
- dev-libs/libfmt
+ <dev-libs/libfmt-11
python? (
$(python_gen_cond_dep '
dev-python/cython[${PYTHON_USEDEP}]
diff --git a/sci-libs/cantera/cantera-3.0.0-r1.ebuild b/sci-libs/cantera/cantera-3.0.1-r2.ebuild
index c6b3ec2711e1..ffa880c04646 100644
--- a/sci-libs/cantera/cantera-3.0.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-3.0.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD="77 90"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="fortran hdf5 lapack +python test"
RESTRICT="!test? ( test )"
@@ -66,8 +66,9 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}_env.patch"
- "${FILESDIR}/${P}_enable_python-3.12.patch"
+ "${FILESDIR}/${PN}-3.0.0_env.patch"
+ "${FILESDIR}/${P}_fix_fmt_with_c++20.patch"
+ "${FILESDIR}/${P}_add_fmt11_support.patch"
)
pkg_setup() {
@@ -87,7 +88,7 @@ src_configure() {
CC="$(tc-getCC)"
CXX="$(tc-getCXX)"
cc_flags="${CXXFLAGS}"
- cxx_flags="-std=c++17"
+ cxx_flags="-std=c++20"
debug="no"
FORTRAN="$(tc-getFC)"
FORTRANFLAGS="${FCFLAGS}"
diff --git a/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch b/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch
deleted file mode 100644
index 8efa7b0df9c5..000000000000
--- a/sci-libs/cantera/files/cantera-3.0.0_enable_python-3.12.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 27f8362f537fc313f8fdb5c07649ef0d92e3b7f6 Mon Sep 17 00:00:00 2001
-From: "Mark E. Fuller" <mark.e.fuller@gmx.de>
-Date: Sat, 26 Aug 2023 01:04:03 +0300
-Subject: [PATCH] mods to enable python3.12
-
----
- .github/workflows/main.yml | 2 +-
- interfaces/cython/setup.cfg.in | 1 +
- interfaces/python_minimal/setup.cfg.in | 1 +
- interfaces/python_sdist/setup.cfg.in | 1 +
- src/base/application.h | 2 +-
- 5 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
-index 60822189bb..366ddd8435 100644
---- a/.github/workflows/main.yml
-+++ b/.github/workflows/main.yml
-@@ -65,7 +65,7 @@ jobs:
- timeout-minutes: 60
- strategy:
- matrix:
-- python-version: ['3.8', '3.10', '3.11']
-+ python-version: ['3.8', '3.10', '3.11', '3.12']
- os: ['ubuntu-20.04', 'ubuntu-22.04']
- fail-fast: false
- env:
-diff --git a/interfaces/cython/setup.cfg.in b/interfaces/cython/setup.cfg.in
-index 1a0358a77d..fd3c0b53c4 100644
---- a/interfaces/cython/setup.cfg.in
-+++ b/interfaces/cython/setup.cfg.in
-@@ -27,6 +27,7 @@ classifiers =
- Programming Language :: Python :: 3.9
- Programming Language :: Python :: 3.10
- Programming Language :: Python :: 3.11
-+ Programming Language :: Python :: 3.12
- Programming Language :: Python :: Implementation :: CPython
- Topic :: Scientific/Engineering :: Chemistry
- Topic :: Scientific/Engineering :: Physics
-diff --git a/interfaces/python_minimal/setup.cfg.in b/interfaces/python_minimal/setup.cfg.in
-index 2d96c75eda..753b619ede 100644
---- a/interfaces/python_minimal/setup.cfg.in
-+++ b/interfaces/python_minimal/setup.cfg.in
-@@ -23,6 +23,7 @@ classifiers =
- Programming Language :: Python :: 3.9
- Programming Language :: Python :: 3.10
- Programming Language :: Python :: 3.11
-+ Programming Language :: Python :: 3.12
- Topic :: Scientific/Engineering :: Chemistry
- Topic :: Scientific/Engineering :: Physics
- project_urls =
-diff --git a/interfaces/python_sdist/setup.cfg.in b/interfaces/python_sdist/setup.cfg.in
-index 219e53a3f0..e356b422b8 100644
---- a/interfaces/python_sdist/setup.cfg.in
-+++ b/interfaces/python_sdist/setup.cfg.in
-@@ -27,6 +27,7 @@ classifiers =
- Programming Language :: Python :: 3.9
- Programming Language :: Python :: 3.10
- Programming Language :: Python :: 3.11
-+ Programming Language :: Python :: 3.12
- Programming Language :: Python :: Implementation :: CPython
- Topic :: Scientific/Engineering :: Chemistry
- Topic :: Scientific/Engineering :: Physics
-diff --git a/src/base/application.h b/src/base/application.h
-index 76a6c671a2..b03c049f14 100644
---- a/src/base/application.h
-+++ b/src/base/application.h
-@@ -434,7 +434,7 @@ class Application
- vector<string> inputDirs;
-
- //! Versions of Python to consider when attempting to load user extensions
-- vector<string> m_pythonSearchVersions = {"3.11", "3.10", "3.9", "3.8"};
-+ vector<string> m_pythonSearchVersions = {"3.12", "3.11", "3.10", "3.9", "3.8"};
-
- //! Set of deprecation warnings that have been emitted (to suppress duplicates)
- set<string> warnings;
diff --git a/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch b/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch
new file mode 100644
index 000000000000..7e0d5333a105
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch
@@ -0,0 +1,46 @@
+This is upstream patch with removed changes for "doc/sphinx/develop/compiling/dependencies.md" file
+Upstream issue: https://github.com/Cantera/cantera/issues/1735
+Gentoo issue: https://bugs.gentoo.org/945800
+
+From c8f190928fd7a074944f0f4c58661f84a282a35e Mon Sep 17 00:00:00 2001
+From: Ray Speth <speth@mit.edu>
+Date: Wed, 24 Jul 2024 20:12:18 -0400
+Subject: [PATCH] Add support for fmt 11.0
+
+Resolves #1735
+---
+ SConstruct | 2 +-
+ doc/sphinx/develop/compiling/dependencies.md | 2 +-
+ include/cantera/base/fmt.h | 8 ++++++++
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 3863fe3a32..0b607ac891 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -216,7 +216,7 @@ config_options = [
+ options with spaces, for example, "cxx_flags='-g -Wextra -O3 --std=c++14'"
+ """,
+ {
+- "cl": "/EHsc /std:c++17",
++ "cl": "/EHsc /std:c++17 /utf-8",
+ "default": "-std=c++17"
+ }),
+ Option(
+diff --git a/include/cantera/base/fmt.h b/include/cantera/base/fmt.h
+index 1e0b3a0423..6b4d734fe3 100644
+--- a/include/cantera/base/fmt.h
++++ b/include/cantera/base/fmt.h
+@@ -42,4 +42,12 @@ void fmt_append(fmt::memory_buffer& b, const std::string& tmpl, Args... args) {
+ }
+ #endif
+
++#if FMT_VERSION > 100000
++ #if CT_USE_SYSTEM_FMT
++ #include <fmt/ranges.h>
++ #else
++ #include <fmt/join.h>
++ #endif
++#endif
++
+ #endif
diff --git a/sci-libs/cantera/files/cantera-3.0.1_fix_fmt_with_c++20.patch b/sci-libs/cantera/files/cantera-3.0.1_fix_fmt_with_c++20.patch
new file mode 100644
index 000000000000..3b6b3da50a53
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-3.0.1_fix_fmt_with_c++20.patch
@@ -0,0 +1,323 @@
+This is upstream patch.
+Upstream issue: https://github.com/Cantera/cantera/issues/1711
+
+From edc8243577020b7dd6cd0fd85285cc8ca043b5ea Mon Sep 17 00:00:00 2001
+From: Ray Speth <speth@mit.edu>
+Date: Wed, 19 Jun 2024 00:09:02 -0400
+Subject: [PATCH] Fix usage of fmt when compiling in C++20 mode
+
+Resolves #1711
+---
+ include/cantera/base/AnyMap.h | 6 ++--
+ include/cantera/base/ctexceptions.h | 2 +-
+ include/cantera/base/fmt.h | 8 ++---
+ include/cantera/base/global.h | 8 ++---
+ src/base/AnyMap.cpp | 4 +--
+ src/base/SolutionArray.cpp | 51 ++++++++++++++++-------------
+ src/thermo/PureFluidPhase.cpp | 2 +-
+ src/thermo/ThermoPhase.cpp | 2 +-
+ 8 files changed, 46 insertions(+), 37 deletions(-)
+
+diff --git a/include/cantera/base/AnyMap.h b/include/cantera/base/AnyMap.h
+index 81ac0071a7..b1f0747f33 100644
+--- a/include/cantera/base/AnyMap.h
++++ b/include/cantera/base/AnyMap.h
+@@ -746,7 +746,8 @@ class InputFileError : public CanteraError
+ : CanteraError(
+ procedure,
+ formatError(
+- (sizeof...(args) == 0) ? message : fmt::format(message, args...),
++ (sizeof...(args) == 0) ? message
++ : fmt::format(fmt::runtime(message), args...),
+ node.m_line, node.m_column, node.m_metadata))
+ {
+ }
+@@ -761,7 +762,8 @@ class InputFileError : public CanteraError
+ : CanteraError(
+ procedure,
+ formatError2(
+- (sizeof...(args) == 0) ? message : fmt::format(message, args...),
++ (sizeof...(args) == 0) ? message
++ : fmt::format(fmt::runtime(message), args...),
+ node1.m_line, node1.m_column, node1.m_metadata,
+ node2.m_line, node2.m_column, node2.m_metadata))
+ {
+diff --git a/include/cantera/base/ctexceptions.h b/include/cantera/base/ctexceptions.h
+index fb21d3ef22..476e16bf46 100644
+--- a/include/cantera/base/ctexceptions.h
++++ b/include/cantera/base/ctexceptions.h
+@@ -86,7 +86,7 @@ class CanteraError : public std::exception
+ if (sizeof...(args) == 0) {
+ msg_ = msg;
+ } else {
+- msg_ = fmt::format(msg, args...);
++ msg_ = fmt::format(fmt::runtime(msg), args...);
+ }
+ }
+
+diff --git a/include/cantera/base/fmt.h b/include/cantera/base/fmt.h
+index 8341be115e..f613e17b31 100644
+--- a/include/cantera/base/fmt.h
++++ b/include/cantera/base/fmt.h
+@@ -26,13 +26,13 @@
+
+ #if FMT_VERSION < 80000
+ template <typename... Args>
+-void fmt_append(fmt::memory_buffer& b, Args... args) {
+- format_to(b, args...);
++void fmt_append(fmt::memory_buffer& b, const std::string& tmpl, Args... args) {
++ format_to(b, tmpl, args...);
+ }
+ #else
+ template <typename... Args>
+-void fmt_append(fmt::memory_buffer& b, Args... args) {
+- format_to(fmt::appender(b), args...);
++void fmt_append(fmt::memory_buffer& b, const std::string& tmpl, Args... args) {
++ format_to(fmt::appender(b), fmt::runtime(tmpl), args...);
+ }
+ #endif
+
+diff --git a/include/cantera/base/global.h b/include/cantera/base/global.h
+index c0092c43ee..aa0f636754 100644
+--- a/include/cantera/base/global.h
++++ b/include/cantera/base/global.h
+@@ -176,7 +176,7 @@ void writelog(const string& fmt, const Args&... args) {
+ if (sizeof...(args) == 0) {
+ writelog_direct(fmt);
+ } else {
+- writelog_direct(fmt::format(fmt, args...));
++ writelog_direct(fmt::format(fmt::runtime(fmt), args...));
+ }
+ }
+
+@@ -228,7 +228,7 @@ void warn_deprecated(const string& method, const string& msg, const Args&... arg
+ if (sizeof...(args) == 0) {
+ _warn_deprecated(method, msg);
+ } else {
+- _warn_deprecated(method, fmt::format(msg, args...));
++ _warn_deprecated(method, fmt::format(fmt::runtime(msg), args...));
+ }
+ }
+
+@@ -253,7 +253,7 @@ void warn(const string& warning, const string& method,
+ if (sizeof...(args) == 0) {
+ _warn(warning, method, msg);
+ } else {
+- _warn(warning, method, fmt::format(msg, args...));
++ _warn(warning, method, fmt::format(fmt::runtime(msg), args...));
+ }
+ }
+
+@@ -268,7 +268,7 @@ void warn_user(const string& method, const string& msg, const Args&... args) {
+ if (sizeof...(args) == 0) {
+ _warn("Cantera", method, msg);
+ } else {
+- _warn("Cantera", method, fmt::format(msg, args...));
++ _warn("Cantera", method, fmt::format(fmt::runtime(msg), args...));
+ }
+ }
+
+diff --git a/src/base/AnyMap.cpp b/src/base/AnyMap.cpp
+index 84d74c1358..b35aabb8c3 100644
+--- a/src/base/AnyMap.cpp
++++ b/src/base/AnyMap.cpp
+@@ -164,7 +164,7 @@ string formatDouble(double x, long int precision)
+ size_t last;
+ string s0;
+ if (useExp) {
+- s0 = fmt::format(fmt::format("{:.{}e}", x, precision));
++ s0 = fmt::format(fmt::runtime(fmt::format("{:.{}e}", x, precision)));
+ // last digit of significand
+ last = s0.size() - 5;
+ if (s0[last + 1] == 'e') {
+@@ -195,7 +195,7 @@ string formatDouble(double x, long int precision)
+ if (s0[last - 1] == '0') {
+ s1 = s0; // Recycle original string
+ } else if (useExp) {
+- s1 = fmt::format(fmt::format("{:.{}e}", x, precision - 2));
++ s1 = fmt::format(fmt::runtime(fmt::format("{:.{}e}", x, precision - 2)));
+ } else {
+ s1 = fmt::format("{:.{}f}", x, precision - log10x - 2);
+ }
+diff --git a/src/base/SolutionArray.cpp b/src/base/SolutionArray.cpp
+index 4819aaa756..986c3e2373 100644
+--- a/src/base/SolutionArray.cpp
++++ b/src/base/SolutionArray.cpp
+@@ -232,17 +232,19 @@ vector<string> doubleColumn(string name, const vector<double>& comp,
+ if (csize <= rows) {
+ for (const auto& val : comp) {
+ data.push_back(val);
+- raw.push_back(boost::trim_copy(fmt::format(notation, val)));
++ raw.push_back(boost::trim_copy(fmt::format(fmt::runtime(notation), val)));
+ }
+ } else {
+ dots = (rows + 1) / 2;
+ for (int row = 0; row < dots; row++) {
+ data.push_back(comp[row]);
+- raw.push_back(boost::trim_copy(fmt::format(notation, comp[row])));
++ raw.push_back(boost::trim_copy(
++ fmt::format(fmt::runtime(notation), comp[row])));
+ }
+ for (int row = csize - rows / 2; row < csize; row++) {
+ data.push_back(comp[row]);
+- raw.push_back(boost::trim_copy(fmt::format(notation, comp[row])));
++ raw.push_back(boost::trim_copy(
++ fmt::format(fmt::runtime(notation), comp[row])));
+ }
+ }
+
+@@ -292,17 +294,17 @@ vector<string> doubleColumn(string name, const vector<double>& comp,
+ // all entries are integers
+ notation = fmt::format(" {{:>{}.0f}}", over + maxLen);
+ }
+- maxLen = fmt::format(notation, 0.).size();
++ maxLen = fmt::format(fmt::runtime(notation), 0.).size();
+
+ // assemble output
+ string section = fmt::format("{{:>{}}}", maxLen);
+- vector<string> col = {fmt::format(section, name)};
++ vector<string> col = {fmt::format(fmt::runtime(section), name)};
+ int count = 0;
+ for (const auto& val : data) {
+- col.push_back(fmt::format(notation, val));
++ col.push_back(fmt::format(fmt::runtime(notation), val));
+ count++;
+ if (count == dots) {
+- col.push_back(fmt::format(section, "..."));
++ col.push_back(fmt::format(fmt::runtime(section), "..."));
+ }
+ }
+ return col;
+@@ -320,7 +322,8 @@ vector<string> integerColumn(string name, const vector<long int>& comp,
+ if (csize <= rows) {
+ for (const auto& val : comp) {
+ data.push_back(val);
+- string formatted = boost::trim_copy(fmt::format(notation, val));
++ string formatted = boost::trim_copy(
++ fmt::format(fmt::runtime(notation), val));
+ if (formatted[0] == '-') {
+ formatted = formatted.substr(1);
+ }
+@@ -330,7 +333,8 @@ vector<string> integerColumn(string name, const vector<long int>& comp,
+ dots = (rows + 1) / 2;
+ for (int row = 0; row < dots; row++) {
+ data.push_back(comp[row]);
+- string formatted = boost::trim_copy(fmt::format(notation, comp[row]));
++ string formatted = boost::trim_copy(
++ fmt::format(fmt::runtime(notation), comp[row]));
+ if (formatted[0] == '-') {
+ formatted = formatted.substr(1);
+ }
+@@ -338,7 +342,8 @@ vector<string> integerColumn(string name, const vector<long int>& comp,
+ }
+ for (int row = csize - rows / 2; row < csize; row++) {
+ data.push_back(comp[row]);
+- string formatted = boost::trim_copy(fmt::format(notation, comp[row]));
++ string formatted = boost::trim_copy(
++ fmt::format(fmt::runtime(notation), comp[row]));
+ if (formatted[0] == '-') {
+ formatted = formatted.substr(1);
+ }
+@@ -356,13 +361,13 @@ vector<string> integerColumn(string name, const vector<long int>& comp,
+ }
+
+ // assemble output
+- vector<string> col = {fmt::format(notation, name)};
++ vector<string> col = {fmt::format(fmt::runtime(notation), name)};
+ int count = 0;
+ for (const auto& val : data) {
+- col.push_back(fmt::format(notation, val));
++ col.push_back(fmt::format(fmt::runtime(notation), val));
+ count++;
+ if (count == dots) {
+- col.push_back(fmt::format(notation, ".."));
++ col.push_back(fmt::format(fmt::runtime(notation), ".."));
+ }
+ }
+ return col;
+@@ -381,31 +386,33 @@ vector<string> stringColumn(string name, const vector<string>& comp,
+ for (const auto& val : comp) {
+ data.push_back(val);
+ maxLen = std::max(maxLen,
+- boost::trim_copy(fmt::format(notation, val)).size());
++ boost::trim_copy(fmt::format(fmt::runtime(notation), val)).size());
+ }
+ } else {
+ dots = (rows + 1) / 2;
+ for (int row = 0; row < dots; row++) {
+ data.push_back(comp[row]);
+ maxLen = std::max(maxLen,
+- boost::trim_copy(fmt::format(notation, comp[row])).size());
++ boost::trim_copy(
++ fmt::format(fmt::runtime(notation), comp[row])).size());
+ }
+ for (int row = csize - rows / 2; row < csize; row++) {
+ data.push_back(comp[row]);
+ maxLen = std::max(maxLen,
+- boost::trim_copy(fmt::format(notation, comp[row])).size());
++ boost::trim_copy(
++ fmt::format(fmt::runtime(notation), comp[row])).size());
+ }
+ }
+
+ // assemble output
+ notation = fmt::format(" {{:>{}}}", maxLen);
+- vector<string> col = {fmt::format(notation, name)};
++ vector<string> col = {fmt::format(fmt::runtime(notation), name)};
+ int count = 0;
+ for (const auto& val : data) {
+- col.push_back(fmt::format(notation, val));
++ col.push_back(fmt::format(fmt::runtime(notation), val));
+ count++;
+ if (count == dots) {
+- col.push_back(fmt::format(notation, "..."));
++ col.push_back(fmt::format(fmt::runtime(notation), "..."));
+ }
+ }
+ return col;
+@@ -443,8 +450,8 @@ vector<string> formatColumn(string name, const AnyValue& comp, int rows, int wid
+
+ // assemble output
+ string notation = fmt::format(" {{:>{}}}", maxLen);
+- repr = fmt::format(notation, repr);
+- vector<string> col = {fmt::format(notation, name)};
++ repr = fmt::format(fmt::runtime(notation), repr);
++ vector<string> col = {fmt::format(fmt::runtime(notation), name)};
+ if (size <= rows) {
+ for (int row = 0; row < size; row++) {
+ col.push_back(repr);
+@@ -454,7 +461,7 @@ vector<string> formatColumn(string name, const AnyValue& comp, int rows, int wid
+ for (int row = 0; row < dots; row++) {
+ col.push_back(repr);
+ }
+- col.push_back(fmt::format(notation, "..."));
++ col.push_back(fmt::format(fmt::runtime(notation), "..."));
+ for (int row = size - rows / 2; row < size; row++) {
+ col.push_back(repr);
+ }
+diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp
+index 65e27c52d7..3e45009422 100644
+--- a/src/thermo/PureFluidPhase.cpp
++++ b/src/thermo/PureFluidPhase.cpp
+@@ -393,7 +393,7 @@ string PureFluidPhase::report(bool show_thermo, double threshold) const
+
+ string one_property = fmt::format("{{:>{}}} {{:<.5g}} {{}}\n", name_width);
+
+- string two_prop_header = "{} {:^15} {:^15}\n";
++ constexpr auto two_prop_header = "{} {:^15} {:^15}\n";
+ string kg_kmol_header = fmt::format(
+ two_prop_header, blank_leader, "1 kg", "1 kmol"
+ );
+diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp
+index 31b2c0ee9f..2b3993be35 100644
+--- a/src/thermo/ThermoPhase.cpp
++++ b/src/thermo/ThermoPhase.cpp
+@@ -1291,7 +1291,7 @@ string ThermoPhase::report(bool show_thermo, double threshold) const
+
+ string one_property = fmt::format("{{:>{}}} {{:<.5g}} {{}}\n", name_width);
+
+- string two_prop_header = "{} {:^15} {:^15}\n";
++ constexpr auto two_prop_header = "{} {:^15} {:^15}\n";
+ string kg_kmol_header = fmt::format(
+ two_prop_header, blank_leader, "1 kg", "1 kmol"
+ );
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index 0841e59154d6..d143684b32d5 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -1,5 +1,3 @@
-DIST libbraiding-1.2.tar.gz 380852 BLAKE2B 8d88861879e7566fa88f3a269c20efa4f37a692da6fd32736b695628a414cec0e03a01cb7a0cfcf20bd233fd21c15b070d9df3e0ee4951c9511949962b012f61 SHA512 f3dcfa77d5313ecfa91c0b9a61988eb2048dd27ed77f46a5c34fc57adb9eee53b250946a7158918b3198559bd016c723dba98465036d01c482b5c6000ab59d8a
DIST libbraiding-1.3.tar.gz 389034 BLAKE2B edc4fbe0a06afec3ddb9c3fa2d63f388ec16bb355100ecf1bb104f72ebf1975d92abc973e8ba118f5cafe998ea4587dc9f456a7a45d076cdae429d607c335a9b SHA512 da8c24183eeaf21a79cd7f723b0082e29e3185594b7cf6695e58de9677a64838da361220b35dd140c920d64dbf5cbf1f1c6f4129709c57efc5d624b766ccd69f
-EBUILD libbraiding-1.2.ebuild 566 BLAKE2B 5a168e7c76cdbda6f1a9553128de1643b619757f693ae1aec88fad06ad7e4b05b1bdaabdb279caa09348b5c162ee071d47e8f75ff31c62f8131a4460660226f1 SHA512 dc8a4b9335728ad6b4e652e4ec39f55e9eb64262fcf02e2c089a92b153fa47bfe8cb40effd4f1c78da37880e2012a1266863ebf32264d4aba47dfe67325279a0
-EBUILD libbraiding-1.3.ebuild 567 BLAKE2B 4db58e5b9bcabc8fe47e830a713d02c04874c720dbf4fb8c4de2c3c7ce6dcaac050c09696471f816c1d03b6744903d76f63d62f2bf08c618aac57709ec7878cb SHA512 f1d18c4534705345d9a74a65a375f1b4b6eba0f0d440efec7d07287b907903244548c459aac5cef857e6f952dffe55bc11ecedb24ed24ca313b5870b69e63d8e
+EBUILD libbraiding-1.3.ebuild 566 BLAKE2B 5a168e7c76cdbda6f1a9553128de1643b619757f693ae1aec88fad06ad7e4b05b1bdaabdb279caa09348b5c162ee071d47e8f75ff31c62f8131a4460660226f1 SHA512 dc8a4b9335728ad6b4e652e4ec39f55e9eb64262fcf02e2c089a92b153fa47bfe8cb40effd4f1c78da37880e2012a1266863ebf32264d4aba47dfe67325279a0
MISC metadata.xml 1040 BLAKE2B de527a0accea92adf75f22b086920888d621f9c3e24c1a136149af13f4eaa8fdf4127354d6805b5e50d1772c906ff1db7dfd906eb7156908e95b5058c1c490f7 SHA512 cf25e11fae981f51eb8b9a16db8495f49d27e2a1e038e29bdf41f836aa2d56e9204b8912b9725d333ea2e3ba75ab52303e784d6ac3bc82f83f5e44509d71ccba
diff --git a/sci-libs/libbraiding/libbraiding-1.2.ebuild b/sci-libs/libbraiding/libbraiding-1.2.ebuild
deleted file mode 100644
index cd88acc244ae..000000000000
--- a/sci-libs/libbraiding/libbraiding-1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Expose the functionality of cbraid as a shared library"
-HOMEPAGE="https://github.com/miguelmarco/libbraiding"
-
-SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-# A few source headers still say GPLv2, but I believe that to be an
-# oversight: https://github.com/jeanluct/cbraid/issues/4
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libbraiding/libbraiding-1.3.ebuild b/sci-libs/libbraiding/libbraiding-1.3.ebuild
index f0950f754d74..cd88acc244ae 100644
--- a/sci-libs/libbraiding/libbraiding-1.3.ebuild
+++ b/sci-libs/libbraiding/libbraiding-1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.g
# oversight: https://github.com/jeanluct/cbraid/issues/4
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
src_install() {
default
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index f85b0e00ebcb..ee32bae51ae1 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -4,6 +4,6 @@ AUX pcl-1.14.1-boost.patch 1155 BLAKE2B 09f41979ef2878bd062e14fc38e9525cea090729
AUX pcl-1.14.1-gcc15.patch 2070 BLAKE2B 9baa1eda8a751c832fe875d9f941214f854bf70e0feba4f2793aadd3421898c6ce580f488f0daa35d102b63bf0aba7015d3552d0f6c97e456b4dfb9c47203433 SHA512 a15b13aee5d1e727072066c549a131e58f81bc804c2d9bc67cbec6da11a881a19a5438051f3eea4ad7c63ca7b4d92bc3105cc8ff8d58621a46f61a364077e7c3
AUX pcl-1.14.1-tests.patch 785 BLAKE2B 3cd99c021f70dbf2239979772c642d60e1d4c0631b2c7dd7d732c0ed51ecfec2fa02e1c796115bd4242e0403524422f8a6a3fa0b1e47474d278770b5ea23a0b4 SHA512 0039aac3850b0fe29fb7ef416fc3f812462001c145406e196d60ab9ec4e4c325b3bd2e342bd423a89f9bc547c51ccd95184d8b548186b338b90f4b3262d5080c
DIST pcl-1.14.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b
-EBUILD pcl-1.14.1-r1.ebuild 2761 BLAKE2B f0f960fff2c09adf816f4e0e369028535f320908c855af734c88daa90000836bab96704cbe06d7a5ba998855ce4ecd735b5fcb7ace6f5f5c7c4aa9d73a6f87d5 SHA512 a4e59b4cf6e3f8a9cccdcb3065aa22bb2f2557cf5edb6302d8b29b259af0cd77564494b6e701edf51d5b0a84aa5bd32f81d630e9faf5a9444de7308095e0ef56
-EBUILD pcl-9999.ebuild 2722 BLAKE2B a6b3462cd72c1540e66d9e2a83ceb2d268165fcdfcd33efd5c54c27d38d81eea9d3e666b3a0d5dcb695edd845dbcfd77c38ed3d8a4207b0d281a6d20c1092558 SHA512 b20241abd527a32e14a5f17973f7e2cf394be7b3a20ef8a7443f81a29d4b75cdf2d6dbfc5f834e3313d1311554749b6360714539f68e9c5d460bd5ac728505b7
+EBUILD pcl-1.14.1-r1.ebuild 2764 BLAKE2B a9ef3a6e6df3b972772695dbc3af27c9e097cca8de84c948402ed4f358b516a2926d7de66ba4272baf3ad31f3f72f3c8665c185370c2d2e82eedaa06a0607b6f SHA512 79bfe1955093bf2015281fd67311f16182712ce84353f56be74493f9795e51556f8ed2852836659710edd76b7fde48ac7a84c295bbc9d75bae6d5ac4e968198c
+EBUILD pcl-9999.ebuild 2725 BLAKE2B 732a41647159d2615892ca9956f1bacdee47e005eb562018ad3071ae9ebf367b0da1ee401c6a9ce2a38a0d7403f3b8b73ab2ae29f490c386599559b9be5c8db9 SHA512 cf7fa80d405bd1594c5071b828e14ba7c3c6d940fe66dc91221e49abccd9c1903b6fe2cfe16ae485af1dac0e13c1217bc52ddf3724f1fdf68156e17c64a2a5e4
MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f
diff --git a/sci-libs/pcl/pcl-1.14.1-r1.ebuild b/sci-libs/pcl/pcl-1.14.1-r1.ebuild
index 774a3e660967..42b8092fcda8 100644
--- a/sci-libs/pcl/pcl-1.14.1-r1.ebuild
+++ b/sci-libs/pcl/pcl-1.14.1-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
qhull? ( media-libs/qhull:= )
qt6? (
dev-qt/qtbase:6[concurrent,gui,opengl]
- vtk? ( sci-libs/vtk[-qt5,qt6] )
+ vtk? ( sci-libs/vtk[-qt5(-),qt6] )
)
usb? ( virtual/libusb:1 )
vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 01025ec4ffd0..fee79ca912be 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
qhull? ( media-libs/qhull:= )
qt6? (
dev-qt/qtbase:6[concurrent,gui,opengl]
- vtk? ( sci-libs/vtk[-qt5,qt6] )
+ vtk? ( sci-libs/vtk[-qt5(-),qt6] )
)
usb? ( virtual/libusb:1 )
vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 12:46:29 +0000