From 35d4e80ab08982deb97a95d1b47156c67b268492 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Jul 2023 16:40:41 +0100 Subject: gentoo auto-resync : 15:07:2023 - 16:40:40 --- sci-libs/p4est/Manifest | 2 +- sci-libs/p4est/p4est-2.8.5-r2.ebuild | 70 ---------------------------------- sci-libs/p4est/p4est-2.8.5-r3.ebuild | 74 ++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 71 deletions(-) delete mode 100644 sci-libs/p4est/p4est-2.8.5-r2.ebuild create mode 100644 sci-libs/p4est/p4est-2.8.5-r3.ebuild (limited to 'sci-libs/p4est') diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index 70c40d236052..adcc9674797a 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -9,5 +9,5 @@ DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124 DIST p4est-2.3.6.tar.gz 2645384 BLAKE2B f6763e6a5b8b371eeead8a9d6481ea63e01ec5f13ea0dd9748aeaaec5551d39ac5d73f75f92275bfe61370e578ba1b1d0940c569e48fbd83997eaad4ab65b088 SHA512 99df91ee9d351cc889a532764096428e3f575c5f71199fca9f217c3dac5030a263308aa9c698476e7a12774d0751409f27e70ac2e9cd27847b2345b3f909b195 DIST p4est-2.8.5.tar.gz 2721258 BLAKE2B 07fd70f5b7ce0d2dcdc0d913cd9ae7920272a0e459c7db7f9d180b592570a5232c7d2bd03547eec3333dcdc6fdc83adcce30c71eb9c44ab6e6b9b9a314707471 SHA512 22b5a9bbfb51e972f4b93a90f5fa0f9557770ccbe357044b5bb97b31d02783affef188cde38c86bb4ece31ba23ce47e4eb95a6e7c5f02d11549cf986e85f68a0 EBUILD p4est-2.3.6.ebuild 2926 BLAKE2B 3c837d7d93f8ec1513a465707552dc1f3e014fc57867f5c12358abf73226147e9422becb42ece3d57fecdb4f858721a68dc3a9bcb6c785f96acfb9131e237733 SHA512 2e3a698a59218906a7490c808224ac8c5902c639fba96ad5d26fe4f828f9d96e037dc605d958fc0934fefbe842e9aa07e06be8c7b50312b731066b449e52c1e7 -EBUILD p4est-2.8.5-r2.ebuild 1603 BLAKE2B 9a59e3998f6d06d46cf9f79ea2fa4131ff5ca9b56a4e153068b6c35a342606a3ba64dead40fb1f7cceb265a5443d8d35247caabb975653272ea7011c0fe413e6 SHA512 493585387337da590b8042643900e3627b14566c516a41e8f68651921de1ad6e3698e0268c642ef23186c1b9ffbc1ffba5572557462423cf01c5103bfc6734ff +EBUILD p4est-2.8.5-r3.ebuild 1733 BLAKE2B d98f17da8af76900a6b8016d021caa26b965befd8f49342a97b567ee1951bbf9588990866eab62d2c38acb3debc7c904b3c50c02c5f07b4e991c818e956a6308 SHA512 bbf7e2e87ef6f4e868d88a50819a052ea91468babe1958b0065b8de23ec2b022564a216ba0ca99d59a15c3b8307bd2f6f6a1d76ca28210f44838a07a486d0099 MISC metadata.xml 933 BLAKE2B dbebf4c49f70183487e695e63b78c412260956c197dce7471145c8eb150672fcd7223d1ab4b81c793c0147bc77c49f235fbf31949581d760d077c0ca61e72a0b SHA512 228cade7cf570c4e5f629ae64b8fef9cb3635556f2ad52bc31c34480cc148ace1d2ebcb59563d02f1cc94f21a863c6077e8acc9b58b01d0519962c1580d836c5 diff --git a/sci-libs/p4est/p4est-2.8.5-r2.ebuild b/sci-libs/p4est/p4est-2.8.5-r2.ebuild deleted file mode 100644 index 3bcba02fb697..000000000000 --- a/sci-libs/p4est/p4est-2.8.5-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 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 -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - local mycmakeargs=( - -Dmpi="$(usex mpi)" - -Dopenmp="$(usex openmp)" - -Dlibrary_reldir="$(get_libdir)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - [ ! "$(get_libdir)" = "lib" ] && mv "${ED}"/usr/{lib,$(get_libdir)}/pkgconfig || die "mv failed" - - 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/p4est/p4est-2.8.5-r3.ebuild b/sci-libs/p4est/p4est-2.8.5-r3.ebuild new file mode 100644 index 000000000000..253f6ee31911 --- /dev/null +++ b/sci-libs/p4est/p4est-2.8.5-r3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 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 +) + +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 + + [ ! "$(get_libdir)" = "lib" ] && mv "${ED}"/usr/{lib,$(get_libdir)}/pkgconfig || die "mv failed" + + 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" +} -- cgit v1.2.3