diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
commit | 4187bba080530c5ca1c7dae9c233e88f3fc8f535 (patch) | |
tree | b6f535e053876097ced1b6bda14a4da890c730d4 /sci-libs | |
parent | 2a8d2f71d1d9963368e0ef3d641d75979a689d12 (diff) |
gentoo auto-resync : 06:07:2024 - 08:06:15
Diffstat (limited to 'sci-libs')
32 files changed, 689 insertions, 72 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 5542a8affe8c..48211c131d35 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index b56ebe476cba..c07d3ee342fa 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -6,5 +6,5 @@ DIST cfitsio-4.4.0.tar.gz 4278372 BLAKE2B 883a88b08ecddb756a479c361fd0dc4741cffd DIST cfitsio-4.4.1.tar.gz 4308170 BLAKE2B 237a2f899b39a01ed73e3e41b420874c7654faf1f93e3c3b3454d2001a472f64b1c44fa2c88598ea21e3a8d60a1dcb76aa3001fee1e4443f91bcd565ce605a4f SHA512 a49e4e09a2e5f6e0ae823a68f02b3f6285cf3e0af66c9a1f8dadcd2867fa83c17fd27e446e8e5af9374ff2dc7b7a18334663ce977a1691c4ed4ced14d33232b7 EBUILD cfitsio-4.2.0.ebuild 1877 BLAKE2B 3b541f0d4930b42d8ece6acdaa1be4e7c1443f84800b7642ff6dbb9f15125122f7ede4c07034e508d80fce187797faaac4ca370a19ecc99cc91cd37a15e6a485 SHA512 f5694ab2d6666d622427055987d635ec7063ddba754332cc0527a0aaacd6dda0359554ec13d08760f73508e9606fd517d93a571686748bf518cedcbfbb553ba5 EBUILD cfitsio-4.4.0.ebuild 1836 BLAKE2B 0ec49e9cc08b6179ee846e227b210d3d776fa2f2c551c6ca6658ac43ed503c6afcf8234916da4a51cb92cf1d5221959ad2b132159408049f5e262757b58afe05 SHA512 6bc6c8f1248271cf5754b9354bb8d76a2776fd963aac033c477b8a7be6c900d072f00117091eb9f55a8d7c52ef28500602adb65165d4818d026f7615e8f991f1 -EBUILD cfitsio-4.4.1.ebuild 1836 BLAKE2B 0ec49e9cc08b6179ee846e227b210d3d776fa2f2c551c6ca6658ac43ed503c6afcf8234916da4a51cb92cf1d5221959ad2b132159408049f5e262757b58afe05 SHA512 6bc6c8f1248271cf5754b9354bb8d76a2776fd963aac033c477b8a7be6c900d072f00117091eb9f55a8d7c52ef28500602adb65165d4818d026f7615e8f991f1 +EBUILD cfitsio-4.4.1.ebuild 1834 BLAKE2B a2b7edef58c55d580bda02eeacfbf1b6fcaf5ea40009c55d11531bf8271b34718f31692c2f80360699868a4ca5b55ed693f58eaaf5a2b5b9ef8366e90e3cd0f9 SHA512 0080082da08eb178ad80b5cdf45d5b3f6b1b76d82ed8dc9136b5d663c34427a3dffcbb2f84ec69a42f720a9c9970774a258604a0c893b7dcc1a75d2d1f367b11 MISC metadata.xml 1032 BLAKE2B 4479a1c6a42796e7effcc1b53ecc30d11e7302140cee2a34f7deaa1270497d0b0add85ddf1ce38223b357a9cac5f11af9039246f41228aca7d73653fd58a0fcf SHA512 ad32ecfbeceae8d768e9fa63386bdf89887d36ca18a68a72965b4f9206d779a26ece545d618540538246be5307c066e823ce55117208533cd9e668a6010222df diff --git a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild index a27f43704cab..6fb7875c3962 100644 --- a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz" LICENSE="ISC" SLOT="0/10" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="bzip2 curl test threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" RESTRICT="!test? ( test )" diff --git a/sci-libs/libpdb++/Manifest b/sci-libs/libpdb++/Manifest index 9e28351eff75..ea23a00f16d5 100644 --- a/sci-libs/libpdb++/Manifest +++ b/sci-libs/libpdb++/Manifest @@ -1,4 +1,4 @@ AUX libpdb++-040728-dynlib+flags.patch 1286 BLAKE2B c0a8b06bb4d6829facd08c4d7b52ebc9f1971bb05ee1e5d002408d4ab731a012d6f5a51683ada4812d39ebf7a1517892ccd40a15a904352ddb0e47268feaff9c SHA512 cd99a481a3e8b50bd414c51b0adb550bf7fe1d54f902a1464432ecdbe978a7ab73d0c9e522b45b34331ceecdfbe8943d0195cc01ec086ae85fb2bd48f720bffb DIST libpdb++-040728.shar 113174 BLAKE2B 5576691dfab8a4be63c658837eed9f15a2df83edeabf9353a8b668ed1d7d01c0438c25da4d197c08b49d25194b4d606a447995166a23b2e5485d24b6f4ee58c4 SHA512 4b3e4b12ea10395ba38fbc12fbb3589bd7b40997e1a0bcb79d3d0a495c361e4dea8dbdc4c434de290b5f62412e297df09742beeea0a8b881dbf92317013aa930 -EBUILD libpdb++-040728-r1.ebuild 822 BLAKE2B c69fc9a7a6abf5fcf5832aeb8d5a957d3e7ad2484d86947dd1a440490066be947464d9517b5f1f3e8f59bc3252b48cab03ee2a45cd8845eb44f9e3df605dd94a SHA512 03eab8f361c34a53c6f90db63d072e2274b1edc95fd45992dab9592f7fcbfe3b6631b9b41cb7a016ac4d9d156a414e253fb47e180ec5d3e91c8fb8e27beb4edf +EBUILD libpdb++-040728-r2.ebuild 768 BLAKE2B 4b44f44249150d4818806f138feee012c7b6c504da97c17ef49548616fd7c777d02bf6863c20a86816af5a3de71b202f342403c2a33df0bc20269ddd0df76366 SHA512 15f4fe4898146bc0ea358ac0762d64490bb3f54c41ccf141b6b20e00ef5df3a16875e53ead0acf50e4a2151c1d1cf5b10b1a0787f86afb1884015bc3b45669b3 MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368 diff --git a/sci-libs/libpdb++/libpdb++-040728-r1.ebuild b/sci-libs/libpdb++/libpdb++-040728-r2.ebuild index c4850098afdf..16b25e83c4af 100644 --- a/sci-libs/libpdb++/libpdb++-040728-r1.ebuild +++ b/sci-libs/libpdb++/libpdb++-040728-r2.ebuild @@ -1,29 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit multilib toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="PDB Record I/O Libraries -- c++ version" HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html" -SRC_URI="mirror://gentoo/${P}.shar" +SRC_URI="mirror://gentoo/f8/${P}.shar" +S=${WORKDIR}/${PN} -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" -RDEPEND="" -DEPEND="${RDEPEND} - app-arch/sharutils" - -S="${WORKDIR}"/${PN} +BDEPEND="app-arch/sharutils" PATCHES=( "${FILESDIR}"/${P}-dynlib+flags.patch ) src_unpack() { - "${EPREFIX}/usr/bin/unshar" "${DISTDIR}"/${A} || die + edo unshar "${DISTDIR}"/${A} } src_prepare() { diff --git a/sci-libs/libpdb/Manifest b/sci-libs/libpdb/Manifest index 8eccc1bead08..8dd78f2ff945 100644 --- a/sci-libs/libpdb/Manifest +++ b/sci-libs/libpdb/Manifest @@ -1,4 +1,4 @@ AUX libpdb-991112-dynlib+flags.patch 1142 BLAKE2B 32a7c2b11a4ace733bdf0f3bd92f8be9212a40a28c9d349fa4c04cf00ea2082bac659db4a53da4ed833b988b9cf5e82ac75c92bffd50be11896f67209424d5f3 SHA512 6d93db5444f4ecb6127afc5cb20e806c4de55c31d909540403ec73a861c09a577a6bb9e55e2f2a0dbfb35c2fe5093776724f5ed735f3519980b8dd87706c3870 DIST libpdb-991112.shar 123895 BLAKE2B 26b1de521fa2de1003dd34d4ce280a2c402484385ba61119ac6e1f13160bc5354e4c3668c686924c686c61c3328d7a0d4fbb0fc956d1329993045b3ff6e67835 SHA512 ae356997d11068736bbbd1a57e4e3a28fa54fd396326bc8fea41485186a1c69ce39c7f81195ae65ddc59c017d85dd123614f56f910c8faffd4791fcfd1b064f4 -EBUILD libpdb-991112-r1.ebuild 801 BLAKE2B 55b4d4df4e4c4679668691daedbde31d5186035da6ac99ea58e885d989f0682b21ae87c3eed17c6f7f3dbf4c669c654dde62974b1d93ff2f385bb4acabec47a1 SHA512 69c78e35e8f3f536a5781147c4dfff697c84fb7833f836b42036fbcd7fd7dade30fdf85c07cba5e463107bbee61d371001fd65442f66bcec467f1e342e1989e4 +EBUILD libpdb-991112-r2.ebuild 759 BLAKE2B e77c325616918d34a0472f62a798ec5507342e3f7424d4254aee35cb802c1efccf9a500cd2ec8cf61d2febda24cef0b8c53daf490a90f39f4d1627dc99801969 SHA512 9f6ca1d860eff3825333d3801978709af4fbd3dff54fb3cf0f14c6a6624e2b0c2e60cf69e8cc0f3bb7ecc3c0832c37235fcc542bdb4f6c18bc92a1eacc28c689 MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368 diff --git a/sci-libs/libpdb/libpdb-991112-r1.ebuild b/sci-libs/libpdb/libpdb-991112-r2.ebuild index 31d30652f13e..efaba36468dc 100644 --- a/sci-libs/libpdb/libpdb-991112-r1.ebuild +++ b/sci-libs/libpdb/libpdb-991112-r2.ebuild @@ -1,29 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="PDB Record I/O Libraries -- c version" HOMEPAGE="http://www.cgl.ucsf.edu/Overview/software.html" -SRC_URI="mirror://gentoo/${P}.shar" +SRC_URI="mirror://gentoo/90/${P}.shar" +S=${WORKDIR} -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs" -RDEPEND="" -DEPEND="${RDEPEND} - app-arch/sharutils" - -S="${WORKDIR}" +BDEPEND="app-arch/sharutils" PATCHES=( "${FILESDIR}"/${P}-dynlib+flags.patch ) src_unpack() { - "${EPREFIX}/usr/bin/unshar" "${DISTDIR}"/${A} || die + edo unshar "${DISTDIR}"/${A} } src_prepare() { diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index 43256c74837b..82f5cd30308a 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -5,8 +5,13 @@ AUX libsc-2.8.5-fix_build_system.patch 696 BLAKE2B fee1ddbd18c2e7155d22e86280247 AUX libsc-2.8.5-fix_cmake_path.patch 918 BLAKE2B 0c9a2a228e204f7255ca74418d44903357186898fac65e45fdf49e4f25d3985e0f7e51a11d80f4f3baaca2d9b8a1524e09a3cc75f66ec0837151b04c34ec6ab2 SHA512 c40db6baa1e440fb6ce37e24471a25dcd0ae020481991924ef57c4e980734359107bcb1d858d29f15d8c8d4da8d67b353e309276ec1103332697c92cb3401aea AUX libsc-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c AUX libsc-2.8.5-use_zlib-ng_symbols.patch 5332 BLAKE2B 6fdd57182822985c23ac3d45ad8008553973ceb76ad285cc6302812765fe1d82d3454bed2268dd0e628a09d582f66e866511d109a898880423603264d3f40f60 SHA512 f58ad84abac25b5462a5bd1b64dcc79f1154b1971bf6ced6d59fdb0933380fa936c55262e449f3d7f9722c5b57c05a60949864e4f7373d1f86848734a58842e5 +AUX libsc-2.8.6-fix_build_system.patch 641 BLAKE2B ef24fc29244bf931e6481740979d1d2716a0572c2ee8fa0def2922e899734c0142c36de4d131b37d8e63bc553d354724ee6bc41fdea409aa4fe6b04f2162781a SHA512 15c059611882992f86dd574d48322038809a9558cf90a8a45da25077aa8062c1c14c902acfc42ce99d94b34fc6ffd897750872ac7a057ff00728fdcb8ae14bd3 +AUX libsc-2.8.6-fix_cmake_path.patch 1228 BLAKE2B 2420122830f9370168f1a27ed72e0953aa326017fbdc1e94d6fc6a47010b65fbc35aaa70574afcbb9cfd6d93097e8397815fd682b2f48fbe2093288a0e88b930 SHA512 c0f4f56f472ac7a4235bcb024d26bebc122c88742ad7e0f0f5682d0e549ffeec8ec2f9b340a006ade804aec293e124e3fbaa5d7bfd568ecb1202a84ceed015f7 +AUX libsc-2.8.6-set_version.patch 1772 BLAKE2B e489b4c18cb466b420a8ace4c7bfeb347daa3873a2549f200006161a34ab22a1d7e92252d45ae9b5db3710f09619f620e183d46a784b8029b395ec33ddd13c4e SHA512 0011435d6519664aacab05115f3b9bc4d9c4b7393c78ec6199334456d3d991f1966a0f73f50512aa895d7c834d228733b7e404aae6440ad9c7ec2cdaaaffd75b DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b +DIST libsc-2.8.6.tar.gz 436045 BLAKE2B e0c9911ece10703d70686c5fa67700ed28f2ad2cfa6fc5e8f31c18fadb3e85c82a062520765589f71fbb8b69f2ebc9d07803488e8b0eae50d3146cefddb6c1ad SHA512 9e8d9256fafce3a583a9dc850308020ae614434e94146dc81bd1b8a3130e6ff55eb094d97fe48bf2b9205ea16906503313f1ebf4f3386db92d6cf0bac50c2d74 EBUILD libsc-2.3.6.ebuild 2338 BLAKE2B 2ce1905accf17c14090a169e843a75ae9faf8795959faebbf87c0d2e71e3b2a0276f81db52174ebc8cd44f711433262a5c7f08ed2c1365ed6a434666a2d7d99a SHA512 ebb0e95d78f14b63e45c863ad14e467f3a1e240e1aaf614d6cac5b872344cdd8cc8bd91d4d85033f190d84f45b790b9b57c215af20263016ed2caadb829aeffa EBUILD libsc-2.8.5-r3.ebuild 1680 BLAKE2B e820d8b2b50f851f3b91324be70ced3ce209e4bdb67c8f6d8e72fd2623dee38cd1c6b04f4f6eb65ae06889ace55ebff935d5227e305283a06af17cd13c7afa40 SHA512 6e01972efa8b64e63f33c557c802a6a464a2a55285eed17428b9bdbde991b0e800896ecf842ff097572176e889bf3ff2d491affe8e7070468ea59acf601b5c0b +EBUILD libsc-2.8.6.ebuild 1606 BLAKE2B 6adeb8367aff5adc4344ea006b3b0d5134118334de4282e1a355e5c862817b12baba6477e1ed7d730499f8a1629e2b6b1ea1e1381676716d2097ffa0267a1dd9 SHA512 f627dd06f34e432e53b8ed7d1a419d0e42a8c72ced9ac2ff27b76a25c44588a7df899201210d9ad7f165a874df0861e2b0658142b9f5003877c3d5cf1c2e8090 MISC metadata.xml 724 BLAKE2B 3a2a0065f7448d2348083615f24eb0ef7acb6e421b3a901269a746f6a846d959b56643f7bbd5e51de75c7712aa23253a49e9c8157368c070c79bc191c9c33161 SHA512 a9c39d5eb67ff8e83f3019f752b808797c70c7ce4267aad25514e17a151cbd73c368da9e5e3bd16a163724762e3315f250fb145609294c68422de9b80e7adec0 diff --git a/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch new file mode 100644 index 000000000000..ed0f30a1a7c8 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ebf6ef..0a14b19 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ HOMEPAGE_URL https://www.p4est.org/ + DESCRIPTION "The SC library supports parallel scientific applications." + VERSION ${PROJECT_VERSION}) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + enable_testing() + + include(GNUInstallDirs) +@@ -63,7 +65,10 @@ TYPE INCLUDE + FILES_MATCHING PATTERN "*.h" + ) + +-install(TARGETS sc EXPORT ${PROJECT_NAME}-targets) ++install(TARGETS sc EXPORT ${PROJECT_NAME}-targets ++ARCHIVE DESTINATION ${library_reldir} ++LIBRARY DESTINATION ${library_reldir} ++) + + add_subdirectory(src) + diff --git a/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch b/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch new file mode 100644 index 000000000000..6c8b65f32215 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch @@ -0,0 +1,40 @@ +diff --git a/cmake/install.cmake b/cmake/install.cmake +index edd8012..93f9301 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion + + install(EXPORT ${PROJECT_NAME}-targets + NAMESPACE ${PROJECT_NAME}:: +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/SC + ) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/SC + ) + + export(EXPORT ${PROJECT_NAME}-targets +diff --git a/cmake/pkgconf.cmake b/cmake/pkgconf.cmake +index 1a1b865..f5bab08 100644 +--- a/cmake/pkgconf.cmake ++++ b/cmake/pkgconf.cmake +@@ -17,14 +17,4 @@ set(pc_filename libsc-${git_version}.pc) + configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconf.pc.in ${pc_filename} @ONLY) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_filename} +- DESTINATION lib/pkgconfig) +- +-set(pc_target ${pc_filename}) +-set(pc_link ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/libsc.pc) +- +-install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ +- ${pc_target} \ +- ${pc_link} \ +- )" +- ) ++ DESTINATION ${library_reldir}/pkgconfig) diff --git a/sci-libs/libsc/files/libsc-2.8.6-set_version.patch b/sci-libs/libsc/files/libsc-2.8.6-set_version.patch new file mode 100644 index 000000000000..c37943e21c15 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.6-set_version.patch @@ -0,0 +1,48 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index 4718b8e..c2c594d 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,39 +1,6 @@ + # --- extract version from Git + +-set(PROJECT_MAJOR 0) +-set(PROJECT_MINOR 0) +-set(PROJECT_PATCH 0) +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${PROJECT_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball-version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}) +- endif() +-endif() ++set(PROJECT_MAJOR 2) ++set(PROJECT_MINOR 8) ++set(PROJECT_PATCH 6) ++set(PROJECT_VERSION 2.8.6) diff --git a/sci-libs/libsc/libsc-2.8.6.ebuild b/sci-libs/libsc/libsc-2.8.6.ebuild new file mode 100644 index 000000000000..19acc8bc484f --- /dev/null +++ b/sci-libs/libsc/libsc-2.8.6.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Support for parallel scientific applications" +HOMEPAGE="http://www.p4est.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="debug examples mpi openmp threads" + +RDEPEND=" + sys-apps/util-linux + sys-libs/zlib + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-set_version.patch + "${FILESDIR}"/${P}-fix_build_system.patch + "${FILESDIR}"/${P}-fix_cmake_path.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + # avoid using debug codepaths that are manually enabled with the + # RelWithDebInfo build type + local CMAKE_BUILD_TYPE="Release" + + local mycmakeargs=( + -Dmpi="$(usex mpi)" + -Dopenmp="$(usex openmp)" + -Dlibrary_reldir="$(get_libdir)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + +# rm -r "${ED}"/usr/include/getopt.h \ +# "${ED}"/usr/include/getopt_int.h \ +# "${ED}"/usr/include/sc_builtin || die "rm failed" + + mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${PF}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" +} diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index 89d34b01a956..9f8cdf918137 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -3,9 +3,15 @@ AUX p4est-2.3.6-override_soname.patch 612 BLAKE2B b34bc5c700446526d5e93e98692820 AUX p4est-2.8.5-fix_build_system.patch 717 BLAKE2B 87d73e6a40c4d3c4a63f81310f8fed7580c26c42d4f6e104d83ccaa05e9cade306da0b7897ed5dbad1c559b79cbec0c23b950406bc4eebf81c88942e19e2757c SHA512 b425ee30cb1e6754f2139e72984152fe3ed5df71fce1ae5d8ae797b7edd292159f700a13c431ba57177132dbe297606594a0e29aa4df407f6275e517536c3124 AUX p4est-2.8.5-fix_cmake_path.patch 1293 BLAKE2B 223471b591415a89fb62f503802a25b2e53aa16201a4582908b1e1f65701eef6d425a7c775cd6bd3d45e420cead3d2caf00fefb56591593d6033005596458cfb SHA512 cd0368b729fb6118ab0f5b48e91657e6e4452e77271178700873c9e890a5678dda5059e4679fb2770b711f45a02c12a0edbce9c154ab6ab6f456829557d745fb AUX p4est-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c +AUX p4est-2.8.6-fix_build_system.patch 720 BLAKE2B e367e81b27618320883b7e5a9e85ee7bfa6e9b7920e39ce96698f8bc7f91fd84b52cd3843773654827781c87bfd3e33558a4750b5e491477a202ab47baf8346d SHA512 1fe5dc6fbc1372420c3c4b0209f59e1477e6b7c992bb74d99748dc4856e1b5b3c6763d1c66b253ea93d6562bd56704af670222674414e977f4be17a774e7f7a1 +AUX p4est-2.8.6-fix_cmake_path.patch 1623 BLAKE2B 30ce39158adb3869dbfbdcad66114544b9bd1849234dac75f9d57b24fda53506c0d039f82cfec3a970253b37191a34d00488617f73ed598822f30e14fde020fe SHA512 e4ff2da317527525e2e5c7a3f394e6f385ad0ee64caae7248761ca9bc1251d43552da71822f28303af02c463e712c2cab3ac34d524cbe0185eba0f64749a3e4c +AUX p4est-2.8.6-set_version.patch 1772 BLAKE2B e489b4c18cb466b420a8ace4c7bfeb347daa3873a2549f200006161a34ab22a1d7e92252d45ae9b5db3710f09619f620e183d46a784b8029b395ec33ddd13c4e SHA512 0011435d6519664aacab05115f3b9bc4d9c4b7393c78ec6199334456d3d991f1966a0f73f50512aa895d7c834d228733b7e404aae6440ad9c7ec2cdaaaffd75b +AUX p4est-2.8.6-use_external_sc.patch 357 BLAKE2B 7e0ac11712c3eb0fc947f1483a7b086628006e892e0a11c532d938a8edb62f0de37157a3d8fdf6913f9128fb9b58214bfa7b3af9a669a6d4167f34903b7ae411 SHA512 c26e460cbf515e8a4da7028751d688dd9f8d0d4107c7186280705797157d9e03ce2ba7547adf4888d6a957e53d6f9960544ab20959417553e0938d9a7c418d28 DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117 DIST p4est-2.3.6.tar.gz 2645384 BLAKE2B f6763e6a5b8b371eeead8a9d6481ea63e01ec5f13ea0dd9748aeaaec5551d39ac5d73f75f92275bfe61370e578ba1b1d0940c569e48fbd83997eaad4ab65b088 SHA512 99df91ee9d351cc889a532764096428e3f575c5f71199fca9f217c3dac5030a263308aa9c698476e7a12774d0751409f27e70ac2e9cd27847b2345b3f909b195 DIST p4est-2.8.5.tar.gz 2721258 BLAKE2B 07fd70f5b7ce0d2dcdc0d913cd9ae7920272a0e459c7db7f9d180b592570a5232c7d2bd03547eec3333dcdc6fdc83adcce30c71eb9c44ab6e6b9b9a314707471 SHA512 22b5a9bbfb51e972f4b93a90f5fa0f9557770ccbe357044b5bb97b31d02783affef188cde38c86bb4ece31ba23ce47e4eb95a6e7c5f02d11549cf986e85f68a0 +DIST p4est-2.8.6.tar.gz 4589078 BLAKE2B 7f868cf38aa4e0abc50b4c1071ca39ada2fa9cc973f31bb0365eb1bf447f9a23fa570ada525b1482cb8120a534582cf978ccae83048d27c439ea07572171e928 SHA512 e5892cf153cb4204c2ae3c1389c6a872113b037abda1d0f95df062ad2651a2231b1e3cabdc8e86f3f61ad021274a069acf7ec801281164740a8018ac46b07c96 EBUILD p4est-2.3.6.ebuild 2926 BLAKE2B 3c837d7d93f8ec1513a465707552dc1f3e014fc57867f5c12358abf73226147e9422becb42ece3d57fecdb4f858721a68dc3a9bcb6c785f96acfb9131e237733 SHA512 2e3a698a59218906a7490c808224ac8c5902c639fba96ad5d26fe4f828f9d96e037dc605d958fc0934fefbe842e9aa07e06be8c7b50312b731066b449e52c1e7 EBUILD p4est-2.8.5-r3.ebuild 1733 BLAKE2B d98f17da8af76900a6b8016d021caa26b965befd8f49342a97b567ee1951bbf9588990866eab62d2c38acb3debc7c904b3c50c02c5f07b4e991c818e956a6308 SHA512 bbf7e2e87ef6f4e868d88a50819a052ea91468babe1958b0065b8de23ec2b022564a216ba0ca99d59a15c3b8307bd2f6f6a1d76ca28210f44838a07a486d0099 +EBUILD p4est-2.8.6.ebuild 1661 BLAKE2B 94fa83b83742a5c6512dcb96df77ed4e7c8e030bcfc2aa4ae7ecffdcc948476ae178f7ee133691827af06ce4db4dc74ed816c9e50cd3a1e711799b6081dc6e6f SHA512 5b05eb5985aae5fd61d7740baaddc592b17fea910605e5c0d00b3df9ae5d42e8b968c4cade5ac0eda62ed57707da48b3c10f475f408472956ff3a873787ee6f1 MISC metadata.xml 933 BLAKE2B dbebf4c49f70183487e695e63b78c412260956c197dce7471145c8eb150672fcd7223d1ab4b81c793c0147bc77c49f235fbf31949581d760d077c0ca61e72a0b SHA512 228cade7cf570c4e5f629ae64b8fef9cb3635556f2ad52bc31c34480cc148ace1d2ebcb59563d02f1cc94f21a863c6077e8acc9b58b01d0519962c1580d836c5 diff --git a/sci-libs/p4est/files/p4est-2.8.6-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8.6-fix_build_system.patch new file mode 100644 index 000000000000..02119d362415 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-fix_build_system.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 95013ba..6d10c7c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ + DESCRIPTION "p4est manages a collection---a forest---of octrees in parallel." + VERSION ${PROJECT_VERSION}) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + enable_testing() + + # --- user options +@@ -47,7 +49,10 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/ + TYPE INCLUDE + FILES_MATCHING PATTERN "*.h") + +-install(TARGETS p4est EXPORT ${PROJECT_NAME}-targets) ++install(TARGETS p4est EXPORT ${PROJECT_NAME}-targets ++ ARCHIVE DESTINATION ${library_reldir} ++ LIBRARY DESTINATION ${library_reldir} ++ ) + + #--- p8est + diff --git a/sci-libs/p4est/files/p4est-2.8.6-fix_cmake_path.patch b/sci-libs/p4est/files/p4est-2.8.6-fix_cmake_path.patch new file mode 100644 index 000000000000..55bd118d9a51 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-fix_cmake_path.patch @@ -0,0 +1,54 @@ +diff --git a/cmake/install.cmake b/cmake/install.cmake +index f4f92c4..0f31976 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -4,7 +4,7 @@ include(CMakePackageConfigHelpers) + + configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake +-INSTALL_DESTINATION cmake ++INSTALL_DESTINATION ${library_reldir}/cmake/P4est + ) + + write_basic_package_version_file( +@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion + + install(EXPORT ${PROJECT_NAME}-targets + NAMESPACE ${PROJECT_NAME}:: +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/P4est + ) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}ConfigVersion.cmake +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/P4est + ) + + # --- CPack +diff --git a/cmake/pkgconf.cmake b/cmake/pkgconf.cmake +index 590d7be..0c46f9d 100644 +--- a/cmake/pkgconf.cmake ++++ b/cmake/pkgconf.cmake +@@ -4,18 +4,8 @@ set(pc_req_private "ompi ompi-c orte zlib") + + set(pc_req_public "p4est sc") + +-set(pc_filename p4est-${git_version}.pc) ++set(pc_filename p4est.pc) + configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconf.pc.in ${pc_filename} @ONLY) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_filename} +- DESTINATION lib/pkgconfig) +- +-set(pc_target ${pc_filename}) +-set(pc_link ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/p4est.pc) +- +-install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ +- ${pc_target} \ +- ${pc_link} \ +- )" +- ) ++ DESTINATION ${library_reldir}/pkgconfig) diff --git a/sci-libs/p4est/files/p4est-2.8.6-set_version.patch b/sci-libs/p4est/files/p4est-2.8.6-set_version.patch new file mode 100644 index 000000000000..c37943e21c15 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-set_version.patch @@ -0,0 +1,48 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index 4718b8e..c2c594d 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,39 +1,6 @@ + # --- extract version from Git + +-set(PROJECT_MAJOR 0) +-set(PROJECT_MINOR 0) +-set(PROJECT_PATCH 0) +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${PROJECT_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball-version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_PATCH "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_MINOR "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(PROJECT_MAJOR "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${PROJECT_MAJOR}) +- endif() +-endif() ++set(PROJECT_MAJOR 2) ++set(PROJECT_MINOR 8) ++set(PROJECT_PATCH 6) ++set(PROJECT_VERSION 2.8.6) diff --git a/sci-libs/p4est/files/p4est-2.8.6-use_external_sc.patch b/sci-libs/p4est/files/p4est-2.8.6-use_external_sc.patch new file mode 100644 index 000000000000..b46f5882e6b8 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8.6-use_external_sc.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index da1b21a..77fee88 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,9 +20,7 @@ message(STATUS "p4est ${PROJECT_VERSION} " + + # --- external libs + +-include(cmake/GitSubmodule.cmake) +-git_submodule("${PROJECT_SOURCE_DIR}/sc") +-add_subdirectory(sc) ++find_package(SC REQUIRED) + + # --- configure p4est + diff --git a/sci-libs/p4est/p4est-2.8.6.ebuild b/sci-libs/p4est/p4est-2.8.6.ebuild new file mode 100644 index 000000000000..ac7398a0b90a --- /dev/null +++ b/sci-libs/p4est/p4est-2.8.6.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" +HOMEPAGE="http://www.p4est.org/" + +LIBSC_VERSION="${PV}" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" +else + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" + +# TODO petsc +IUSE="debug doc examples mpi openmp threads +vtk-binary" + +RDEPEND=" + ~sci-libs/libsc-${LIBSC_VERSION}[mpi=,openmp=,threads=] + sys-apps/util-linux + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-fix_build_system.patch + "${FILESDIR}"/${P}-set_version.patch + "${FILESDIR}"/${P}-fix_cmake_path.patch + "${FILESDIR}"/${P}-use_external_sc.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + # avoid using debug codepaths that are manually enabled with the + # RelWithDebInfo build type + local CMAKE_BUILD_TYPE="Release" + + local mycmakeargs=( + -DP4EST_ENABLE_MPI="$(usex mpi)" + -Dlibrary_reldir="$(get_libdir)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + mkdir -p "${ED}"/usr/share/doc/${PF} + mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${PF}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" +} diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest index fdecc1d36f3f..d537d7c34abe 100644 --- a/sci-libs/scalapack/Manifest +++ b/sci-libs/scalapack/Manifest @@ -1,4 +1,6 @@ DIST scalapack-2.1.0-gcc10.patch 231026 BLAKE2B dacecca8307cd2bf7a20e6453fb17bc1f5a3f2926b6d8f3b89f7f8d34993368574804f0427f228de4525f2b2d73105de561588ba5a4d2fb609d5ed035f51ddc9 SHA512 a11057599639c167e907f8e4d45204174fd326e2ffb9e2d05533db23d8e2dd8cfc1d37f06d5502baa3d5714092fbf4638cf4d9fea84ca9d4fb150e21cc57861e DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2 SHA512 0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4 +DIST scalapack-2.2.0_p20240704.tar.gz 4776451 BLAKE2B 927f6af5196c350cb48bdc0e2a6af40e8212045150b976367852926decabafa13dd5a9b680ad4aa1fce051b5fe3987ee9c034042ffdbba7fde4175847313f96b SHA512 ddd37cd4291f00fbdd9c27d23849238d2f32807b0fba86301cb73a6463f1b4feaf97a5c492ab6ac1c01139f0d1d7d06af898ec90366e5812b6524538812a53ea EBUILD scalapack-2.1.0-r1.ebuild 2022 BLAKE2B e9652e19ae412a257fcaaa0bc65455e798f3de89e151765555fd5f6591af068f133b52e5960ff5592c781ebffe5cf9bfb834d69aac3e5a9a09437f26eb1eb1fc SHA512 be296f5dbf49adff1eb1e0e09b9b2c5a6acbc80df598a4f0f2adea658ecbb1e05e9ecc0bbd1d7f6ffe06b371c852884d503b3f921b8a4e6df70d3d33b1f2eaba +EBUILD scalapack-2.2.0_p20240704.ebuild 2030 BLAKE2B ee4372788a1c9764c8013097223c18ed1278ca3b54b6a0e2767c7dd8edada6fdc44caaccc1ba98ce3a446378f618bb4ac6b74abc56c55577d99353ec8992c510 SHA512 cd8b22eb85a72ee9d7cd3776985d7a7fd84b89819b120aac3be565c9a8faa3b10229de8df1954340c9d24f2bed83980c70a87359459d1de86db3fdff8ad9ef0d MISC metadata.xml 663 BLAKE2B 1ee0fc27d42f7a31f6cd38f7c4af6ac8a9010c40c2460409bb2e8885fb29c8c4345da17465a7b730d819712ed0b5324798de8b1e0ac6731928ba1f20ec78778f SHA512 bc348c99f67c4bec37415a716093d1dbdc429e1923b8850af8c4c23c801377296cac49764bae89fb8d3b5e403b37d995f06f127573cb9681e7caf4a20655c051 diff --git a/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild new file mode 100644 index 000000000000..ce98c63fc31a --- /dev/null +++ b/sci-libs/scalapack/scalapack-2.2.0_p20240704.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic fortran-2 toolchain-funcs + +# 2024/07/04 master branch containing 45 commits on top of 2.2.0 +COMMIT_HASH="0234af94c6578c53ac4c19f2925eb6e5c4ad6f0f" + +DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing" +HOMEPAGE="https://www.netlib.org/scalapack/" +SRC_URI="https://github.com/Reference-ScaLAPACK/${PN}//archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT_HASH}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + virtual/lapack + virtual/mpi[fortran] +" +DEPEND="${RDEPEND}" + +PATCHES=( ) + +src_prepare() { + cmake_src_prepare + + if use static-libs; then + mkdir "${WORKDIR}/${PN}_static" || die + fi + # mpi does not have a pc file + sed -i -e 's/mpi//' scalapack.pc.in || die +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862924 + # https://github.com/Reference-ScaLAPACK/scalapack/issues/95 + # + # Do not trust it for LTO either. + append-flags -fno-strict-aliasing + filter-lto + + scalapack_configure() { + local mycmakeargs=( + -DUSE_OPTIMIZED_LAPACK_BLAS=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + -DBUILD_TESTING=$(usex test) + $@ + ) + cmake_src_configure + } + + scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \ + -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON +} + +src_compile() { + cmake_src_compile + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_compile +} + +src_install() { + cmake_src_install + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_install + + insinto /usr/include/blacs + doins BLACS/SRC/*.h + + insinto /usr/include/scalapack + doins PBLAS/SRC/*.h +} diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest index 34526d37a6d4..ebfcb0d1c3e9 100644 --- a/sci-libs/sundials/Manifest +++ b/sci-libs/sundials/Manifest @@ -2,7 +2,9 @@ AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aed DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b DIST sundials-6.5.0.tar.gz 89142911 BLAKE2B 3605686f813928fe55e5aafd409c478cf782411b5d2e510121fe15cc15eae84a5d0fe7470c7c0c976fbe11e7f0fd0e9fb449ae45b4c34aa077ac1acb25255cf5 SHA512 30ad3d3f998df6a6381a14b0c8fe247a5507e386ed1b9b55afae87b976f15026d7b4e8609c3cf8423ad79e1b55bade40dc66b274dc3422e040cb12fec981d502 +DIST sundials-7.0.0.tar.gz 91813927 BLAKE2B 5fab34e674473078812e9a7be43d19ac2595adf7d6f7b71f90375546578eaf42f7e45d1d6297dbedbbc454fb84f741c4e5a4e43766dfc2774ac5dadfcb3295d7 SHA512 4f818124985d6083c6c1a9d34ae2f7d8e6f9a5ca1c1c01e8d00d2b516fdd34eb634c9e601c8a0d1515f198a70d3c1f11118da99a48b4d067464312b02d8265a9 EBUILD sundials-5.8.0.ebuild 2922 BLAKE2B d90a5297532a3e628c91d0b12407114dcc2fbded5017ddea1bdaae32b1ed8636f6a91ae190caf7e6eed86838816dbb141e27f28a49c0758f9b70323cf405764b SHA512 a2b20585f61e573e2988d1849ecddddbd99c5b2c68974ce2dc85e3f6213b6d1ff0b3e8afbbf901e1956f00213823e25b2ac2c7bc7da890c712641bd6a4bf839c EBUILD sundials-6.2.0.ebuild 2886 BLAKE2B 63750f4301cc0f29d731e2b29e72bd84a6a187238b4a9dd109d483a7a0ebb15d0e37363380ab89423ebfd473285869e59288fe2937679cb593d6c4002935bf75 SHA512 ed8dd6ce603750074044538debab684a8ce4389a1c511e7f5490b650070e329baa1bc821f338772f77cd68f34a17d9b46b6dd25c9777c83c1f9625ea46f30831 EBUILD sundials-6.5.0.ebuild 2828 BLAKE2B 414e26d2c7f42a6aa5827ce63315ea619678c46a14a1219cb738528118f55207fcccef8696aa93152c6619e8069a432665a41afb72500d69e5397b11198ae39e SHA512 a43351cb5774f4023ea09cdb714f5f395d1f3c6eb54a829ec82f28ed2673379e06f3f6e5f264423c640cbcd3acffb83ad85e30da50de9aebbbf09c6c295e9b4d +EBUILD sundials-7.0.0.ebuild 2611 BLAKE2B c571dd5c708a1bc558b31f5c35879459ea30db72f904068dd796ba828c6496caeff418328ead3bf8c0a5f7aead3941c7d95c4a8487e6855f2e54642d9ec0237a SHA512 a57678f359366c7c0a17d1b024651e7b2984005e14704e0bf53881985dd7a8b0b8ef5a5396b03ac87806de4fa6bea0d499265aaaf23e83a3dfaf77124ed26b3d MISC metadata.xml 1170 BLAKE2B b2ddcc6f5a958ed045bea77fef0c8842f76fd9f3756bd82870bd605b7dcf5ae5be64c0b5a00a248d17518d0411c90f6b9da539aa5b35bf00d532f84867ed46cf SHA512 539f5e1c372b48f0f6d81a444b52c0ab2a80ecf3e7d278ed870d7189c330e8bfa3c296ddc4ea10e09029b7e44860cde62af6a4bda58d4bcd841704f5920ca23d diff --git a/sci-libs/sundials/sundials-7.0.0.ebuild b/sci-libs/sundials/sundials-7.0.0.ebuild new file mode 100644 index 000000000000..e3baf22eb43e --- /dev/null +++ b/sci-libs/sundials/sundials-7.0.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR="emake" +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD="77 90 2003" +# if FFLAGS and FCFLAGS are set then should be equal + +inherit cmake flag-o-matic fortran-2 toolchain-funcs + +DESCRIPTION="Suite of nonlinear solvers" +HOMEPAGE="https://computing.llnl.gov/projects/sundials" +SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1)" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads" +REQUIRED_USE=" + fortran? ( static-libs ) + hypre? ( mpi ) +" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + lapack? ( virtual/lapack ) + mpi? ( + sci-libs/hypre:=[fortran?,mpi?] + virtual/mpi[fortran?] + ) + sparse? ( sci-libs/klu ) + superlumt? ( sci-libs/superlu_mt:=[int64=] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.8.0-fix-license-install-path.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + # bug #707240 + append-cflags -fcommon + use threads && append-ldflags -pthread + + cmake_src_prepare +} + +src_configure() { + # undefined reference to `psolve' + # undefined reference to `psetup' + # https://bugs.gentoo.org/862933 + # https://github.com/LLNL/sundials/issues/97 + filter-lto + + mycmakeargs+=( + -DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran) + -DBUILD_SHARED_LIBS=ON + -DBUILD_STATIC_LIBS=$(usex static-libs) + -DENABLE_HYPRE=$(usex hypre) + -DENABLE_KLU=$(usex sparse) + -DENABLE_LAPACK=$(usex lapack) + -DENABLE_MPI=$(usex mpi) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_PTHREAD=$(usex threads) + -DENABLE_SUPERLUMT=$(usex superlumt) + -DEXAMPLES_INSTALL=ON + -DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples" + -DSUNDIALS_INDEX_SIZE="$(usex int64 64 32)" + -DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt" + -DSUPERLUMT_LIBRARY="-lsuperlu_mt" + ) + + if use fortran; then + mycmakeargs+=( + -DFortran_INSTALL_MODDIR="${EPREFIX}/usr/$(get_libdir)/fortran" + ) + fi + + if use hypre; then + mycmakeargs+=( + -DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre" + -DHYPRE_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libHYPRE.so" + ) + fi + + if use sparse; then + mycmakeargs+=( + -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + use doc && dodoc doc/*/*.pdf +} diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 860350be0038..694229c7118f 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -4,14 +4,15 @@ AUX vtk-9.2.2-vtkGeometryFilter-add-missing-mutex-header-file.patch 625 BLAKE2B AUX vtk-9.2.5-Add-include-cstdint-to-compile-with-gcc-13.patch 939 BLAKE2B f97780f5cb469f403615817c76862183604dcebbc40cc6024b708b6be692018654397f389d62015b2a8f0b6bf55ebe41e3d3f60f66fc74829e0cccec2d8a00b9 SHA512 6dfb504500ff35ba98e9610b1d8b868990b933c94789df3bacf155ee212cecb81132754d5b8f0bb82181638ae0d3b47478ae42d2b75fcc9cf5c51be3c2f7ff0a AUX vtk-9.2.5-Fix-compilation-error-with-CUDA-12.patch 780 BLAKE2B 4ec89cdd78560910c6aef7113282556008bc8e182ddab2800a3facfc568e90e547c85b8da54386347d7d1b73896b206c77f90a1f0363acbfdbfc2fcd09f5c1e4 SHA512 5db82e3224cd7e07850cd1fc41af91577fdaa10b13d151cf8b02c16eb5c6962a58920c4bf643aaf1b8ddf2644c814c23809df29e976542098d4c1d86f52fa2d7 AUX vtk-9.2.5-More-include-cstdint-to-compile-with-gcc13.patch 957 BLAKE2B 75c8a9929a047db44b541e4bf5c8f58163bdfe1fe68183023577405378f59d78ef7722142a92273626785595fef370362939cd48aaf8a5d642421f5c5e09b7d2 SHA512 8179a31cb7dd50a2e0d0b7719354c1294e8a1997894303e75595464040b5c9340e33cc36064b0f300ac238e86bdd1b00570e23f0156a8542a568f65ee97d9fa1 -AUX vtk-9.2.5-pegtl-3.x.patch 5130 BLAKE2B 3e94c9f95c08b361b66342c9b6b3210e57f12609db583d676b506ecb2804fee4ea4b4b7517ae1a2f04404f5ad64952370a485a965da0826a4eab37b6fab8527e SHA512 a9dae6fdbee230f6095b7f0efe0630dc87e55c8870f6971bd0634a407bc66289f7e5ff19811f5f99d9664a4fefdca8630dbc2695964d6d15d6167c49dd8156b7 -AUX vtk-9.2.6-Java21.patch 678 BLAKE2B ce4ee7023672d51875e50f9b5bbf96ded80cbbc1a0c89e04afa53cd9ec616ea3cd9619fb05f255d79b68631f80d481935694d1c734a4225b756d998bb2480180 SHA512 e281906cae0a592aa7068118c63a797e0431348fb5fbeb703602fc4aab2149ae445d42d3b2323bbf297a9b0632a1b32646d15820788d64dcc557b446ee56cafe -AUX vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch 2713 BLAKE2B 541eaa4fb8845c44a7d051b01cbbb06c5a6976e00ee18a067d9cf2ab3155a6d9c76d5eb2e3d5fd2fb5f816933637893c0bddd209cd1bdb2e73f182ba86e17d4f SHA512 134cdf91f9a06691c61342fe93122523c62cdcc652814b09aaf0609ab44addf38444cc5ac9d9ccd7e8643ae4d47b7826fcfc44d55afa0ef6046e13dbe1a5619d +AUX vtk-9.2.5-pegtl-3.x.patch 4679 BLAKE2B 0c0be426ac07c2dcab275fb84ef68f6fe3e914d83a9434ef07b2d184bd313ed2ce62d471531c330a32cc734f7b3fcb8859a0c49c8bc5ac461191c86ea9755778 SHA512 75e8a740a784ba811eff27f0ba60d8889b24f97b1fcdf7feda4a73f0324d36060d7b35dba74bf6de2a16136201dc772ee5825e93ec0e5337e74299baea3444a0 +AUX vtk-9.2.6-Java21.patch 573 BLAKE2B ec4fac0a029cc3ef7285f1526aedd19232c67479f754c2e55d29b2316ea7322f07513f85bc4311c7acc4b4d4fcdbc3231cccb93d963293cd05a78f3dc88e0654 SHA512 a7f36c27a147a9f93aa20c807244f9b79aac45452eb4bca7ecdaf9cf9778f0575d5af742f4209b67c455e556bba354354a728407937c348c6d923775fd30c80a +AUX vtk-9.3.0-ThrustPatches.patch 2026 BLAKE2B e51c72b9d2bfb0e7e968f1c9f0896a70d6215f60d21dd234c26feb7a47653c46c8d75b24b1ab0286e51d228b6c4ff7fefd34c01f5b8e885dc1cab6190fc9c6f7 SHA512 b326839c82682e7c1fc1e19d836fb55837417bbf0c23ccb28edc84dd519f085cce0a07221bf6c9e794d1b8a73ecd77c154f82cb602feef9e8d8962b2e8fabd92 +AUX vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch 2356 BLAKE2B 45e2569239b5dcd4e26a007746179cb1743cc4269f82d2fff2cdb2d5188f47cf84315ddb850f2dcc602595d928569c41f986ed6677fabf52e91a0b15b8ed3225 SHA512 dff1bb8d4480ef7d8f6672015c11c29bc7ac2ee396f473c388b236b30326978b80b0a557cc8910fce34f9c54db9ef31b7a1440c930faf83c5b4acca9ecbee99c AUX vtk-9.3.0-java.patch 372 BLAKE2B ec11a69bf2e7b467b00648b0bc725f838f9931bce2f2cd1cbabe6d4c8fdcd4ef807dd14eedf06d524eecc3c9bc77850cc8de5e55ceaf8a238efa501c8bb36cf9 SHA512 6d326f95b05fd86d87a0566e45efb484d92d482a916895d3aaca1e019ceac65ecbcdab2957a8686545898551a3382aa718a57ad0d9e9cd16937166bf3f0729d8 -AUX vtk-9.3.0-opencascade-7.8.0.patch 916 BLAKE2B edd240aa7f0c30224b688b03e8594a661c3e669b395cfdf203450c5f2715b40731ef6885e1c946067444c01989d92c9d1d2034a58b56a47b73148e37f5c46da0 SHA512 64478fff2bd05aecc2079cf867a44b6d4b49d377b29752376053329df614b798ab6e80db4c055a1fac943c0b9877c443a618e755494dd0badea2852692f82703 -AUX vtk-9.3.0-opencascade.patch 723 BLAKE2B 0157fe53c98daf255381e1090105ea6e0d7df92e8af2e3420b58c24b3541cfcc0c41573ef64421d7b1c6650fde0a99158fe3bd5795127af9dbd5becdfa72bf0b SHA512 23c17adc6aa83ad7e1606ace6f14546767588cdae18e6d77b8dad7eca92fea185153c7f13c2b9fba0054d150f2fb79782e95b093d7cdd1b1f53febcbcf8d2f55 -AUX vtk-9.3.0-pdal-2.6.0.patch 2125 BLAKE2B 5268aad6012fdd699f8b02e74135411507eed1d3c978cfb6db9ad0ab3bbc2b57913623556bffd7364371c2a52ab302746751fd55bdd98d90e48d97598bf81755 SHA512 e7289707272e67639f17049d97c379dac69557d05b526ee8a8ecca97e02c1af9a33ffbace13255074a867349425caae89ca545bca0bdcc936b38301c2cb81217 -AUX vtk-9.3.0-too-many-initializer-values.patch 1048 BLAKE2B b189eae7d6fd24c646b05d7fd3aa3d18adb1b515bd8f63f5d3b069f1bc9628205581bf09bd458dc384aa14109bb7c71d55b3a4db99ed4e2af3ba9a494bfc93f4 SHA512 bbf07317f23b41205feca053257038163c4603bef43eb008664b7b273660cd36704e217d90dd370ccdd2c10620b6403e830f1c6f4352d32fc615e53b866b1fcc +AUX vtk-9.3.0-opencascade-7.8.0.patch 819 BLAKE2B 51f4af785af5f44b21b641a631fe63c5e308558d573c03d02646691fd3762dce89670be80da2284769fe30129861982a062aea8574c90ea7472d7875ba8b2fbb SHA512 6d3bec28921d7e3b61fa10cbe68a529190248519f67d52365b0d73f2ce265aae028b7db4601b60c13fdd309db8b4164f2134961acf27e8f0778ec649674442a0 +AUX vtk-9.3.0-opencascade.patch 624 BLAKE2B 8188da64b12213074a4093ee0dd047fcf91a777742492dfe0cb1e93b597c23e78406e4783b3cdff23ffcac81655efa370bb3746a69d166edd138ec45beeb5c09 SHA512 1a0da4ffb822a038a13201d83f1cf6b42d4438073ea35fe3654d9e907e20c12306b47a511b72cb843097327a186b36560e2590ded47ce73aa8eb5a7655664236 +AUX vtk-9.3.0-pdal-2.6.0.patch 1748 BLAKE2B 9210b5ceceb95a5d74bd7ed4815faf809206bf3f66bc1606cf17124abfab6252a87285561fd9a3e0b1e542d981e714b3e5d1ae2137672beb9bc3c25d3f5afced SHA512 59cd68181857ffb3e428f6ae46b807fda6b3e1c1d4985e31f13b7d7ff177368e1ea65fa7e4bb5ce0d004ba7a9d1aef54e4e231111f05f638ddce8b360213f2f0 +AUX vtk-9.3.0-too-many-initializer-values.patch 976 BLAKE2B ae9863f867988e1202c2fba8ded3a9c610e8dd3b731eb32f1a687faa36b011e027f5b2cea435b38f9f0eb6d6d8114cb64b60a03b9c379d2c77745fe3840fdb28 SHA512 9a935eb4b7c3eea6d9e13ba4616de1717d29732f3cfc8cd08d52cc5c4c76af336574d9e10c2546c55f5d2afae7e89f571cf91f78945abae47f15388a158bd9e5 DIST VTK-9.2.5.tar.gz 53807732 BLAKE2B 8d25ec8f23c12868b2321eca84644dbf44704e58b7b79b2fd3a1260f7a240a78e4007fd99633ba93359103afc8ec00c7fa84f62778aed3d3361e1774a87b5626 SHA512 b1f225fb2589449621fd32bb0fc3f4817478d972cdccf7a9a376f1c17e93d5bd0a0511cdaa8587568a4baac9dfa8b5ffb9041442e221cd98d8f55e9981b6fcbf DIST VTK-9.2.6.tar.gz 53810904 BLAKE2B e3f9736a9b38415e0edd4b4c4bfe83aa154221c3c2c582e527996f88386b1b4d7864ddd2a364c0e83596ff45902cb7cde548ac3a4eebe06c2e43925c2608c4d3 SHA512 f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc DIST VTK-9.3.0.tar.gz 99932810 BLAKE2B 59c2cdfe1c2525ac0f89df77a668783d928b55d2e72b42df45ea9b789da1bb150d52ce4108f2bc39cb8840cdd1998f57d3aedf96c72e402f6115d9efeebf4486 SHA512 2722dc8186779df1af5c534f26b20186ea33cb3bca2cef8cb333542b12e738382616e26e8d4d0341cb98c30403f8a896d77ddb04adb07e26d0d548c4a34b7d2f @@ -32,5 +33,5 @@ DIST vtkDocHtml-9.2.6.tar.gz 158833419 BLAKE2B 04686ee0373191fec454738b5e745f3f6 DIST vtkDocHtml-9.3.0.tar.gz 165538725 BLAKE2B 27874998679090d5442ecb3a394b53db05a0215cfee9f912bd01af1d5567efc51b4f56dacb960401195da4f3d385b335bbefc922a45d0199c99d619df0941f08 SHA512 8bf9cc87c4653a65ccc39d88d70b421a7b4353986d380cbf558cbf6e8a96435695a5d54aa7ce5bb1240cb46ca0fd9225a51183a39d1af1101d3f2876a2afc10b EBUILD vtk-9.2.5.ebuild 22724 BLAKE2B 1fe02d01fd571e3380583065e28836bcb3b0378d9df4a93dfc4dccefbeecd803ae5b673b821b2a913f500316557f6cb6366f9c80927e845e3154963f0a884539 SHA512 4dff1da0cf7ddcea778e11aea77ded3a888689d8dede37d2655ed977f05b556f16da60d9614dfd1feecd6074449863b95a20040afe4e6ef0e838ad0315ae0353 EBUILD vtk-9.2.6-r1.ebuild 22763 BLAKE2B f5ba2e95174b98a0b34903b47e43da6bc6577e0769eb85a7a527704c676113faee6cf8ba3ee40a51d26e1d0bcbc7cee0d1265c7cfe38656a2d5182cbfb97cd7a SHA512 76b99e5c231a889678c4ee1fc2166bf5539c9324a57b555e65f1cfed89106178cdf6ec20aed9b84448a924477d4fad851b84c6551abbf9531ea846834012a5b4 -EBUILD vtk-9.3.0.ebuild 36083 BLAKE2B 4b9c04887502a880f1ed9fa856e130f1b72eb58c645414f3d362f29ccefd52847f8a90b571c15c86fc940ca7f98a9a65399d9dc54e542a6437cf666a64c1f39b SHA512 2b1bd0d562c4374dbe99ac42d1e70995ef477f906301722c9d1320683ccd04b246838412ee916c8249a920034db5c796d6cdac3bf8ade6c6ecbf070b5039d45f +EBUILD vtk-9.3.0.ebuild 36130 BLAKE2B e02cf224c42457e68cc13a747d144ed13ec27b52ed6bd097ea050abee7017e76381e8b8da75066f28884d497ca59474ef46a6649a6cbc244892135c355186c07 SHA512 dbeb59c67d33cee7a550beaefdee93513fd8f7df5cf06dfb3a8c7fcf60703d2dce6a998da874eac2a0b5a70ab371dc6150c062714066caa5931f2d1bbbf3b36e MISC metadata.xml 1696 BLAKE2B facd22a703e2ffda9e2a4ac8ad61855eadc47a9d0397117d7bf5516f31561c4eda178c607055c964dfbde4d1c3feb0f125085775e3c147389bee17151b21b744 SHA512 4289a0b9a96a012e94b2f33cd18481884ee04f3c21ead3d024b29c8d45dfe1247ea450e17e72488ea0f547946c55b0e8872015197f0785efd7ffcfe7bf203cbe diff --git a/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch b/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch index 80838b9c45be..e330e1837c90 100644 --- a/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch +++ b/sci-libs/vtk/files/vtk-9.2.5-pegtl-3.x.patch @@ -4,8 +4,6 @@ From: https://github.com/microsoft/vcpkg/pull/29730 Date: Sat, 18 Feb 2023 10:12:04 +0100 Subject: [PATCH 1/3] [vtk] update pegtl to version 3 -diff --git a/IO/MotionFX/vtkMotionFXCFGGrammar.h b/IO/MotionFX/vtkMotionFXCFGGrammar.h -index dba137386..4cb03e054 100644 --- a/IO/MotionFX/vtkMotionFXCFGGrammar.h +++ b/IO/MotionFX/vtkMotionFXCFGGrammar.h @@ -23,7 +23,7 @@ @@ -17,8 +15,6 @@ index dba137386..4cb03e054 100644 // clang-format on namespace MotionFX -diff --git a/IO/MotionFX/vtkMotionFXCFGReader.cxx b/IO/MotionFX/vtkMotionFXCFGReader.cxx -index 338aa736e..374e54b94 100644 --- a/IO/MotionFX/vtkMotionFXCFGReader.cxx +++ b/IO/MotionFX/vtkMotionFXCFGReader.cxx @@ -1213,7 +1213,7 @@ bool PositionFileMotion::read_position_file(const std::string& rootDir) const @@ -48,8 +44,6 @@ index 338aa736e..374e54b94 100644 } return false; } -diff --git a/ThirdParty/pegtl/CMakeLists.txt b/ThirdParty/pegtl/CMakeLists.txt -index 9bbd4c828..0cdb1f53d 100644 --- a/ThirdParty/pegtl/CMakeLists.txt +++ b/ThirdParty/pegtl/CMakeLists.txt @@ -5,7 +5,6 @@ vtk_module_third_party( @@ -60,9 +54,7 @@ index 9bbd4c828..0cdb1f53d 100644 TARGETS PEGTL::PEGTL STANDARD_INCLUDE_DIRS) -diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake -index 73eee02f7..22d8bc159 100644 ---- a/CMake/FindPEGTL.cmake +--- a/CMake/FindPEGTL.cmake +++ b/CMake/FindPEGTL.cmake @@ -19,31 +19,43 @@ # Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com> diff --git a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch index 08d4c0bf633f..b7b2e233cdb4 100644 --- a/sci-libs/vtk/files/vtk-9.2.6-Java21.patch +++ b/sci-libs/vtk/files/vtk-9.2.6-Java21.patch @@ -1,5 +1,3 @@ -diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt -index 01f3f93d..3afd78cf 100644 --- a/Wrapping/Java/CMakeLists.txt +++ b/Wrapping/Java/CMakeLists.txt @@ -201,10 +201,10 @@ set(VTK_JAVA_TARGET_VERSION "<DEFAULT>" CACHE STRING "javac target version") diff --git a/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch b/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch new file mode 100644 index 000000000000..82525e75d914 --- /dev/null +++ b/sci-libs/vtk/files/vtk-9.3.0-ThrustPatches.patch @@ -0,0 +1,51 @@ +From 4a4466e7c8cd44d2be2bd3fe6f359faa8e9547aa Mon Sep 17 00:00:00 2001 +From: Kenneth Moreland <morelandkd@ornl.gov> +Date: Tue, 4 Jun 2024 10:04:42 -0400 +Subject: [PATCH] Disable Thrust patch that is no longer needed in modern + Thrust + +There is a Thrust patch that works around an issue in Thrust 1.9.4 +(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue +should be fixed in recent versions. In recent versions of CUDA, the patch +breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). + +This change fixes the problem by disabling the patch where it is not +needed. +--- /dev/null ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/docs/changelog/obsolete-thrust-patch.md +@@ -0,0 +1,9 @@ ++# Disable Thrust patch that is no longer needed in modern Thrust ++ ++There is a Thrust patch that works around an issue in Thrust 1.9.4 ++(https://github.com/NVIDIa/ThirdParty/vtkm/vtkvtkm/vtk-m/thrust/issues/972). The underlying issue ++should be fixed in recent versions. In recent versions of CUDA, the patch ++breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818). ++ ++This change fixes the problem by disabling the patch where it is not ++needed. +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/exec/cuda/internal/ThrustPatches.h +@@ -170,9 +170,9 @@ ALIGN_RE_PAIR(vtkm::Int64, vtkm::Float64); + #undef ALIGN_RE_PAIR + } + } +-#endif //THRUST_VERSION >= 100900 ++#endif //THRUST_VERSION >= 100900 && THRUST_VERSION < 100906 + +-#if THRUST_VERSION >= 100904 ++#if (THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) + //So for thrust 1.9.4+ (CUDA 10.1+) the stateless_resource_allocator has a bug + //where it is not marked as __host__ __device__ && __thrust_exec_check_disable__. + //To fix this we add a new partial specialization on cuda::memory_resource +@@ -236,7 +236,7 @@ public: + }; + } + } +-#endif //THRUST_VERSION >= 100903 ++#endif //(THRUST_VERSION >= 100904) && (THRUST_VERSION < 100909) + + + #if THRUST_VERSION < 100900 +-- +GitLab + diff --git a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch index 1b06b59a996e..7dd005ff4191 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch @@ -9,13 +9,6 @@ distinguish them as individual types that are distinct from 'int' or 'unsigned int'. So when a method is overloaded with both 'int' and an enum type, only one of the overloads can be wrapped. The 'int' (or 'unsigned int') is the one that is chosen. ---- - Wrapping/Tools/vtkParseJava.c | 3 ++- - Wrapping/Tools/vtkWrapJava.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Wrapping/Tools/vtkParseJava.c b/Wrapping/Tools/vtkParseJava.c -index 36b58dda425..9f1544561f3 100644 --- a/Wrapping/Tools/vtkParseJava.c +++ b/Wrapping/Tools/vtkParseJava.c @@ -248,9 +248,10 @@ void return_result_native(FILE* fp) @@ -30,8 +23,6 @@ index 36b58dda425..9f1544561f3 100644 static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG, VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 }; -diff --git a/Wrapping/Tools/vtkWrapJava.c b/Wrapping/Tools/vtkWrapJava.c -index d629cc5c8a8..009853d2a89 100644 --- a/Wrapping/Tools/vtkWrapJava.c +++ b/Wrapping/Tools/vtkWrapJava.c @@ -639,9 +639,10 @@ void OutputFunctionResult(FILE* fp) diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch index 4adec4944492..0e6410c18ea0 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade-7.8.0.patch @@ -16,8 +16,6 @@ set(opencascade_missing_targets) foreach (opencascade_req_target IN LISTS opencascade_req_targets) if (NOT TARGET "${opencascade_req_target}") -diff --git a/IO/OCCT/vtkOCCTReader.cxx b/IO/OCCT/vtkOCCTReader.cxx -index 52e76be..7235309 100644 --- a/IO/OCCT/vtkOCCTReader.cxx +++ b/IO/OCCT/vtkOCCTReader.cxx @@ -348,7 +348,7 @@ public: diff --git a/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch index e26caecf497c..d7e0e3f9556c 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-opencascade.patch @@ -1,7 +1,5 @@ From: https://gitlab.archlinux.org/archlinux/packaging/packages/vtk/-/blob/main/vtk-occt.patch From: Sven-Hendrik Haase <svenstaro@archlinux.org> -diff --git a/IO/OCCT/vtkOCCTReader.h b/IO/OCCT/vtkOCCTReader.h -index 36a02f5be3..33fa45fccc 100644 --- a/IO/OCCT/vtkOCCTReader.h +++ b/IO/OCCT/vtkOCCTReader.h @@ -48,8 +48,8 @@ public: diff --git a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch index 98ab24334fd4..261f3736eb3d 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch @@ -6,12 +6,6 @@ Subject: [PATCH 1/2] IOPDAL: Always links with pdalcpp pdal_base and pdal_utils libraries are removed in PDAL 2.6.0 link with pdalcpp instead starting from this version. ---- - IO/PDAL/CMakeLists.txt | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/IO/PDAL/CMakeLists.txt b/IO/PDAL/CMakeLists.txt -index c31af0410f4..b83a9334109 100644 --- a/IO/PDAL/CMakeLists.txt +++ b/IO/PDAL/CMakeLists.txt @@ -3,14 +3,20 @@ vtk_module_find_package(PACKAGE PDAL VERSION 2.1) @@ -50,12 +44,6 @@ From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com> Date: Fri, 10 Nov 2023 10:12:32 +0100 Subject: [PATCH 2/2] Add support for PDAL 2.0 version ---- - IO/PDAL/CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/IO/PDAL/CMakeLists.txt b/IO/PDAL/CMakeLists.txt -index b83a9334109..a7027524e4f 100644 --- a/IO/PDAL/CMakeLists.txt +++ b/IO/PDAL/CMakeLists.txt @@ -23,4 +23,13 @@ vtk_module_add_module(VTK::IOPDAL diff --git a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch index 13b6bf94a4ec..52c37250c7e7 100644 --- a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch +++ b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch @@ -1,5 +1,5 @@ ---- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx 2023-11-14 00:37:21.000000000 +0100 -+++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx 2023-11-19 17:09:22.089595938 +0100 +--- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx ++++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx @@ -334,7 +334,7 @@ auto TransformForScalarRange(const ArrayHandleType& src, const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) diff --git a/sci-libs/vtk/vtk-9.3.0.ebuild b/sci-libs/vtk/vtk-9.3.0.ebuild index e2f30ffb2241..cc7a1a438652 100644 --- a/sci-libs/vtk/vtk-9.3.0.ebuild +++ b/sci-libs/vtk/vtk-9.3.0.ebuild @@ -164,6 +164,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.3.0-java.patch" "${FILESDIR}/${PN}-9.3.0-opencascade.patch" "${FILESDIR}/${PN}-9.3.0-fix-Java-error-with-integer-enum-overloads.patch" + "${FILESDIR}/${PN}-9.3.0-ThrustPatches.patch" ) DOCS=( CONTRIBUTING.md README.md ) |