* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2017-07-30 10:04 Michał Górny
0 siblings, 0 replies; 21+ messages in thread
From: Michał Górny @ 2017-07-30 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 8af963953f4d4945b6e0ad659c22854bfc53d867
Author: David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Sat Jul 29 19:03:25 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 10:04:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af96395
sci-libs/p4est: use HTTPS for GitHub
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sci-libs/p4est/p4est-1.0.ebuild | 2 +-
sci-libs/p4est/p4est-1.1.ebuild | 2 +-
sci-libs/p4est/p4est-9999.ebuild | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
index c1defa40429..b76a7efb8f0 100644
--- a/sci-libs/p4est/p4est-1.0.ebuild
+++ b/sci-libs/p4est/p4est-1.0.ebuild
@@ -11,7 +11,7 @@ inherit autotools eutils
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
HOMEPAGE="http://www.p4est.org/"
SRC_URI="
- https://github.com/cburstedde/p4est/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ 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"
diff --git a/sci-libs/p4est/p4est-1.1.ebuild b/sci-libs/p4est/p4est-1.1.ebuild
index c1defa40429..b76a7efb8f0 100644
--- a/sci-libs/p4est/p4est-1.1.ebuild
+++ b/sci-libs/p4est/p4est-1.1.ebuild
@@ -11,7 +11,7 @@ inherit autotools eutils
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
HOMEPAGE="http://www.p4est.org/"
SRC_URI="
- https://github.com/cburstedde/p4est/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ 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"
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index d06cffc565c..a54c8b564e3 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -13,13 +13,13 @@ HOMEPAGE="http://www.p4est.org/"
if [[ ${PV} = *9999* ]]; then
inherit git-r3
- EGIT_REPO_URI="git://github.com/cburstedde/p4est.git"
+ EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
KEYWORDS=""
else
SRC_URI="
- https://github.com/cburstedde/p4est/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ 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
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2023-07-15 9:07 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2023-07-15 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 539e82b485a80fe6c8685e5997e60c610660f89f
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 08:36:45 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:07:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539e82b4
sci-libs/p4est: try to avoid a performance regression with 2.8.5
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/{p4est-2.8.5-r2.ebuild => p4est-2.8.5-r3.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sci-libs/p4est/p4est-2.8.5-r2.ebuild b/sci-libs/p4est/p4est-2.8.5-r3.ebuild
similarity index 92%
rename from sci-libs/p4est/p4est-2.8.5-r2.ebuild
rename to sci-libs/p4est/p4est-2.8.5-r3.ebuild
index 3bcba02fb697..253f6ee31911 100644
--- a/sci-libs/p4est/p4est-2.8.5-r2.ebuild
+++ b/sci-libs/p4est/p4est-2.8.5-r3.ebuild
@@ -50,6 +50,10 @@ pkg_setup() {
}
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)"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2023-07-15 2:16 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2023-07-15 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 8c3a2486af41d5813a8b76583f57937752a865f8
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 02:16:13 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 02:16:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3a2486
sci-libs/p4est: drop 2.8-r1
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/Manifest | 1 -
sci-libs/p4est/p4est-2.8-r1.ebuild | 70 --------------------------------------
2 files changed, 71 deletions(-)
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 9bd9ae0dc0a1..ec900fcf2092 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,4 +1,3 @@
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.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
diff --git a/sci-libs/p4est/p4est-2.8-r1.ebuild b/sci-libs/p4est/p4est-2.8-r1.ebuild
deleted file mode 100644
index 10b3de8b3e22..000000000000
--- a/sci-libs/p4est/p4est-2.8-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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"
-
-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
-)
-
-S="${WORKDIR}/${PN}-2.8"
-
-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
-
- rm "${ED}"/usr/lib/cmake/Modules/FindSC.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"
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2023-06-20 1:32 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2023-06-20 1:32 UTC (permalink / raw
To: gentoo-commits
commit: 0991bf3755bdb20a78be7dd2e6a46fc55c57393a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 01:31:32 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 01:32:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0991bf37
sci-libs/p4est: QA: quote variable
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/p4est-2.8.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/p4est/p4est-2.8.5-r2.ebuild b/sci-libs/p4est/p4est-2.8.5-r2.ebuild
index 3a6126c24456..3bcba02fb697 100644
--- a/sci-libs/p4est/p4est-2.8.5-r2.ebuild
+++ b/sci-libs/p4est/p4est-2.8.5-r2.ebuild
@@ -62,7 +62,7 @@ src_configure() {
src_install() {
cmake_src_install
- [ ! "$(get_libdir)" = "lib" ] && mv ${ED}/usr/{lib,$(get_libdir)}/pkgconfig || die "mv failed"
+ [ ! "$(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"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2023-06-19 23:54 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2023-06-19 23:54 UTC (permalink / raw
To: gentoo-commits
commit: f045d787a94b5cbc2fe3c5a2762f982f98e0fb3b
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 23:53:33 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 23:54:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f045d787
sci-libs/p4est: also install cmake configuration
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/{p4est-2.8.5.ebuild => p4est-2.8.5-r1.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-libs/p4est/p4est-2.8.5.ebuild b/sci-libs/p4est/p4est-2.8.5-r1.ebuild
similarity index 95%
rename from sci-libs/p4est/p4est-2.8.5.ebuild
rename to sci-libs/p4est/p4est-2.8.5-r1.ebuild
index 89afa3c98840..e53b6f7eaa2e 100644
--- a/sci-libs/p4est/p4est-2.8.5.ebuild
+++ b/sci-libs/p4est/p4est-2.8.5-r1.ebuild
@@ -61,7 +61,8 @@ src_configure() {
src_install() {
cmake_src_install
- rm -r "${ED}"/usr/cmake || die "rm failed"
+ mv "${ED}"/usr/cmake "${ED}"/usr/$(get_libdir)/ || die "mv 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"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2023-06-19 18:26 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2023-06-19 18:26 UTC (permalink / raw
To: gentoo-commits
commit: f57c3bc231081fee7861d6f330e2c7ee58616bd8
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 18:14:34 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 18:26:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57c3bc2
sci-libs/p4est: fix dependency on libsc
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/p4est-2.8.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/p4est/p4est-2.8.5.ebuild b/sci-libs/p4est/p4est-2.8.5.ebuild
index 0663c7d292ba..89afa3c98840 100644
--- a/sci-libs/p4est/p4est-2.8.5.ebuild
+++ b/sci-libs/p4est/p4est-2.8.5.ebuild
@@ -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
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2023-06-19 18:26 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2023-06-19 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 6a50020bc6833ba5dd8a6663dc84a461b104cd43
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 19 18:12:54 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jun 19 18:26:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a50020b
sci-libs/p4est: drop 9999
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/p4est-9999.ebuild | 67 ----------------------------------------
1 file changed, 67 deletions(-)
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
deleted file mode 100644
index 41605b7be0f7..000000000000
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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"
-
-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}"/${PN}-2.8-fix_build_system.patch
- "${FILESDIR}"/${P}-set_version.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
-
- rm "${ED}"/usr/lib/cmake/Modules/FindSC.cmake || die "rm failed"
- mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${P}/ || die "mv failed"
- rm -r "${ED}"/usr/share/docs || die "rm failed"
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2022-08-11 11:13 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-08-11 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 2d37afbbe19e4c4eef461bf22380d9e3f6142c04
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 11:04:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 11:13:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d37afbb
sci-libs/p4est: fix UnquotedVariable
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/p4est/p4est-2.3.1-r1.ebuild | 4 ++--
sci-libs/p4est/p4est-2.3.3.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/p4est/p4est-2.3.1-r1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
index c7756fee11c5..0d1041be0bd0 100644
--- a/sci-libs/p4est/p4est-2.3.1-r1.ebuild
+++ b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -63,7 +63,7 @@ src_prepare() {
fi
# Inject a version number into the build system
- echo "${PV}" > ${S}/.tarball-version
+ echo "${PV}" > "${S}"/.tarball-version
AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
eautoreconf
diff --git a/sci-libs/p4est/p4est-2.3.3.ebuild b/sci-libs/p4est/p4est-2.3.3.ebuild
index c7756fee11c5..0d1041be0bd0 100644
--- a/sci-libs/p4est/p4est-2.3.3.ebuild
+++ b/sci-libs/p4est/p4est-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -63,7 +63,7 @@ src_prepare() {
fi
# Inject a version number into the build system
- echo "${PV}" > ${S}/.tarball-version
+ echo "${PV}" > "${S}"/.tarball-version
AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
eautoreconf
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2022-04-15 6:43 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2022-04-15 6:43 UTC (permalink / raw
To: gentoo-commits
commit: 0eef70f703e1ad9c3efc734377e4a60494781a83
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 06:43:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 06:43:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eef70f7
sci-libs/p4est: drop unused flag-o-matic
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/p4est/p4est-2.8.0-r1.ebuild | 2 +-
sci-libs/p4est/p4est-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/p4est/p4est-2.8.0-r1.ebuild b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
index 2e803199a24b..177d7985ea02 100644
--- a/sci-libs/p4est/p4est-2.8.0-r1.ebuild
+++ b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake toolchain-funcs
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
HOMEPAGE="http://www.p4est.org/"
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index d27a0814359b..41605b7be0f7 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake flag-o-matic toolchain-funcs
+inherit cmake toolchain-funcs
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
HOMEPAGE="http://www.p4est.org/"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2021-11-12 4:06 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2021-11-12 4:06 UTC (permalink / raw
To: gentoo-commits
commit: abe71e9a4dabbea40ccd33a95e9c08a848137a59
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 12 04:05:08 2021 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 04:06:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe71e9a
sci-libs/p4est: version bump to 2.3.3
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/Manifest | 2 +
sci-libs/p4est/p4est-2.3.3.ebuild | 122 ++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 53d047ba796..bdfcb44058d 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,2 +1,4 @@
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
diff --git a/sci-libs/p4est/p4est-2.3.3.ebuild b/sci-libs/p4est/p4est-2.3.3.ebuild
new file mode 100644
index 00000000000..c7756fee11c
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.3.3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 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
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2021-08-04 17:40 David Seifert
0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2021-08-04 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 1230fc12333f51a3e3b7e10db361940aec5ddcda
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 4 17:40:39 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 17:40:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1230fc12
sci-libs/p4est: drop 2.2-r100
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/p4est/Manifest | 2 -
sci-libs/p4est/p4est-2.2-r100.ebuild | 120 -----------------------------------
2 files changed, 122 deletions(-)
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 9140b29444a..53d047ba796 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,4 +1,2 @@
-DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
-DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
deleted file mode 100644
index ee878cbfc3e..00000000000
--- a/sci-libs/p4est/p4est-2.2-r100.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools 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 static-libs threads +vtk-binary"
-REQUIRED_USE="${LUA_REQUIRED_USE}
- romio? ( mpi )"
-
-RDEPEND="${LUA_DEPS}
- ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
- sys-apps/util-linux
- virtual/blas
- virtual/lapack
- mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.11
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-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
- LDFLAGS="${LDFLAGS} -lsc"
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable mpi)
- $(use_enable openmp)
- $(use_enable romio mpiio)
- $(use_enable static-libs static)
- $(use_enable threads pthread)
- $(use_enable vtk-binary)
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/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"
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2021-08-04 17:40 David Seifert
0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2021-08-04 17:40 UTC (permalink / raw
To: gentoo-commits
commit: c766e3af48c962e8fd2762b5f60ff848f398fc3d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 4 17:40:40 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 17:40:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c766e3af
sci-libs/p4est: remove USE=static-libs
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../{p4est-2.3.1.ebuild => p4est-2.3.1-r1.ebuild} | 34 +++++++++---------
sci-libs/p4est/p4est-9999.ebuild | 40 ++++++++++++----------
2 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/sci-libs/p4est/p4est-2.3.1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
similarity index 83%
rename from sci-libs/p4est/p4est-2.3.1.ebuild
rename to sci-libs/p4est/p4est-2.3.1-r1.ebuild
index 597b67a136a..c7756fee11c 100644
--- a/sci-libs/p4est/p4est-2.3.1.ebuild
+++ b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-{1..3} )
-inherit autotools lua-single toolchain-funcs
+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/"
@@ -26,34 +26,31 @@ LICENSE="GPL-2+"
SLOT="0"
# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+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=,static-libs=,threads=]
+ ~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}
- sys-devel/automake
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
"${FILESDIR}"/${PN}-2.3-add_soname.patch
)
-DOCS=( AUTHORS NEWS README )
-
pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ lua-single_pkg_setup
}
src_prepare() {
@@ -82,19 +79,19 @@ src_prepare() {
src_configure() {
# avoid underlinkage
- LDFLAGS="${LDFLAGS} -lsc"
+ append-libs -lsc
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable mpi)
$(use_enable openmp)
$(use_enable romio mpiio)
- $(use_enable static-libs static)
$(use_enable threads pthread)
$(use_enable vtk-binary)
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/usr"
+ --with-sc="${ESYSROOT}/usr"
)
econf "${myeconfargs[@]}"
}
@@ -119,4 +116,7 @@ src_install() {
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-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index bb4b3a864ed..c7756fee11c 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -5,10 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-{1..3} )
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools lua-single toolchain-funcs
+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/"
@@ -29,29 +26,31 @@ LICENSE="GPL-2+"
SLOT="0"
# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+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=,static-libs=,threads=]
+ ~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"
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.11
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
+ "${FILESDIR}"/${PN}-2.3-add_soname.patch
+)
pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ lua-single_pkg_setup
}
src_prepare() {
@@ -80,19 +79,19 @@ src_prepare() {
src_configure() {
# avoid underlinkage
- LDFLAGS="${LDFLAGS} -lsc"
+ append-libs -lsc
local myeconfargs=(
+ --disable-static
$(use_enable debug)
$(use_enable mpi)
$(use_enable openmp)
$(use_enable romio mpiio)
- $(use_enable static-libs static)
$(use_enable threads pthread)
$(use_enable vtk-binary)
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/usr"
+ --with-sc="${ESYSROOT}/usr"
)
econf "${myeconfargs[@]}"
}
@@ -117,4 +116,7 @@ src_install() {
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
}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2021-02-18 18:57 David Seifert
0 siblings, 0 replies; 21+ messages in thread
From: David Seifert @ 2021-02-18 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 1e3765a20eb7f0ba19da678ad741636cb9fe9625
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 18 18:56:28 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 18:56:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3765a2
sci-libs/p4est: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/p4est/p4est-2.2.ebuild | 118 ----------------------------------------
1 file changed, 118 deletions(-)
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
deleted file mode 100644
index ea4cbc69d91..00000000000
--- a/sci-libs/p4est/p4est-2.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools toolchain-funcs eutils
-
-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 static-libs threads +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
- ~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
- dev-lang/lua:0=
- sys-apps/util-linux
- virtual/blas
- virtual/lapack
- mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.11
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
- tc-has-openmp || \
- die "Please select an openmp capable compiler like gcc[openmp]"
- fi
-}
-
-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
- LDFLAGS="${LDFLAGS} -lsc"
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable mpi)
- $(use_enable openmp)
- $(use_enable romio mpiio)
- $(use_enable static-libs static)
- $(use_enable threads pthread)
- $(use_enable vtk-binary)
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/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"
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2021-02-15 0:32 Sam James
0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2021-02-15 0:32 UTC (permalink / raw
To: gentoo-commits
commit: d1f8ec9ee2a7421a21c8a38156416f6deb1a9f9c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 23:19:23 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 00:31:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f8ec9e
sci-libs/p4est: fix double KEYWORDS
Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.
See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/p4est/p4est-2.2-r100.ebuild | 3 +--
sci-libs/p4est/p4est-2.2.ebuild | 3 +--
sci-libs/p4est/p4est-9999.ebuild | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
index cde320a2e5c..3c69c63e2ed 100644
--- a/sci-libs/p4est/p4est-2.2-r100.ebuild
+++ b/sci-libs/p4est/p4est-2.2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,6 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
- KEYWORDS=""
else
SRC_URI="
https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
index aea8ebca895..ea4cbc69d91 100644
--- a/sci-libs/p4est/p4est-2.2.ebuild
+++ b/sci-libs/p4est/p4est-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,6 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
- KEYWORDS=""
else
SRC_URI="
https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index cf8dea879ce..5837f982d5f 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,6 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
- KEYWORDS=""
else
SRC_URI="
https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2020-04-23 21:41 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2020-04-23 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 6fefffcbfbf8feb4a4d33c1bc9cbb5b4b7311aa5
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 21:37:42 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 21:40:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fefffcb
sci-libs/p4est: fix library path
Closes: https://bugs.gentoo.org/680140
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/p4est-2.0.ebuild | 5 ++---
sci-libs/p4est/p4est-2.2.ebuild | 5 ++---
sci-libs/p4est/p4est-9999.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/sci-libs/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.0.ebuild
index 62bc613a260..8fd68ca09b1 100644
--- a/sci-libs/p4est/p4est-2.0.ebuild
+++ b/sci-libs/p4est/p4est-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -73,9 +73,8 @@ src_prepare() {
"${S}"/configure || die "sed failed"
sed -i \
- "s/libsc\.la/libsc\.so/" \
+ "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
"${S}"/configure || die "sed failed"
-
}
src_configure() {
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
index 8cd883fb0d2..32ae041f931 100644
--- a/sci-libs/p4est/p4est-2.2.ebuild
+++ b/sci-libs/p4est/p4est-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -73,9 +73,8 @@ src_prepare() {
"${S}"/configure || die "sed failed"
sed -i \
- "s/libsc\.la/libsc\.so/" \
+ "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
"${S}"/configure || die "sed failed"
-
}
src_configure() {
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index a54c8b564e3..8fd68ca09b1 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -73,9 +73,8 @@ src_prepare() {
"${S}"/configure || die "sed failed"
sed -i \
- "s/libsc\.la/libsc\.so/" \
+ "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
"${S}"/configure || die "sed failed"
-
}
src_configure() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2020-04-23 21:41 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2020-04-23 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 4d2017b744ac6616611e83a592aaa0f1d298c085
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 21:39:12 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 21:40:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2017b7
sci-libs/p4est: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/Manifest | 4 --
sci-libs/p4est/p4est-1.0.ebuild | 99 -----------------------------------------
sci-libs/p4est/p4est-1.1.ebuild | 99 -----------------------------------------
3 files changed, 202 deletions(-)
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index d8b401c2633..09c06d0c267 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,8 +1,4 @@
-DIST libsc-1.0.tar.gz 257930 BLAKE2B b67ee98d8a31dcd09af70783a253b7289657c51e345c59b6551ab8be3a2067ce20d75c3f6323f4113501d57baf31d95c5a40b025c77f37a693616ae2bb118266 SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d
-DIST libsc-1.1.tar.gz 263643 BLAKE2B 827c0e01154983dd309301c6ecfa380d3489b5b764f131c2df2554b002a6c726a44272963cef4b4a853af5fb4c9ba98c77b01e107fc555432317662d985de2a9 SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579
DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
-DIST p4est-1.0.tar.gz 695027 BLAKE2B 1b4c21e0ada4928da4fbf94e80e123ad39a1b4701f6019d0e49073b68c90662a277302a07cad22bb1d71a72a47cde8e1cbbfd4475dd7542bcee1c0474bb4addf SHA512 781240bbca2779f4076c310575ad99e8b526ecf6a3da8b7b5f096615bbfb570dd0556e607797715b69c95c6dd73baf837f1c632be763efae835941107f1fe3df
-DIST p4est-1.1.tar.gz 1241423 BLAKE2B 3bb767f062a204abee4af64351981609c818c9b1f6bc5fa738161f706e5c9aebe208a4fc76010a2a05d6936070952e938b6ee632bd3ccc6676776fd60d451ef8 SHA512 11eb576a16a4cc959eff8894d6cb11d8bae092951be9cf9d71b538825bdf675af7fd77d79505b9e896ec1810c1f8e9391447a79263c6d2e33fef780e97d07f29
DIST p4est-2.0.tar.gz 1296762 BLAKE2B 1d755ec72905da069b9c91182a437c59107189402eb26444cf7fc1755b81bdbfad9aa25802720df401e8d434e5ac67e68b1d7dd5bf312f881017925498ad7514 SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c
DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
deleted file mode 100644
index 266da27018f..00000000000
--- a/sci-libs/p4est/p4est-1.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="debug doc examples mpi romio static-libs +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
- ~sci-libs/libsc-${PV}[mpi=,romio=,static-libs=]
- dev-lang/lua:*
- sys-apps/util-linux
- virtual/blas
- virtual/lapack
- mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.11
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
- default
-
- # Inject libsc to get all parts of the build system...
- rmdir "${S}/sc" || die "rmdir failed"
- mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-
- # 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/libsc\.la/libsc\.so/" \
- "${S}"/configure || die "sed failed"
-}
-
-src_configure() {
- # avoid underlinkage
- LDFLAGS="${LDFLAGS} -lsc"
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable mpi)
- $(use_enable romio mpiio)
- $(use_enable static-libs static)
- $(use_enable vtk-binary)
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/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"
-}
diff --git a/sci-libs/p4est/p4est-1.1.ebuild b/sci-libs/p4est/p4est-1.1.ebuild
deleted file mode 100644
index 266da27018f..00000000000
--- a/sci-libs/p4est/p4est-1.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="debug doc examples mpi romio static-libs +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
-
-RDEPEND="
- ~sci-libs/libsc-${PV}[mpi=,romio=,static-libs=]
- dev-lang/lua:*
- sys-apps/util-linux
- virtual/blas
- virtual/lapack
- mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/automake:1.11
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
- default
-
- # Inject libsc to get all parts of the build system...
- rmdir "${S}/sc" || die "rmdir failed"
- mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-
- # 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/libsc\.la/libsc\.so/" \
- "${S}"/configure || die "sed failed"
-}
-
-src_configure() {
- # avoid underlinkage
- LDFLAGS="${LDFLAGS} -lsc"
-
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable mpi)
- $(use_enable romio mpiio)
- $(use_enable static-libs static)
- $(use_enable vtk-binary)
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- --with-sc="${EPREFIX}/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"
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2019-04-15 1:34 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2019-04-15 1:34 UTC (permalink / raw
To: gentoo-commits
commit: e02c103ecb8301d891d89af3b88c655492f47c42
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 00:37:05 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 01:33:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e02c103e
sci-libs/p4est: version bump to 2.2
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/p4est/Manifest | 2 ++
sci-libs/p4est/p4est-2.0.ebuild | 2 +-
sci-libs/p4est/{p4est-2.0.ebuild => p4est-2.2.ebuild} | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 0ce540d27ca..d8b401c2633 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,6 +1,8 @@
DIST libsc-1.0.tar.gz 257930 BLAKE2B b67ee98d8a31dcd09af70783a253b7289657c51e345c59b6551ab8be3a2067ce20d75c3f6323f4113501d57baf31d95c5a40b025c77f37a693616ae2bb118266 SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d
DIST libsc-1.1.tar.gz 263643 BLAKE2B 827c0e01154983dd309301c6ecfa380d3489b5b764f131c2df2554b002a6c726a44272963cef4b4a853af5fb4c9ba98c77b01e107fc555432317662d985de2a9 SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579
DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
+DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
DIST p4est-1.0.tar.gz 695027 BLAKE2B 1b4c21e0ada4928da4fbf94e80e123ad39a1b4701f6019d0e49073b68c90662a277302a07cad22bb1d71a72a47cde8e1cbbfd4475dd7542bcee1c0474bb4addf SHA512 781240bbca2779f4076c310575ad99e8b526ecf6a3da8b7b5f096615bbfb570dd0556e607797715b69c95c6dd73baf837f1c632be763efae835941107f1fe3df
DIST p4est-1.1.tar.gz 1241423 BLAKE2B 3bb767f062a204abee4af64351981609c818c9b1f6bc5fa738161f706e5c9aebe208a4fc76010a2a05d6936070952e938b6ee632bd3ccc6676776fd60d451ef8 SHA512 11eb576a16a4cc959eff8894d6cb11d8bae092951be9cf9d71b538825bdf675af7fd77d79505b9e896ec1810c1f8e9391447a79263c6d2e33fef780e97d07f29
DIST p4est-2.0.tar.gz 1296762 BLAKE2B 1d755ec72905da069b9c91182a437c59107189402eb26444cf7fc1755b81bdbfad9aa25802720df401e8d434e5ac67e68b1d7dd5bf312f881017925498ad7514 SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c
+DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
diff --git a/sci-libs/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.0.ebuild
index a54c8b564e3..62bc613a260 100644
--- a/sci-libs/p4est/p4est-2.0.ebuild
+++ b/sci-libs/p4est/p4est-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/sci-libs/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
similarity index 98%
copy from sci-libs/p4est/p4est-2.0.ebuild
copy to sci-libs/p4est/p4est-2.2.ebuild
index a54c8b564e3..8cd883fb0d2 100644
--- a/sci-libs/p4est/p4est-2.0.ebuild
+++ b/sci-libs/p4est/p4est-2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
# The build system currently fails with everything newer than 1.11.
WANT_AUTOMAKE=1.11
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2017-08-13 0:56 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2017-08-13 0:56 UTC (permalink / raw
To: gentoo-commits
commit: e45813df49f4d5d4a8f4957bc00f25eeaa0cf9a9
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 00:52:58 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 00:55:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45813df
sci-libs/p4est: version bump to 2.0
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sci-libs/p4est/Manifest | 2 +
sci-libs/p4est/p4est-2.0.ebuild | 120 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 13859d7595c..993bf23d922 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,4 +1,6 @@
DIST libsc-1.0.tar.gz 257930 SHA256 a9f8a0f342a4a92c4031735e044e7ee73d9fd7e6df3e50a51c4c5016e27ed1ba SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d WHIRLPOOL 56f89fcaf90bc8d4f872cee4fe150f692933b39376758c42b67d2e42659c19a9332a1d5e6d2d81c011dade0c6ab40c526c69ce2168fe41060f5d4be1a6595b1b
DIST libsc-1.1.tar.gz 263643 SHA256 99c3fb3b7d6514ccaa667bdc848a7308c00f05bf6fdc0561ce286db9644ee03e SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579 WHIRLPOOL b6c123cd245e4beb4cd6479e9d781d86784fab6975edc20562c14b5ecc59dbc824aca10fb02e4fa7612f0b2743fd7c7d3799f203546c5859896812a21e1362df
+DIST libsc-2.0.tar.gz 296392 SHA256 759c7ed33537fc5eb2fee4c9d90f5d80f7112f13042f4d2d5f34d6c6461cb8e6 SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c WHIRLPOOL 247a985d948ceba0e682491f4b85d761c76599a82d5f3096ba5214d64691bff1b497739d1f2687ac6a6b04c121eb057c3770a17ee7d5040af16a288bb9f79299
DIST p4est-1.0.tar.gz 695027 SHA256 d669b0487eb0d2765c77adcab551c447f2cfa49d60a5a9016eaf48526ece74b6 SHA512 781240bbca2779f4076c310575ad99e8b526ecf6a3da8b7b5f096615bbfb570dd0556e607797715b69c95c6dd73baf837f1c632be763efae835941107f1fe3df WHIRLPOOL 690e350c3960b48cf5ac6bbc9aeff49557da25a69e152b7dca8fdb91b424f1669e9cf603903fb3f4de01078b964c63f7811b63000cacc5d56845ba96f6c516bf
DIST p4est-1.1.tar.gz 1241423 SHA256 14a4ba6c5883ece611c90fae29bc60a454c20db43df646b232bd5aa552acd5cf SHA512 11eb576a16a4cc959eff8894d6cb11d8bae092951be9cf9d71b538825bdf675af7fd77d79505b9e896ec1810c1f8e9391447a79263c6d2e33fef780e97d07f29 WHIRLPOOL 38253d7dd01d5406c5e7e773afdabcac85d49bedd86d3a325c227b32e9d09ddb5397a77e8485489a2e46c582ea242d5eaad877c139504088246d2b8d31b86c63
+DIST p4est-2.0.tar.gz 1296762 SHA256 1533989c089253372bf3a134740a06cad3fff6c6e9969c09dc31ee14b27f1efe SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c WHIRLPOOL 0b9d50ae1e9349db32fe2b3eee98b868a306df7666d2b085946a0e9279dcd38514fbd78247523f0e5722687015a1dd92e7c806cf4ffa294539c0e74664a26614
diff --git a/sci-libs/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.0.ebuild
new file mode 100644
index 00000000000..a54c8b564e3
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# The build system currently fails with everything newer than 1.11.
+WANT_AUTOMAKE=1.11
+
+inherit autotools toolchain-funcs eutils
+
+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=""
+ KEYWORDS=""
+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 static-libs threads +vtk-binary"
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+ ~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
+ dev-lang/lua:*
+ sys-apps/util-linux
+ virtual/blas
+ virtual/lapack
+ mpi? ( virtual/mpi[romio=] )"
+
+DEPEND="
+ ${RDEPEND}
+ sys-devel/automake:1.11
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+ tc-has-openmp || \
+ die "Please select an openmp capable compiler like gcc[openmp]"
+ fi
+}
+
+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/libsc\.la/libsc\.so/" \
+ "${S}"/configure || die "sed failed"
+
+}
+
+src_configure() {
+ # avoid underlinkage
+ LDFLAGS="${LDFLAGS} -lsc"
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable mpi)
+ $(use_enable openmp)
+ $(use_enable romio mpiio)
+ $(use_enable static-libs static)
+ $(use_enable threads pthread)
+ $(use_enable vtk-binary)
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+ --with-sc="${EPREFIX}/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"
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2017-05-26 17:38 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2017-05-26 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 2f8bb71deda45755ef05da7b344bda448f157822
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 17:37:58 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri May 26 17:37:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8bb71d
sci-libs/p4est: force autotools version also in live ebuild
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-libs/p4est/p4est-9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 38e6d195684..d06cffc565c 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -3,6 +3,9 @@
EAPI=6
+# The build system currently fails with everything newer than 1.11.
+WANT_AUTOMAKE=1.11
+
inherit autotools toolchain-funcs eutils
DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2017-05-26 17:13 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2017-05-26 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 57de76e01d0a1bef5d8c34eb45c8f8b61c321377
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 17:13:32 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri May 26 17:13:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57de76e0
sci-libs/p4est: remove prefix-keywords
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-libs/p4est/p4est-1.0.ebuild | 2 +-
sci-libs/p4est/p4est-1.1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
index 637628420bf..c1defa40429 100644
--- a/sci-libs/p4est/p4est-1.0.ebuild
+++ b/sci-libs/p4est/p4est-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
https://github.com/cburstedde/p4est/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 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/sci-libs/p4est/p4est-1.1.ebuild b/sci-libs/p4est/p4est-1.1.ebuild
index 637628420bf..c1defa40429 100644
--- a/sci-libs/p4est/p4est-1.1.ebuild
+++ b/sci-libs/p4est/p4est-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
https://github.com/cburstedde/p4est/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 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86"
LICENSE="GPL-2+"
SLOT="0"
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
@ 2017-05-26 17:12 Matthias Maier
0 siblings, 0 replies; 21+ messages in thread
From: Matthias Maier @ 2017-05-26 17:12 UTC (permalink / raw
To: gentoo-commits
commit: f66d4f0696a62958f1d78eb60012cd2c44207b06
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 17:07:41 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri May 26 17:11:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66d4f06
sci-libs/p4est: Initial commit, move from science overlay
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-libs/p4est/Manifest | 4 ++
sci-libs/p4est/metadata.xml | 25 +++++++++
sci-libs/p4est/p4est-1.0.ebuild | 99 +++++++++++++++++++++++++++++++++
sci-libs/p4est/p4est-1.1.ebuild | 99 +++++++++++++++++++++++++++++++++
sci-libs/p4est/p4est-9999.ebuild | 117 +++++++++++++++++++++++++++++++++++++++
5 files changed, 344 insertions(+)
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
new file mode 100644
index 00000000000..13859d7595c
--- /dev/null
+++ b/sci-libs/p4est/Manifest
@@ -0,0 +1,4 @@
+DIST libsc-1.0.tar.gz 257930 SHA256 a9f8a0f342a4a92c4031735e044e7ee73d9fd7e6df3e50a51c4c5016e27ed1ba SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d WHIRLPOOL 56f89fcaf90bc8d4f872cee4fe150f692933b39376758c42b67d2e42659c19a9332a1d5e6d2d81c011dade0c6ab40c526c69ce2168fe41060f5d4be1a6595b1b
+DIST libsc-1.1.tar.gz 263643 SHA256 99c3fb3b7d6514ccaa667bdc848a7308c00f05bf6fdc0561ce286db9644ee03e SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579 WHIRLPOOL b6c123cd245e4beb4cd6479e9d781d86784fab6975edc20562c14b5ecc59dbc824aca10fb02e4fa7612f0b2743fd7c7d3799f203546c5859896812a21e1362df
+DIST p4est-1.0.tar.gz 695027 SHA256 d669b0487eb0d2765c77adcab551c447f2cfa49d60a5a9016eaf48526ece74b6 SHA512 781240bbca2779f4076c310575ad99e8b526ecf6a3da8b7b5f096615bbfb570dd0556e607797715b69c95c6dd73baf837f1c632be763efae835941107f1fe3df WHIRLPOOL 690e350c3960b48cf5ac6bbc9aeff49557da25a69e152b7dca8fdb91b424f1669e9cf603903fb3f4de01078b964c63f7811b63000cacc5d56845ba96f6c516bf
+DIST p4est-1.1.tar.gz 1241423 SHA256 14a4ba6c5883ece611c90fae29bc60a454c20db43df646b232bd5aa552acd5cf SHA512 11eb576a16a4cc959eff8894d6cb11d8bae092951be9cf9d71b538825bdf675af7fd77d79505b9e896ec1810c1f8e9391447a79263c6d2e33fef780e97d07f29 WHIRLPOOL 38253d7dd01d5406c5e7e773afdabcac85d49bedd86d3a325c227b32e9d09ddb5397a77e8485489a2e46c582ea242d5eaad877c139504088246d2b8d31b86c63
diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
new file mode 100644
index 00000000000..a7e30547b05
--- /dev/null
+++ b/sci-libs/p4est/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tamiko@gentoo.org</email>
+ <name>Matthias Maier</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
+The p4est software library enables the dynamic management of a collection
+of adaptive octrees, conveniently called a forest of octrees. p4est is
+designed to work in parallel and scale to hundreds of thousands of
+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>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-libs/p4est/p4est-1.0.ebuild b/sci-libs/p4est/p4est-1.0.ebuild
new file mode 100644
index 00000000000..637628420bf
--- /dev/null
+++ b/sci-libs/p4est/p4est-1.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# The build system currently fails with everything newer than 1.11.
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+SRC_URI="
+ https://github.com/cburstedde/p4est/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 ~amd64-linux ~x86-linux"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="debug doc examples mpi romio static-libs +vtk-binary"
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+ ~sci-libs/libsc-${PV}[mpi=,romio=,static-libs=]
+ dev-lang/lua:*
+ sys-apps/util-linux
+ virtual/blas
+ virtual/lapack
+ mpi? ( virtual/mpi[romio=] )"
+
+DEPEND="
+ ${RDEPEND}
+ sys-devel/automake:1.11
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ default
+
+ # Inject libsc to get all parts of the build system...
+ rmdir "${S}/sc" || die "rmdir failed"
+ mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
+
+ # 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/libsc\.la/libsc\.so/" \
+ "${S}"/configure || die "sed failed"
+}
+
+src_configure() {
+ # avoid underlinkage
+ LDFLAGS="${LDFLAGS} -lsc"
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable mpi)
+ $(use_enable romio mpiio)
+ $(use_enable static-libs static)
+ $(use_enable vtk-binary)
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+ --with-sc="${EPREFIX}/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"
+}
diff --git a/sci-libs/p4est/p4est-1.1.ebuild b/sci-libs/p4est/p4est-1.1.ebuild
new file mode 100644
index 00000000000..637628420bf
--- /dev/null
+++ b/sci-libs/p4est/p4est-1.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# The build system currently fails with everything newer than 1.11.
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+SRC_URI="
+ https://github.com/cburstedde/p4est/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 ~amd64-linux ~x86-linux"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="debug doc examples mpi romio static-libs +vtk-binary"
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+ ~sci-libs/libsc-${PV}[mpi=,romio=,static-libs=]
+ dev-lang/lua:*
+ sys-apps/util-linux
+ virtual/blas
+ virtual/lapack
+ mpi? ( virtual/mpi[romio=] )"
+
+DEPEND="
+ ${RDEPEND}
+ sys-devel/automake:1.11
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ default
+
+ # Inject libsc to get all parts of the build system...
+ rmdir "${S}/sc" || die "rmdir failed"
+ mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
+
+ # 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/libsc\.la/libsc\.so/" \
+ "${S}"/configure || die "sed failed"
+}
+
+src_configure() {
+ # avoid underlinkage
+ LDFLAGS="${LDFLAGS} -lsc"
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable mpi)
+ $(use_enable romio mpiio)
+ $(use_enable static-libs static)
+ $(use_enable vtk-binary)
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+ --with-sc="${EPREFIX}/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"
+}
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
new file mode 100644
index 00000000000..38e6d195684
--- /dev/null
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs eutils
+
+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="git://github.com/cburstedde/p4est.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="
+ https://github.com/cburstedde/p4est/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 static-libs threads +vtk-binary"
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+ ~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
+ dev-lang/lua:*
+ sys-apps/util-linux
+ virtual/blas
+ virtual/lapack
+ mpi? ( virtual/mpi[romio=] )"
+
+DEPEND="
+ ${RDEPEND}
+ sys-devel/automake:1.11
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+ tc-has-openmp || \
+ die "Please select an openmp capable compiler like gcc[openmp]"
+ fi
+}
+
+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/libsc\.la/libsc\.so/" \
+ "${S}"/configure || die "sed failed"
+
+}
+
+src_configure() {
+ # avoid underlinkage
+ LDFLAGS="${LDFLAGS} -lsc"
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable mpi)
+ $(use_enable openmp)
+ $(use_enable romio mpiio)
+ $(use_enable static-libs static)
+ $(use_enable threads pthread)
+ $(use_enable vtk-binary)
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+ --with-sc="${EPREFIX}/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"
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-07-15 9:07 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-30 10:04 [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-07-15 9:07 Matthias Maier
2023-07-15 2:16 Matthias Maier
2023-06-20 1:32 Matthias Maier
2023-06-19 23:54 Matthias Maier
2023-06-19 18:26 Matthias Maier
2023-06-19 18:26 Matthias Maier
2022-08-11 11:13 Sam James
2022-04-15 6:43 Sam James
2021-11-12 4:06 Matthias Maier
2021-08-04 17:40 David Seifert
2021-08-04 17:40 David Seifert
2021-02-18 18:57 David Seifert
2021-02-15 0:32 Sam James
2020-04-23 21:41 Matthias Maier
2020-04-23 21:41 Matthias Maier
2019-04-15 1:34 Matthias Maier
2017-08-13 0:56 Matthias Maier
2017-05-26 17:38 Matthias Maier
2017-05-26 17:13 Matthias Maier
2017-05-26 17:12 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox