gentoo christmass resync : 25.12.2020

3 files changed, 131 insertions, 7 deletions

diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index d976d385fc96..7e04318ab07f 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -3,6 +3,7 @@ DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a
 DIST p4est-2.0.tar.gz 1296762 BLAKE2B 1d755ec72905da069b9c91182a437c59107189402eb26444cf7fc1755b81bdbfad9aa25802720df401e8d434e5ac67e68b1d7dd5bf312f881017925498ad7514 SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
 EBUILD p4est-2.0.ebuild 2853 BLAKE2B a1ecf45f94636c199d0976af9af9f2dc79fea444bb4148cbddf1d06b51561417c02f444e6f5be131059c542e430fcc6002f296da206e6c8f7c4b37143f4263f7 SHA512 10d56e55b8625b5132b4f99e2e78fbdb3234df094f458ae384f629bcb2fd73d4077a20f834fca5359f967324dd894afbe4634f975dbe13ae732c0e2e1f095549
+EBUILD p4est-2.2-r100.ebuild 2928 BLAKE2B f895c1e2642760a1faa207519453f84e0ee763673162ccef3da9fb83542de68b66f74faff67e76be559a845b988f805d47225e7adf02946507630cca6761f86b SHA512 d9e7026c87372449a4b5499021eeb340a1a7d3f45b4b29f799f749d25ac753b52fbd94e89463a0a06995827a28c3e4d72763451ba8f9136edc0c0bb87cc9aae2
 EBUILD p4est-2.2.ebuild 2853 BLAKE2B a1bf41e6371e1445bd53292b9b804cfdee21241508959c95eeecbc0c002b8f3122e54499fde49c0bfd089d478fc13f6d4f05ae2e0893032e22a6d3cea1b7f8a7 SHA512 7047a4f5cb50d17e0189366f9f25c67664ba5d043ca7626ab3b96617a73b375f442150a2acaef665b6070f5e4bd537178470e425979b8f12f5ae389b10464529
-EBUILD p4est-9999.ebuild 2853 BLAKE2B a1ecf45f94636c199d0976af9af9f2dc79fea444bb4148cbddf1d06b51561417c02f444e6f5be131059c542e430fcc6002f296da206e6c8f7c4b37143f4263f7 SHA512 10d56e55b8625b5132b4f99e2e78fbdb3234df094f458ae384f629bcb2fd73d4077a20f834fca5359f967324dd894afbe4634f975dbe13ae732c0e2e1f095549
+EBUILD p4est-9999.ebuild 2928 BLAKE2B 8b275b896e9ec3b2913660ea92cbf1573c5ede82ccd18bbc51b2d550f278566edaef69d07142531611ed527a0e0661fb03cc0ef919be33b5a2c683ccc520e796 SHA512 888bc5d6b2242207431072d4d4736f1676649e4140acc47b6511f430567a850103c7e482588eadc39b3d799dc7e06474169b6354761ff990182ce5ad9a283a10
 MISC metadata.xml 932 BLAKE2B 25927e97d0092f9fbab6dd7c35f0b2d6b568f1a9790fb1d31917a42946cea1305f9b31aa7cf5773a2b1588b94aab482de2ebfb9aa867af14b8bba2765be2faea SHA512 9c3b0cc4f9f95cf8f4c7d0e250fbc2934e80563ac98b131031d5ba66122a47b9435027f452aeee2df0e917098c7f626513001a30f57952bfaaece21fc9dcc1c1
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
new file mode 100644
index 000000000000..cde320a2e5c6
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.2-r100.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 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 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="${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"
+}
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 7f8e399758eb..cf8dea879cea 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