commit: b136f3d38de4caab673aff7ec9e33b5c4a603d7a Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Sun Dec 20 13:18:48 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Sun Dec 20 13:28:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b136f3d3
sci-libs/p4est: migrate to lua-single.eclass Both the latest release and the live ebuild. Doesn't do any Lua detection by itself, relies on libsc configuration instead. Therefore, the same compatibility as respective libsc versions. Status: - 2.2-r100 builds, tests and installs fine - 9999 untested due to build failures in sci-libs/libsc-9999 Closes: https://bugs.gentoo.org/752846 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> profiles/package.mask | 1 + .../p4est/{p4est-9999.ebuild => p4est-2.2-r100.ebuild} | 14 ++++++++------ sci-libs/p4est/p4est-9999.ebuild | 14 ++++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index c7ee6fe1f40..c2d20b616f0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -530,6 +530,7 @@ kde-apps/kdebase-meta:5 >=net-p2p/eiskaltdcpp-2.2.10-r100 >=sci-astronomy/celestia-1.7.0_pre20200316-r100 >=sci-libs/libsc-2.2-r100 +>=sci-libs/p4est-2.2-r100 >=sci-libs/plplot-5.15.0-r100 =sci-visualization/gnuplot-5.4.0-r100 =sci-visualization/gnuplot-5.4.1-r1 diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild similarity index 91% copy from sci-libs/p4est/p4est-9999.ebuild copy to sci-libs/p4est/p4est-2.2-r100.ebuild index 7f8e399758e..cde320a2e5c 100644 --- a/sci-libs/p4est/p4est-9999.ebuild +++ b/sci-libs/p4est/p4est-2.2-r100.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} ) # The build system currently fails with everything newer than 1.11. WANT_AUTOMAKE=1.11 -inherit autotools toolchain-funcs eutils +inherit autotools lua-single toolchain-funcs eutils DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" HOMEPAGE="http://www.p4est.org/"; @@ -29,11 +31,11 @@ SLOT="0" # TODO petsc IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary" -REQUIRED_USE="romio? ( mpi )" +REQUIRED_USE="${LUA_REQUIRED_USE} + romio? ( mpi )" -RDEPEND=" - ~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=] - dev-lang/lua:0= +RDEPEND="${LUA_DEPS} + ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild index 7f8e399758e..cf8dea879ce 100644 --- a/sci-libs/p4est/p4est-9999.ebuild +++ b/sci-libs/p4est/p4est-9999.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +LUA_COMPAT=( lua5-{1..3} ) # The build system currently fails with everything newer than 1.11. WANT_AUTOMAKE=1.11 -inherit autotools toolchain-funcs eutils +inherit autotools lua-single toolchain-funcs eutils DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" HOMEPAGE="http://www.p4est.org/"; @@ -29,11 +31,11 @@ SLOT="0" # TODO petsc IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary" -REQUIRED_USE="romio? ( mpi )" +REQUIRED_USE="${LUA_REQUIRED_USE} + romio? ( mpi )" -RDEPEND=" - ~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=] - dev-lang/lua:0= +RDEPEND="${LUA_DEPS} + ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack
