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/libsc/Manifest | 7 +- .../files/libsc-2.2-autoconf_lua_version.patch | 51 ----------- sci-libs/libsc/libsc-2.2-r100.ebuild | 100 -------------------- sci-libs/libsc/libsc-2.3.1-r1.ebuild | 100 ++++++++++++++++++++ sci-libs/libsc/libsc-2.3.1.ebuild | 101 --------------------- sci-libs/libsc/libsc-9999.ebuild | 37 ++++---- 6 files changed, 120 insertions(+), 276 deletions(-) delete mode 100644 sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch delete mode 100644 sci-libs/libsc/libsc-2.2-r100.ebuild create mode 100644 sci-libs/libsc/libsc-2.3.1-r1.ebuild delete mode 100644 sci-libs/libsc/libsc-2.3.1.ebuild (limited to 'sci-libs/libsc') diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index 9ba04972ac8b..4b846c45e5c6 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,10 +1,7 @@ -AUX libsc-2.2-autoconf_lua_version.patch 1310 BLAKE2B 5d6ced3339ced04b9681cb4940dc5b0bc130b87dc7fa357f91fffc3deb8316ecd1f3f504b578cdf105b533772e8ba9ec34f4410960721ace1ac7e5fba3a04a65 SHA512 51c417011b481712d3469fe86591c903e16cce2c06b83cc7e3ee663d75ad4910b60f8893f589fdd6a38282e1668a1f97d93c50fc360a5919379dec5520a8905c AUX libsc-2.3-add_soname.patch 479 BLAKE2B 3e7e199f88160dc7d5af67696d1a1b1cb2d668589e5a219adcdb6791879e1370f3f638d546b915a4cc40bc5fa594a4e3dd927d31e735dfb287d95ffaa4e6e897 SHA512 d8460b4b1ddb790903f7ddf053f5cb1eabf74741a10a79784a2764b756f82e7c160e6e6752c01eeb4cca2e2e99316c0b2b0f3192bf4415685523abdf71dc1065 AUX libsc-2.3-autoconf_lua_version.patch 1790 BLAKE2B 7968b643acddc54f81b06028392ee328143f280178ed4a52e4a7eabc85906f043b9edd82cf7c0ef7c4956cee59602bb231e0051da162538419de3b9b88c7a57d SHA512 6c3c183b5255296ac0340845b94d39e6aa1f4675a6fc44ea139635e73aca7a4d8eb02d14a7e9599723ca9d0702c911c3d20102a95c3d4ff1ed941b565a5f9cf7 AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f115cd177fa998cb8352f9c0abb06c4a89916a1e14b5d99695d15602700f891a8985f74ba19114e62da152bda3c74810d7b307762dadff837a SHA512 4993bc99cd7e88ee4fc523b14d859745fbc06ff3e89a80a96a2f33ba64e782c2c25ffd5620b93537056b17fe02a2648de54eee276174147d776c6747230b476c -DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a -EBUILD libsc-2.2-r100.ebuild 2291 BLAKE2B 418dc0bc9219b6f897523352c8c056c2e495fe5e89634f29aea1810fba4ad23073c544b807c42bd594eb3f2892e320918b9cb0151f5aece319d442c2a9517706 SHA512 7922b32ff3989cedb0b34fa9b6abedd8cdd8a890ede27dade44fb3e2082b353c47444f30a21f4e0d5e84c3cc78a16dd92dcfcf1dcdf8a267f9327915be723cf1 -EBUILD libsc-2.3.1.ebuild 2333 BLAKE2B ec5969ed4acac58bfd0d50675ac8b7b52f552f6cc82c9270edf72f2a18464333fc5bdcde0670ede24f6bd0b6e80ff13023dae91f97c6d10c8434fd3a27162934 SHA512 a257c87659a08a3a68ae2f9096c5f0633fc892ef15e59c76f966fe8994200571c7a1ca0185bf8145e7a9cfffd92c0798c2a8123325bc17fbf00cff4e1359b847 -EBUILD libsc-9999.ebuild 2301 BLAKE2B d0512fc7b8fbcf57439361287a160376a9b88fed9c8bb8d6026d95a133f50fd6f0796e81e143f55abbf5d964a9a55dbaf57a83b3a28f2dca02cae1cac553ce22 SHA512 0ffaeb80966af4463a496059605895669bde82381b3a8bfd76d899806d8cba863ac6a252ec400a38659b872126fb4dd5d69e4816334c87e430665183382ea064 +EBUILD libsc-2.3.1-r1.ebuild 2329 BLAKE2B 0e76824c176255a9f3f5d3094f07d5ad8fbcc721f069ea2b0981ddffbc821fcc5eee5f0780a074ed828e4344ab76d8d64426cbf79918a3044dcdeddbf2fef490 SHA512 9094098895f555dc8cb62c78b2fd600b1b563dfb0412bff14f593c1706dd96b633eb76aeaaf205d527ec3e842c0fff04a35997f368c52a30ed90c0f0930fd47a +EBUILD libsc-9999.ebuild 2297 BLAKE2B 0afe3197122a28663aabd949c40add49441e978cfd02b3bcf6072c1b844c02922bdfeb87626e28f46d9047dbd299d9edcd0299e7b7cb28e2739e03619f9d754d SHA512 acbab2613f93d41789f38057d0385be80d8729ac34cdd6011eda569f5a5595d6eedd68a91858c622acb096392cfa6743453657be287de600e10fda8550b64868 MISC metadata.xml 712 BLAKE2B 9e1ddf9aece6b04220d62626d4fd3af7b2f02a99f52b526482166bbd27b131dfaa3b6acf6e9324667a5f942617dcc78463631fea0e08e7dc84aa401bbd51741c SHA512 fa2abd50b887f928a97f3612a53f3254e08be476d5e4ca699bc25143bb13f4f83d69f9040c937710cb70399e2e7a4de8ca86d412173d9bd32257313bb4d12d74 diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch deleted file mode 100644 index c2cbdb1b003b..000000000000 --- a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/config/sc_include.m4 -+++ b/config/sc_include.m4 -@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES], - [ - SC_REQUIRE_LIB([m], [fabs]) - SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1]) --SC_CHECK_LIB([lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable], -+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable], - [LUA], [$1]) - SC_CHECK_BLAS_LAPACK([$1]) - SC_BUILTIN_ALL_PREFIX([$1]) ---- a/configure.ac -+++ b/configure.ac -@@ -74,7 +74,7 @@ echo "| Checking headers" - echo "o---------------------------------------" - - AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h]) --AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h]) -+AC_CHECK_HEADERS([$LUA_IMPL/lua.h]) - - echo "o---------------------------------------" - echo "| Checking functions" ---- a/src/sc_lua.h -+++ b/src/sc_lua.h -@@ -30,23 +30,9 @@ - - SC_EXTERN_C_BEGIN; - --#ifdef SC_HAVE_LUA5_2_LUA_H --#include --#include --#include --#else --#ifdef SC_HAVE_LUA5_1_LUA_H --#include --#include --#include --#else --#ifdef SC_HAVE_LUA_H --#include --#include --#include --#endif --#endif --#endif -+#include <@LUA_IMPL@/lua.h> -+#include <@LUA_IMPL@/lualib.h> -+#include <@LUA_IMPL@/lauxlib.h> - - SC_EXTERN_C_END; - diff --git a/sci-libs/libsc/libsc-2.2-r100.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild deleted file mode 100644 index e29a4201d39b..000000000000 --- a/sci-libs/libsc/libsc-2.2-r100.ebuild +++ /dev/null @@ -1,100 +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} ) - -inherit autotools lua-single toolchain-funcs - -DESCRIPTION="Support for parallel scientific applications" -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" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" - -RDEPEND="${LUA_DEPS} - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2-autoconf_lua_version.patch -) - -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - -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 - - sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die - - # Inject a version number into the build system - echo "${PV}" > ${S}/.tarball-version || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp openmp) - $(use_enable romio mpiio) - $(use_enable static-libs static) - $(use_enable threads pthread) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" -} - -src_install() { - default - - 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 - - # Remove ac files, bug #619806 - rm -r "${ED}"/usr/share/aclocal || die "rm failed" - - # Fix wrong installation paths: - dodir /usr/share/libsc - mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" - mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/usr/share/ini || die "rmdir failed" -} diff --git a/sci-libs/libsc/libsc-2.3.1-r1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild new file mode 100644 index 000000000000..667c713b0096 --- /dev/null +++ b/sci-libs/libsc/libsc-2.3.1-r1.ebuild @@ -0,0 +1,100 @@ +# 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="Support for parallel scientific applications" +HOMEPAGE="http://www.p4est.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="debug examples mpi openmp romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + romio? ( mpi )" + +RDEPEND=" + ${LUA_DEPS} + sys-apps/util-linux + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio?] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.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 + + sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die + + # Inject a version number into the build system + echo "${PV}" > ${S}/.tarball-version || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-static + $(use_enable debug) + $(use_enable mpi) + $(use_enable openmp openmp) + $(use_enable romio mpiio) + $(use_enable threads pthread) + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" +} + +src_install() { + default + + 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 + + # Remove ac files, bug #619806 + rm -r "${ED}"/usr/share/aclocal || die "rm failed" + + # Fix wrong installation paths: + dodir /usr/share/libsc + mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed" + rmdir "${ED}"/etc/ || die "rmdir failed" + mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" + rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1.ebuild deleted file mode 100644 index e84c20273cf0..000000000000 --- a/sci-libs/libsc/libsc-2.3.1.ebuild +++ /dev/null @@ -1,101 +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="Support for parallel scientific applications" -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" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" - -RDEPEND="${LUA_DEPS} - sys-apps/util-linux - virtual/blas - virtual/lapack - mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch - "${FILESDIR}"/${PN}-2.3-add_soname.patch -) - -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - -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 - - sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die - - # Inject a version number into the build system - echo "${PV}" > ${S}/.tarball-version || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp openmp) - $(use_enable romio mpiio) - $(use_enable static-libs static) - $(use_enable threads pthread) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" -} - -src_install() { - default - - 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 - - # Remove ac files, bug #619806 - rm -r "${ED}"/usr/share/aclocal || die "rm failed" - - # Fix wrong installation paths: - dodir /usr/share/libsc - mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" - mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/usr/share/ini || die "rmdir failed" -} diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild index b99e72325210..00143eccd873 100644 --- a/sci-libs/libsc/libsc-9999.ebuild +++ b/sci-libs/libsc/libsc-9999.ebuild @@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs DESCRIPTION="Support for parallel scientific applications" HOMEPAGE="http://www.p4est.org/" -if [[ ${PV} = *9999* ]]; then +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" @@ -22,34 +21,31 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="debug examples mpi openmp romio static-libs threads" - -REQUIRED_USE="${LUA_REQUIRED_USE} +IUSE="debug examples mpi openmp romio threads" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} romio? ( mpi )" -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch ) -DOCS=( AUTHORS NEWS README ) - -AUTOTOOLS_AUTORECONF=true - 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() { @@ -64,11 +60,11 @@ src_prepare() { src_configure() { local myeconfargs=( + --disable-static $(use_enable debug) $(use_enable mpi) $(use_enable openmp openmp) $(use_enable romio mpiio) - $(use_enable static-libs static) $(use_enable threads pthread) --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" @@ -97,4 +93,7 @@ src_install() { rmdir "${ED}"/etc/ || die "rmdir failed" mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" rmdir "${ED}"/usr/share/ini || die "rmdir failed" + + # no static archives + find "${ED}" -name '*.la' -delete || die } -- cgit v1.2.3