commit: 00f8503c56fd2a55e3d8a4dc201f54f417303c53 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 24 14:23:00 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Nov 25 15:29:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f8503c
sci-libs/p4est: drop 2.3.6, 2.8.5-r3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/p4est/Manifest | 3 - sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch | 12 -- .../p4est/files/p4est-2.3.6-override_soname.patch | 13 --- .../p4est/files/p4est-2.8.5-fix_build_system.patch | 24 ---- .../p4est/files/p4est-2.8.5-fix_cmake_path.patch | 44 -------- sci-libs/p4est/files/p4est-2.8.5-set_version.patch | 49 --------- sci-libs/p4est/metadata.xml | 1 - sci-libs/p4est/p4est-2.3.6.ebuild | 122 --------------------- sci-libs/p4est/p4est-2.8.5-r3.ebuild | 74 ------------- 9 files changed, 342 deletions(-) diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index dad0e7d950fa..2881865ca64c 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,4 +1 @@ -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 diff --git a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch b/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch deleted file mode 100644 index a3209d5064fb..000000000000 --- a/sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index e8b7e67..1817e37 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,6 @@ - # This file is part of p4est. - # Makefile.am in toplevel directory - --ACLOCAL_AMFLAGS = -I config @P4EST_SC_AMFLAGS@ - if P4EST_SC_MK_USE - @P4EST_SC_MK_INCLUDE@ - endif diff --git a/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch b/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch deleted file mode 100644 index 40f032c109b7..000000000000 --- a/sci-libs/p4est/files/p4est-2.3.6-override_soname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index b30f0e3..2c636f9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -82,7 +82,7 @@ src_libp4est_la_SOURCES = \ - src_libp4est_la_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS) - ## This is the official API versioning scheme of libtool. Please see: - ## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning --src_libp4est_la_LDFLAGS = -version-info 1:0:0 -+src_libp4est_la_LDFLAGS = -release $(VERSION) - src_libp4est_la_LIBADD = @P4EST_SC_LDADD@ - LDADD += src/libp4est.la @P4EST_SC_LDADD@ - EXTRA_src_libp4est_la_DEPENDENCIES = @P4EST_SC_LDADD@ 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 deleted file mode 100644 index 0063acf9c5c1..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-fix_build_system.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-fix_cmake_path.patch b/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch deleted file mode 100644 index 8202a4007ede..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-fix_cmake_path.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1b2094..e5fe188 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,9 +104,8 @@ endif(BUILD_TESTING) - # --- packaging - - install(FILES --${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSC.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindP4EST.cmake --DESTINATION cmake) -+DESTINATION ${library_reldir}/cmake/P4est) - - include(cmake/pkgconf.cmake) - include(cmake/install.cmake) -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/sci-libs/p4est/files/p4est-2.8.5-set_version.patch b/sci-libs/p4est/files/p4est-2.8.5-set_version.patch deleted file mode 100644 index 061081a0da9e..000000000000 --- a/sci-libs/p4est/files/p4est-2.8.5-set_version.patch +++ /dev/null @@ -1,49 +0,0 @@ -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/metadata.xml b/sci-libs/p4est/metadata.xml index c58dd131de04..f29f22e517cb 100644 --- a/sci-libs/p4est/metadata.xml +++ b/sci-libs/p4est/metadata.xml @@ -17,7 +17,6 @@ processor cores. </longdescription> <use> <flag name="vtk-binary">Enable binary vtk output. If disabled vtk files will be written in ASCII text format.</flag> - <flag name="romio">Build with support for the ROMIO MPI-IO component</flag> </use> <upstream> <remote-id type="github">cburstedde/libsc</remote-id> diff --git a/sci-libs/p4est/p4est-2.3.6.ebuild b/sci-libs/p4est/p4est-2.3.6.ebuild deleted file mode 100644 index 27b596c41c15..000000000000 --- a/sci-libs/p4est/p4est-2.3.6.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools flag-o-matic lua-single toolchain-funcs - -DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" -HOMEPAGE="http://www.p4est.org/"; - -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 - https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" - -# TODO petsc -IUSE="debug doc examples mpi openmp romio threads +vtk-binary" -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" - -RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio=] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch - "${FILESDIR}"/${PN}-2.3.6-override_soname.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - lua-single_pkg_setup -} - -src_prepare() { - default - - # Inject libsc to get all parts of the build system... - if ! [[ ${PV} = *9999* ]]; then - rmdir "${S}/sc" || die "rmdir failed" - mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed" - fi - - # Inject a version number into the build system - echo "${PV}" > "${S}"/.tarball-version - - AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config" - eautoreconf - - sed -i \ - "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \ - "${S}"/configure || die "sed failed" - - sed -i \ - "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \ - "${S}"/configure || die "sed failed" -} - -src_configure() { - # avoid underlinkage - append-libs -lsc - - local myeconfargs=( - --disable-static - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp) - $(use_enable romio mpiio) - $(use_enable threads pthread) - $(use_enable vtk-binary) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${ESYSROOT}/usr" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - use doc && dodoc -r doc/* - - if use examples - then - docinto examples - dodoc -r example/* - docompress -x /usr/share/doc/${PF}/examples - else - # Remove compiled example binaries in case of -examples: - rm -r "${ED}"/usr/bin || die "rm failed" - fi - - # Fix wrong installation paths: - dodir /usr/share/p4est - mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" - mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/p4est/p4est-2.8.5-r3.ebuild b/sci-libs/p4est/p4est-2.8.5-r3.ebuild deleted file mode 100644 index 253f6ee31911..000000000000 --- a/sci-libs/p4est/p4est-2.8.5-r3.ebuild +++ /dev/null @@ -1,74 +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() { - # 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" -}
