From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- sci-libs/p4est/Manifest | 7 +- sci-libs/p4est/p4est-2.2-r100.ebuild | 120 ---------------------------------- sci-libs/p4est/p4est-2.3.1-r1.ebuild | 122 +++++++++++++++++++++++++++++++++++ sci-libs/p4est/p4est-2.3.1.ebuild | 122 ----------------------------------- sci-libs/p4est/p4est-9999.ebuild | 40 ++++++------ 5 files changed, 145 insertions(+), 266 deletions(-) delete mode 100644 sci-libs/p4est/p4est-2.2-r100.ebuild create mode 100644 sci-libs/p4est/p4est-2.3.1-r1.ebuild delete mode 100644 sci-libs/p4est/p4est-2.3.1.ebuild (limited to 'sci-libs/p4est') diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index 9bf258f97022..ecc16a921e1d 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -1,10 +1,7 @@ AUX p4est-2.3-add_soname.patch 559 BLAKE2B 3a4037ef9f9343aa9ecadb4f5406821152f0d7c9d2fa461a5fa9c74a8a0088101fe6d374c38c52e489e6a1aee818733ed08f57d13f0d50497bc9edfd8f14a538 SHA512 2b16c58c2b897abe31f26cd128eb99716961369e3c41a411ac79b8a31f51864bd346a46d8c78e6ed2206073555237b647346afd475c40d5012c60dae890c839a AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7 -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 -EBUILD p4est-2.2-r100.ebuild 2908 BLAKE2B 768a3e492a9b2dc00dba2443111e6a39cc701b113a696398f93a2b9947ca6ca8fc7fe1203c8e650e3dc122161ca55b85f91f2bded64b13bd0a60d3618d8529f8 SHA512 9ec1e876334f5cd13e148b68a30a661ce03e91cdd0f4dcd6126b044c0fd645ee4494e1e6aa03edb8f787ad10a1136f47cc636f8a44e38aafdc482a85d17a3461 -EBUILD p4est-2.3.1.ebuild 2913 BLAKE2B eed1fe198cdab40113eb84ca27cf01abf416fe3bb2e9038366855bfb8e6df0bd6a934b92bc9a654d2369917183206e5014163aedda21996fe0e459f232e7be1b SHA512 44eb74926a3bd881beecc63d74de81f62cbd3ee698ce7b482b2e0c4eaf8dea5542eb23517a534234d175bf8f8bfe30dbad9e73dff4fdde889177b526fdcac442 -EBUILD p4est-9999.ebuild 2908 BLAKE2B 25d8be9880948ec1d3f30c3e10049b89f1d05880e366b74f60e814847baa7b63f5582013f28ba41af3ab3055912c823b580f2021f55d6e91fcd79da3d811f1d5 SHA512 27dd306e9a793bdcb08c4eaab32d39facfaae784e80f2c50e0f137c9a9121d5e5304a0b432003c55c695df8bacd0e5a83265bfd8629833baad4b5af2d60c831d +EBUILD p4est-2.3.1-r1.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9 +EBUILD p4est-9999.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9 MISC metadata.xml 932 BLAKE2B 7125dfc51747febbc0c075085cfd92b86fdf92814a8ce104c980891ffae0eb0c1056a3d8d029fca27faaaa3df8a13e43909f4dcd3fb7bae77aa280f418e344af SHA512 65de097b1150b51b50bc5a163386cd902ad885963448a0d1f345378da56153f2881209d1f7b04a39be2c294ca80d8d59f05e2e6f3d9765c071cad15c18e843ba 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 ee878cbfc3ee..000000000000 --- 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" -} diff --git a/sci-libs/p4est/p4est-2.3.1-r1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild new file mode 100644 index 000000000000..c7756fee11c5 --- /dev/null +++ b/sci-libs/p4est/p4est-2.3.1-r1.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 +} diff --git a/sci-libs/p4est/p4est-2.3.1.ebuild b/sci-libs/p4est/p4est-2.3.1.ebuild deleted file mode 100644 index 597b67a136a5..000000000000 --- a/sci-libs/p4est/p4est-2.3.1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# 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 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 - 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 -} - -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 bb4b3a864ed0..c7756fee11c5 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 } -- cgit v1.2.3