From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 948DB15800F for ; Wed, 1 Feb 2023 19:27:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 675CDE0CD7; Wed, 1 Feb 2023 19:27:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49E89E0CD7 for ; Wed, 1 Feb 2023 19:27:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E1E7340B10 for ; Wed, 1 Feb 2023 19:27:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E53D08AD for ; Wed, 1 Feb 2023 19:27:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1675279598.909ba8f64518c9f336989401fa5e9ec20fbea938.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/files/, sci-libs/p4est/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/p4est/Manifest sci-libs/p4est/files/p4est-2.3-add_soname.patch sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch sci-libs/p4est/metadata.xml sci-libs/p4est/p4est-2.3.1-r1.ebuild sci-libs/p4est/p4est-2.3.3.ebuild X-VCS-Directories: sci-libs/p4est/files/ sci-libs/p4est/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 909ba8f64518c9f336989401fa5e9ec20fbea938 X-VCS-Branch: master Date: Wed, 1 Feb 2023 19:27:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 071035d4-4dd9-4e41-883a-dc247b80899e X-Archives-Hash: 833c2df48ac030dc3a908d71062594e9 commit: 909ba8f64518c9f336989401fa5e9ec20fbea938 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 28 15:52:10 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 1 19:26:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909ba8f6 sci-libs/p4est: drop 2.3.1-r1, 2.3.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/p4est/Manifest | 4 - sci-libs/p4est/files/p4est-2.3-add_soname.patch | 13 --- sci-libs/p4est/files/p4est-2.3-fix_aclocal.patch | 12 --- sci-libs/p4est/metadata.xml | 1 - sci-libs/p4est/p4est-2.3.1-r1.ebuild | 122 ----------------------- sci-libs/p4est/p4est-2.3.3.ebuild | 122 ----------------------- 6 files changed, 274 deletions(-) diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index 13b4e1e65938..2a5552e304f3 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,5 +1 @@ -DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a -DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b -DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23 -DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f7466f27049ef4e38d1138c83f57e991f6a702d0109e438337f98be13e8554a4dfef3e1c129f3d2690e0b4a54bbb SHA512 7f528a942438073c9f43242eae5383cdc1f64f0f26f96eccd01afc053e0454691160e7210dda2ad2bdd621fd3c17551dd205af417dd244642b1358cbe4aaa2fd DIST p4est-2.8.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c diff --git a/sci-libs/p4est/files/p4est-2.3-add_soname.patch b/sci-libs/p4est/files/p4est-2.3-add_soname.patch deleted file mode 100644 index 9438633138a0..000000000000 --- a/sci-libs/p4est/files/p4est-2.3-add_soname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 0d96429..1b76969 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -80,7 +80,7 @@ src_libp4est_la_SOURCES = \ - $(libp4est_internal_headers) \ - $(libp4est_compiled_sources) - src_libp4est_la_CPPFLAGS = $(AM_CPPFLAGS) $(P4EST_CPPFLAGS) --## src_libp4est_la_LDFLAGS = -release $(VERSION) -+src_libp4est_la_LDFLAGS = -release $(VERSION) - src_libp4est_la_LIBADD = @P4EST_SC_LDADD@ - LDADD += @top_builddir@/src/libp4est.la @P4EST_SC_LDADD@ - EXTRA_src_libp4est_la_DEPENDENCIES = @P4EST_SC_LDADD@ 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/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. Enable binary vtk output. If disabled vtk files will be written in ASCII text format. - Build with support for the ROMIO MPI-IO component cburstedde/libsc diff --git a/sci-libs/p4est/p4est-2.3.1-r1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild deleted file mode 100644 index 0d1041be0bd0..000000000000 --- a/sci-libs/p4est/p4est-2.3.1-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-add_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.3.3.ebuild b/sci-libs/p4est/p4est-2.3.3.ebuild deleted file mode 100644 index 0d1041be0bd0..000000000000 --- a/sci-libs/p4est/p4est-2.3.3.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-add_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 -}