gentoo auto-resync : 06:07:2024 - 08:06:15

6 files changed, 220 insertions, 0 deletions

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"
+}