gentoo auto-resync : 20:06:2023 - 01:14:49

4 files changed, 82 insertions, 5 deletions

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