summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/Manifest.gzbin44797 -> 44802 bytes
-rw-r--r--sci-libs/ginkgo/Manifest2
-rw-r--r--sci-libs/ginkgo/ginkgo-1.6.0.ebuild57
-rw-r--r--sci-libs/libsc/Manifest7
-rw-r--r--sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch57
-rw-r--r--sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch25
-rw-r--r--sci-libs/libsc/files/libsc-2.8.5-set_version.patch49
-rw-r--r--sci-libs/libsc/files/libsc-2.8.5-use_zlib-ng_symbols.patch135
-rw-r--r--sci-libs/libsc/libsc-2.8.5.ebuild (renamed from sci-libs/libsc/libsc-9999.ebuild)10
-rw-r--r--sci-libs/p4est/Manifest5
-rw-r--r--sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch24
-rw-r--r--sci-libs/p4est/files/p4est-2.8.5-set_version.patch49
-rw-r--r--sci-libs/p4est/p4est-2.8.5.ebuild (renamed from sci-libs/p4est/p4est-9999.ebuild)9
13 files changed, 420 insertions, 9 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 2a353b3d075a..3dced5fb19f1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
Binary files differ
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index 42b73d6041b0..d6bc9fefd7d7 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -1,3 +1,5 @@
DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
+DIST ginkgo-1.6.0.tar.gz 12788830 BLAKE2B c452e20eddb3673b5863106d8a8d42aab253cb5a17cf0445194903ebadcffe53ef0df6b5f26e2602e137faaa4a23dddd0b192f3453b4bd440907385fc09d004a SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50
EBUILD ginkgo-1.4.0-r3.ebuild 1267 BLAKE2B 509ac83701e30924c09f1ff6b4c56e6c2ebebec69e8debc96fbaafa3110a6cc81437f81ad20d77ef7b9cf6341be87e82bcea20fd0191b6baf5c8f32909eca037 SHA512 1801ec71a30814acd8e521e313a722ce472edffb20d10cd627093360ab62b9ee10d09e27dd4ffdeff0bd8f153e636d9fad45268a262e1619d3def6cd952e7965
+EBUILD ginkgo-1.6.0.ebuild 1267 BLAKE2B d7e69b9e90d288357763198c1fbbbc6f222928e647227b0de848c6ed1c97d36324a8571c0e3459b4f027bb21b8ad1f77268f3994e955f80942e321efcde5dc64 SHA512 82f8f8264622f1f810b2561bee1e4a057d259d332a52e1816e98088bb6a4530e1ff822ff287f98d1cd742d4ec9b436e2beb81c5691c63cdeea6228d6c1e992e8
MISC metadata.xml 892 BLAKE2B cedbb29c9e43c4b94baff1c5c7f657e9120792fe5faf0b4dab621b17579c6c82ccc3c07ee216bf45cc83b12d44fdcedaaf0736b56611b6abcb114224c2070856 SHA512 2051aabc0746015724bb7bf3f9be42097990b5a7d2657f51f8ed448e2b7f8f6ac27be208d33f133bf1098f2785b4b1b6eac27244e05337e4b80ffdfda10ec664
diff --git a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
new file mode 100644
index 000000000000..00081e5e00a7
--- /dev/null
+++ b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Numerical linear algebra software package"
+HOMEPAGE="https://ginkgo-project.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+IUSE="cuda hwloc +openmp"
+
+RDEPEND="
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ hwloc? ( sys-apps/hwloc:= )
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ sed -i \
+ -e "s#\"lib\"#\"$(get_libdir)\"#g" \
+ -e "s#\"lib/#\"$(get_libdir)/#g" \
+ cmake/install_helpers.cmake || die "sed failed"
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DGINKGO_DEVEL_TOOLS=OFF
+ -DGINKGO_BUILD_TESTS=OFF
+ -DGINKGO_BUILD_BENCHMARKS=OFF
+ -DGINKGO_BUILD_REFERENCE=ON
+ -DGINKGO_BUILD_CUDA=$(usex cuda)
+ -DGINKGO_BUILD_HWLOC=$(usex hwloc)
+ -DGINKGO_BUILD_OMP=$(usex openmp)
+ )
+ cmake_src_configure
+}
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 0483555b8dcb..189fca1b716e 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,7 +1,12 @@
AUX libsc-2.8.3-fix_build_system.patch 1192 BLAKE2B aab3161036987ad1027266c03730141142ab0e86c292dd827cc7010a6cb7a3ba43153bec8bc8319bca80cc5ec97efc9fd10b2f47d126e235fe7d948bf78a6acc SHA512 84264530c72d71f2b77c16037e389f4423e3acda8bba4443ec3d0a4e0d46a1eb6ae3ef85973a56ea990d19987799e1dfc682dee0a039f598f9ef122a262f01f6
AUX libsc-2.8.3-set_version.patch 1514 BLAKE2B 59e06b4f4d33a641e66ff862ca212b4106dd98214b411a95340c8069ec0cef6c70ac467fa01b94e61a16cd0222cfa5e50c56f6ed088958bfbaeaea2272c1c477 SHA512 20723ffda489e249ed2af124f4ca13b6f477dfc09d7bdc07e8c36f55fd0d168807543b6573b3e1d86fd1200b6982d7a755d7b9b04c39097f39f38aeba5b67e2d
+AUX libsc-2.8.5-do_not_compile_zlib-ng.patch 1866 BLAKE2B 1c9bfc20a1e62fd1cdd51393db6b2419f0e3f04dfc05e1af64a3cb42bc5bbf032b35e2bcc435cbe9800e53f2011906d22a26287ab7a6a4c85f44a2bddf839903 SHA512 c2041844d47308fa0d17b74f20fd9408bca2fe458674cdf7f4180700b0c9407451c48d5bb7a8bd3ff90f8958d9fc8a1007cc6164d1eb4f9d016fd4102a862250
+AUX libsc-2.8.5-fix_build_system.patch 696 BLAKE2B fee1ddbd18c2e7155d22e862802479ccc0435fde2678e6c7b9ff59d11ba84751186fe2576b8ea9a6a08739680407d37c2e5b764084324383dd2f1d5b6d2bf9c3 SHA512 1ec73af77dcd467c0b00069cb96f594f422c631421b5d48b4225d8fe6b237bc388ff3e2f1a76007e15b3a228662d2630366149ba438f1c2b332c0e419419ab1c
+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-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845
DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de
+DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b
EBUILD libsc-2.8.3.ebuild 1410 BLAKE2B f4654f5c21f62903c0a41e101acf83963972d3d4c243991c909930b8ea85bf601d5b879875bc736ece50bf0fc9ba15140de6cd960ac42532e3866b7c2cd3e388 SHA512 bc4edc505cbee1411027ea8869c8d4feab0006e8fb873cea02f9db59bb4a82f55c7d1391e4dca153e80e5292864120d7baa96f63c83290d0167492e43c381c33
-EBUILD libsc-9999.ebuild 1417 BLAKE2B ecdf34e21086e08c1716f020056ecb36ee8ff98b56fa3b544de22194cb545d848069a01de7ecca14a0a7111b27adfb56116f3f544ae7bb79fca071634e921898 SHA512 cbaaf4392a37220a02580af80884c0c763f1bb34a891219d404f942606e6c394b6f8c3fbe73970909dc0430c8db4ed68f9821c793bf41b481d16ee6c57764a38
+EBUILD libsc-2.8.5.ebuild 1553 BLAKE2B e3c3fe30bca48ac74c1c8814899a8aa0ca62817d6dc5c3c64d5d05d7ca417d5a8523c4eea3d6f999d83f9f2a07b042745e3deca768c2a5283a5bdadbfe17d344 SHA512 330117234019065cc86f00bf258ac8f826b9b8f133727382e1bfc27d0fa56d5b1ad832ee2ddb8444752dab27a0731372b86099199173e28e61423c85acf16e28
MISC metadata.xml 631 BLAKE2B 190ee7659d372a9152c32e63d436d460a4c2755b4ad42805e400c337430c7031382fdbbc0acf52eb8f5463ef57166d7605f122b0d1884a07aac09d6e878f11bb SHA512 22e5ae0f31b8b6a0ce8df978b473d22d1bed1da057511a58d421b4b6f60e195fc5de71c5ece88ab518ae2d36b7fd96ecd70f61e934b0352cea204990a011a052
diff --git a/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch b/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch
new file mode 100644
index 000000000000..fb0ce0de7dbb
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.5-do_not_compile_zlib-ng.patch
@@ -0,0 +1,57 @@
+diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
+index 5ca9f6d..86b9035 100644
+--- a/cmake/zlib.cmake
++++ b/cmake/zlib.cmake
+@@ -1,51 +1,8 @@
+ # build Zlib to ensure compatibility.
+ # We use Zlib 2.x for speed and robustness.
+ include(GNUInstallDirs)
+-include(ExternalProject)
+
+-set(ZLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
+-
+-if(BUILD_SHARED_LIBS)
+- if(WIN32)
+- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}zlib1${CMAKE_SHARED_LIBRARY_SUFFIX})
+- else()
+- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
+- endif()
+-else()
+- if(MSVC)
+- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX})
+- else()
+- set(ZLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}z${CMAKE_STATIC_LIBRARY_SUFFIX})
+- endif()
+-endif()
+-
+-set(zlib_cmake_args
+--DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+--DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+--DCMAKE_BUILD_TYPE=Release
+--DZLIB_COMPAT:BOOL=on
+--DZLIB_ENABLE_TESTS:BOOL=off
+--DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+--DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+-)
+-
+-ExternalProject_Add(ZLIB
+-GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng.git
+-GIT_TAG 2.0.6
+-GIT_SHALLOW true
+-CMAKE_ARGS ${zlib_cmake_args}
+-BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
+-TLS_VERIFY true
+-CONFIGURE_HANDLED_BY_BUILD ON
+-INACTIVITY_TIMEOUT 60
+-)
+-
+-# --- imported target
+-
+-file(MAKE_DIRECTORY ${ZLIB_INCLUDE_DIRS})
+-# avoid race condition
++find_library(ZLIB_LIBRARIES NAMES z-ng)
+
+ add_library(ZLIB::ZLIB INTERFACE IMPORTED GLOBAL)
+-add_dependencies(ZLIB::ZLIB ZLIB) # to avoid include directory race condition
+ target_link_libraries(ZLIB::ZLIB INTERFACE ${ZLIB_LIBRARIES})
+-target_include_directories(ZLIB::ZLIB INTERFACE ${ZLIB_INCLUDE_DIRS})
diff --git a/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch
new file mode 100644
index 000000000000..6adfbf31c997
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.5-fix_build_system.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87af1b1..82cb357 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,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(cmake/options.cmake)
+@@ -57,7 +59,10 @@ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ 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)
+ add_subdirectory(example)
diff --git a/sci-libs/libsc/files/libsc-2.8.5-set_version.patch b/sci-libs/libsc/files/libsc-2.8.5-set_version.patch
new file mode 100644
index 000000000000..061081a0da9e
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.5-set_version.patch
@@ -0,0 +1,49 @@
+diff --git a/cmake/git.cmake b/cmake/git.cmake
+index f88e984..f04f52b 100644
+--- a/cmake/git.cmake
++++ b/cmake/git.cmake
+@@ -1,39 +1,5 @@
+-# --- 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 ${CMAKE_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(git_version 2.8.5)
++set(PROJECT_MAJOR 2)
++set(PROJECT_MINOR 8)
++set(PROJECT_PATCH 5)
++set(PROJECT_VERSION 2.8.5)
diff --git a/sci-libs/libsc/files/libsc-2.8.5-use_zlib-ng_symbols.patch b/sci-libs/libsc/files/libsc-2.8.5-use_zlib-ng_symbols.patch
new file mode 100644
index 000000000000..74827050243b
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.5-use_zlib-ng_symbols.patch
@@ -0,0 +1,135 @@
+diff --git a/src/sc_containers.c b/src/sc_containers.c
+index 47c86d7..b9a1979 100644
+--- a/src/sc_containers.c
++++ b/src/sc_containers.c
+@@ -23,7 +23,7 @@
+
+ #include <sc_containers.h>
+ #ifdef SC_HAVE_ZLIB
+-#include <zlib.h>
++#include <zlib-ng.h>
+ #endif
+
+ /* array routines */
+@@ -636,13 +636,13 @@ sc_array_checksum (sc_array_t * array)
+ unsigned int crc;
+ size_t bytes;
+
+- crc = adler32 (0, Z_NULL, 0);
++ crc = zng_adler32 (0, Z_NULL, 0);
+ if (array->elem_count == 0) {
+ return crc;
+ }
+
+ bytes = array->elem_count * array->elem_size;
+- crc = adler32 (crc, (const Bytef *) array->array, bytes);
++ crc = zng_adler32 (crc, (const Bytef *) array->array, bytes);
+
+ return crc;
+ #else
+diff --git a/src/sc_io.c b/src/sc_io.c
+index a7ed413..bc2df7d 100644
+--- a/src/sc_io.c
++++ b/src/sc_io.c
+@@ -25,7 +25,7 @@
+ #include <sc_puff.h>
+ #include <libb64.h>
+ #ifdef SC_HAVE_ZLIB
+-#include <zlib.h>
++#include <zlib-ng.h>
+ #endif
+
+ #ifndef SC_ENABLE_MPIIO
+@@ -706,7 +706,7 @@ sc_io_encode_zlib (sc_array_t *data, sc_array_t *out,
+ #ifndef SC_HAVE_ZLIB
+ input_compress_bound = sc_io_noncompress_bound (input_size);
+ #else
+- input_compress_bound = compressBound ((uLong) input_size);
++ input_compress_bound = zng_compressBound ((uLong) input_size);
+ #endif /* SC_HAVE_ZLIB */
+ sc_array_init_count (&compressed, 1,
+ SC_IO_ENCODE_INFO_LEN + input_compress_bound);
+@@ -715,9 +715,9 @@ sc_io_encode_zlib (sc_array_t *data, sc_array_t *out,
+ sc_io_noncompress (compressed.array + SC_IO_ENCODE_INFO_LEN,
+ input_compress_bound, data->array, input_size);
+ #else
+- zrv = compress2 ((Bytef *) compressed.array + SC_IO_ENCODE_INFO_LEN,
+- &input_compress_bound, (Bytef *) data->array,
+- (uLong) input_size, zlib_compression_level);
++ zrv = zng_compress2 ((Bytef *) compressed.array + SC_IO_ENCODE_INFO_LEN,
++ &input_compress_bound, (Bytef *) data->array,
++ (uLong) input_size, zlib_compression_level);
+ SC_CHECK_ABORT (zrv == Z_OK, "Error on zlib compression");
+ #endif /* SC_HAVE_ZLIB */
+
+@@ -993,9 +993,9 @@ sc_io_decode (sc_array_t *data, sc_array_t *out,
+ }
+ #else
+ uncompsize = (uLong) encoded_size;
+- zrv = uncompress ((Bytef *) out->array, &uncompsize,
+- (Bytef *) (compressed.array + SC_IO_ENCODE_INFO_LEN),
+- ocnt - SC_IO_ENCODE_INFO_LEN);
++ zrv = zng_uncompress ((Bytef *) out->array, &uncompsize,
++ (Bytef *) (compressed.array + SC_IO_ENCODE_INFO_LEN),
++ ocnt - SC_IO_ENCODE_INFO_LEN);
+ if (zrv != Z_OK) {
+ SC_LERROR ("zlib uncompress error\n");
+ goto decode_error;
+@@ -1120,9 +1120,9 @@ sc_vtk_write_compressed (FILE * vtkfile, char *numeric_data,
+ base64_init_encodestate (&encode_state);
+ for (theblock = 0; theblock < numregularblocks; ++theblock) {
+ comp_length = code_length;
+- retval = compress2 ((Bytef *) comp_data, &comp_length,
+- (const Bytef *) (numeric_data + theblock * blocksize),
+- (uLong) blocksize, Z_BEST_COMPRESSION);
++ retval = zng_compress2 ((Bytef *) comp_data, &comp_length,
++ (const Bytef *) (numeric_data + theblock * blocksize),
++ (uLong) blocksize, Z_BEST_COMPRESSION);
+ SC_CHECK_ZLIB (retval);
+ compression_header[3 + theblock] = comp_length;
+ base_length = base64_encode_block (comp_data, comp_length,
+@@ -1135,9 +1135,9 @@ sc_vtk_write_compressed (FILE * vtkfile, char *numeric_data,
+ /* write odd-sized last block if necessary */
+ if (lastsize > 0) {
+ comp_length = code_length;
+- retval = compress2 ((Bytef *) comp_data, &comp_length,
+- (const Bytef *) (numeric_data + theblock * blocksize),
+- (uLong) lastsize, Z_BEST_COMPRESSION);
++ retval = zng_compress2 ((Bytef *) comp_data, &comp_length,
++ (const Bytef *) (numeric_data + theblock * blocksize),
++ (uLong) lastsize, Z_BEST_COMPRESSION);
+ SC_CHECK_ZLIB (retval);
+ compression_header[3 + theblock] = comp_length;
+ base_length = base64_encode_block (comp_data, comp_length,
+diff --git a/test/test_builtin.c b/test/test_builtin.c
+index 371aff6..9a99c2d 100644
+--- a/test/test_builtin.c
++++ b/test/test_builtin.c
+@@ -27,7 +27,7 @@
+
+ /* truthfully, the libraries below are not builtin anymore */
+ #ifdef SC_HAVE_ZLIB
+-#include <zlib.h>
++#include <zlib-ng.h>
+ #endif
+
+ static int
+@@ -87,13 +87,13 @@ test_zlib (void)
+ char b3[BUFSIZ];
+ uLong adler0, adler1, adler2, adler3a, adler3b;
+
+- adler0 = adler32 (0L, Z_NULL, 0);
+- adler1 = adler32 (adler0, (const Bytef *) b1, l1);
+- adler2 = adler32 (adler0, (const Bytef *) b2, l2);
+- adler3a = adler32_combine (adler1, adler2, l2);
++ adler0 = zng_adler32 (0L, Z_NULL, 0);
++ adler1 = zng_adler32 (adler0, (const Bytef *) b1, l1);
++ adler2 = zng_adler32 (adler0, (const Bytef *) b2, l2);
++ adler3a = zng_adler32_combine (adler1, adler2, l2);
+
+ snprintf (b3, BUFSIZ, "%s%s", b1, b2);
+- adler3b = adler32 (adler0, (const Bytef *) b3, l1 + l2);
++ adler3b = zng_adler32 (adler0, (const Bytef *) b3, l1 + l2);
+
+ return adler3a != adler3b;
+ }
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-2.8.5.ebuild
index 8d6bdbb8314c..e6f5712f4c17 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,7 +23,7 @@ IUSE="debug examples mpi openmp threads"
RDEPEND="
sys-apps/util-linux
- sys-libs/zlib
+ sys-libs/zlib-ng
virtual/blas
virtual/lapack
mpi? ( virtual/mpi[romio] )"
@@ -31,8 +31,10 @@ DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-2.8.3-fix_build_system.patch
"${FILESDIR}"/${P}-set_version.patch
+ "${FILESDIR}"/${P}-fix_build_system.patch
+ "${FILESDIR}"/${P}-do_not_compile_zlib-ng.patch
+ "${FILESDIR}"/${P}-use_zlib-ng_symbols.patch
)
pkg_pretend() {
@@ -56,6 +58,8 @@ src_configure() {
src_install() {
cmake_src_install
+ rm -r "${ED}"/usr/cmake || die "rm failed"
+
rm -r "${ED}"/usr/include/getopt.h \
"${ED}"/usr/include/getopt_int.h \
"${ED}"/usr/include/sc_builtin || die "rm failed"
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index f4ea4db8a2c3..90be69021cd3 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,7 +1,10 @@
AUX p4est-2.8-fix_build_system.patch 714 BLAKE2B 0807f4f896be0790fbeac3ab349abcbdf5c75f7eb57bc694f9c050772d9defe7e397c58a6b7d1da2e8c107dbd57489d971cd4ad7fa9dfedb4ee16509c5536cf3 SHA512 e2207974fc2df548a4f60e4233278641c6567aa909463de6ca61c5dc65b621b16d057735a404b73f39e0001233c800e27fae2c655a0a3c81d72d534ad04d8c0f
AUX p4est-2.8-set_version.patch 2520 BLAKE2B fb3ac44167c9b9be7a38e85437792d41e379d155f7961f5733adab1e142f6669c1d53686963d349fc9da7dc4d46fd27097c9beb223c1ab7266a4c18854aabe4a SHA512 17d128884d05999a51c28a966c66eb5fbe89512d812baa732afe372bfaf8a7bc8edf5edf1b46f5ad60353d7ee76be112dc3a7b06b8fd8fd729f5c7fbc9ac50af
+AUX p4est-2.8.5-fix_build_system.patch 717 BLAKE2B 87d73e6a40c4d3c4a63f81310f8fed7580c26c42d4f6e104d83ccaa05e9cade306da0b7897ed5dbad1c559b79cbec0c23b950406bc4eebf81c88942e19e2757c SHA512 b425ee30cb1e6754f2139e72984152fe3ed5df71fce1ae5d8ae797b7edd292159f700a13c431ba57177132dbe297606594a0e29aa4df407f6275e517536c3124
+AUX p4est-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c
AUX p4est-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845
+DIST p4est-2.8.5.tar.gz 2721258 BLAKE2B 07fd70f5b7ce0d2dcdc0d913cd9ae7920272a0e459c7db7f9d180b592570a5232c7d2bd03547eec3333dcdc6fdc83adcce30c71eb9c44ab6e6b9b9a314707471 SHA512 22b5a9bbfb51e972f4b93a90f5fa0f9557770ccbe357044b5bb97b31d02783affef188cde38c86bb4ece31ba23ce47e4eb95a6e7c5f02d11549cf986e85f68a0
DIST p4est-2.8.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
EBUILD p4est-2.8-r1.ebuild 1553 BLAKE2B 3878fef2d5366b4885f034e85cfc8102f8e8a6b510b5d58b3d078b789f15ab65561793030a652df60221a57a62eb1916b0ddc7c611ee5721c0aa659df48a68fe SHA512 7d53c94f06ded82962c371f348f40029dfea12208a47020cf1d88b2d1682d8ba2888d11899a51e8024b08da7fc53d5a2c8275f42541d085994842a8158f9cfa4
-EBUILD p4est-9999.ebuild 1495 BLAKE2B cff45eb0a7951254a026c82c186f7eaea825779bdba372bea524a9913d070c281f0c88b55243ec5c4a883169f209a52d8055ea151e1a4b0f7feb5b6f0beaf810 SHA512 c60b7aa0d13389c30ad4c10ef9127f6c8ce6fdde10a00ddf2cf287070aef6a53d21feacecdebc353d123ec6de8f48b9f29111b281734b2898d5b823ce7b9b1d0
+EBUILD p4est-2.8.5.ebuild 1505 BLAKE2B 1d94a8f8197ddc43e4d717ed2a1c38b851e3f1e21f862a55a5beeeb2b63fea7896617f9062ac5901cfa8ad7ce713ea6744cab1503675cb03dd32a8db8cc34d69 SHA512 6fdb8baa4a0cfa4a64849d19e7bedba7a2c1569b7a65cd3a050c238aeb5df8bdeef5c19ddd627190ef6c81a49e7e856320c94de74943f95bf92c805431d4e5dc
MISC metadata.xml 855 BLAKE2B fb3444a8e900f216fde24b9f0136ec2bda2646b96b696c01fe59d74ac59a0bac14c669518b716e4a9da25b3e72cf85676b679162fc3f3d196d9a6df45d00807b SHA512 930f4584f43a51433be58d96bcebe924a1986db5993e2dbf9e574ff0dc1a711fbebf0f5dfe93d8f26c92a8d930a49b60994dc6061a1799d89c9a2158a874ddab
diff --git a/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch
new file mode 100644
index 000000000000..0063acf9c5c1
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78c02bf..d1b2094 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)
++
+ include(CTest)
+
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+@@ -68,8 +70,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/
+
+ install(TARGETS p4est
+ EXPORT ${PROJECT_NAME}-targets
+-ARCHIVE DESTINATION lib
+-LIBRARY DESTINATION lib
++ARCHIVE DESTINATION ${library_reldir}
++LIBRARY DESTINATION ${library_reldir}
+ RUNTIME DESTINATION bin
+ )
+
diff --git a/sci-libs/p4est/files/p4est-2.8.5-set_version.patch b/sci-libs/p4est/files/p4est-2.8.5-set_version.patch
new file mode 100644
index 000000000000..061081a0da9e
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-2.8.5-set_version.patch
@@ -0,0 +1,49 @@
+diff --git a/cmake/git.cmake b/cmake/git.cmake
+index f88e984..f04f52b 100644
+--- a/cmake/git.cmake
++++ b/cmake/git.cmake
+@@ -1,39 +1,5 @@
+-# --- 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 ${CMAKE_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(git_version 2.8.5)
++set(PROJECT_MAJOR 2)
++set(PROJECT_MINOR 8)
++set(PROJECT_PATCH 5)
++set(PROJECT_VERSION 2.8.5)
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-2.8.5.ebuild
index 41605b7be0f7..89afa3c98840 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit cmake toolchain-funcs
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
HOMEPAGE="http://www.p4est.org/"
-LIBSC_VERSION="2.8.3"
+LIBSC_VERSION="${PV}"
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-2.8-fix_build_system.patch
+ "${FILESDIR}"/${P}-fix_build_system.patch
"${FILESDIR}"/${P}-set_version.patch
)
@@ -61,7 +61,8 @@ src_configure() {
src_install() {
cmake_src_install
- rm "${ED}"/usr/lib/cmake/Modules/FindSC.cmake || die "rm failed"
+ rm -r "${ED}"/usr/cmake || die "rm failed"
+ mkdir -p "${ED}"/usr/share/doc/${P}
mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${P}/ || die "mv failed"
rm -r "${ED}"/usr/share/docs || die "rm failed"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 23:14:21 +0000