From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- sci-libs/libsc/Manifest | 8 ++- .../libsc/files/libsc-2.8.3-fix_build_system.patch | 41 ++++++++++++ sci-libs/libsc/files/libsc-2.8.3-set_version.patch | 44 +++++++++++++ sci-libs/libsc/files/libsc-9999-set_version.patch | 44 +++++++++++++ .../libsc-9999_20201220-autoconf_lua_version.patch | 57 ----------------- sci-libs/libsc/libsc-2.8.3.ebuild | 65 +++++++++++++++++++ sci-libs/libsc/libsc-9999.ebuild | 72 ++++++---------------- 7 files changed, 219 insertions(+), 112 deletions(-) create mode 100644 sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch create mode 100644 sci-libs/libsc/files/libsc-2.8.3-set_version.patch create mode 100644 sci-libs/libsc/files/libsc-9999-set_version.patch delete mode 100644 sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch create mode 100644 sci-libs/libsc/libsc-2.8.3.ebuild (limited to 'sci-libs/libsc') diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index ac02442a2880..0ded9d4834a8 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,9 +1,13 @@ 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 +AUX libsc-2.8.3-fix_build_system.patch 1192 BLAKE2B aab3161036987ad1027266c03730141142ab0e86c292dd827cc7010a6cb7a3ba43153bec8bc8319bca80cc5ec97efc9fd10b2f47d126e235fe7d948bf78a6acc SHA512 84264530c72d71f2b77c16037e389f4423e3acda8bba4443ec3d0a4e0d46a1eb6ae3ef85973a56ea990d19987799e1dfc682dee0a039f598f9ef122a262f01f6 +AUX libsc-2.8.3-set_version.patch 1514 BLAKE2B 59e06b4f4d33a641e66ff862ca212b4106dd98214b411a95340c8069ec0cef6c70ac467fa01b94e61a16cd0222cfa5e50c56f6ed088958bfbaeaea2272c1c477 SHA512 20723ffda489e249ed2af124f4ca13b6f477dfc09d7bdc07e8c36f55fd0d168807543b6573b3e1d86fd1200b6982d7a755d7b9b04c39097f39f38aeba5b67e2d +AUX libsc-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845 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 libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de EBUILD libsc-2.3.1-r1.ebuild 2329 BLAKE2B 0e76824c176255a9f3f5d3094f07d5ad8fbcc721f069ea2b0981ddffbc821fcc5eee5f0780a074ed828e4344ab76d8d64426cbf79918a3044dcdeddbf2fef490 SHA512 9094098895f555dc8cb62c78b2fd600b1b563dfb0412bff14f593c1706dd96b633eb76aeaaf205d527ec3e842c0fff04a35997f368c52a30ed90c0f0930fd47a EBUILD libsc-2.3.3.ebuild 2329 BLAKE2B 0e76824c176255a9f3f5d3094f07d5ad8fbcc721f069ea2b0981ddffbc821fcc5eee5f0780a074ed828e4344ab76d8d64426cbf79918a3044dcdeddbf2fef490 SHA512 9094098895f555dc8cb62c78b2fd600b1b563dfb0412bff14f593c1706dd96b633eb76aeaaf205d527ec3e842c0fff04a35997f368c52a30ed90c0f0930fd47a -EBUILD libsc-9999.ebuild 2297 BLAKE2B 0afe3197122a28663aabd949c40add49441e978cfd02b3bcf6072c1b844c02922bdfeb87626e28f46d9047dbd299d9edcd0299e7b7cb28e2739e03619f9d754d SHA512 acbab2613f93d41789f38057d0385be80d8729ac34cdd6011eda569f5a5595d6eedd68a91858c622acb096392cfa6743453657be287de600e10fda8550b64868 +EBUILD libsc-2.8.3.ebuild 1410 BLAKE2B f4654f5c21f62903c0a41e101acf83963972d3d4c243991c909930b8ea85bf601d5b879875bc736ece50bf0fc9ba15140de6cd960ac42532e3866b7c2cd3e388 SHA512 bc4edc505cbee1411027ea8869c8d4feab0006e8fb873cea02f9db59bb4a82f55c7d1391e4dca153e80e5292864120d7baa96f63c83290d0167492e43c381c33 +EBUILD libsc-9999.ebuild 1417 BLAKE2B ecdf34e21086e08c1716f020056ecb36ee8ff98b56fa3b544de22194cb545d848069a01de7ecca14a0a7111b27adfb56116f3f544ae7bb79fca071634e921898 SHA512 cbaaf4392a37220a02580af80884c0c763f1bb34a891219d404f942606e6c394b6f8c3fbe73970909dc0430c8db4ed68f9821c793bf41b481d16ee6c57764a38 MISC metadata.xml 713 BLAKE2B 409d3a0b9037446fad7c431ad9908d6e39fc13a07ac5077e954a33e41e568480546dfb80e29de09071eafa553f683b95b12e4c7fa8175ec0e4da0bcdffc798ba SHA512 cbfb73ff9862b11e63e0d83064bc80f52569df860bdc669aebf83f2ecf3004fd1b4ca2fcc88fc1b981fd5435a5778e9d16483a706327a9f0eeeb87285651cfe8 diff --git a/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch new file mode 100644 index 000000000000..b5bdc734ab55 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch @@ -0,0 +1,41 @@ +https://github.com/cburstedde/libsc/pull/54 +https://github.com/cburstedde/libsc/pull/55 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ce08e2..a588beb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ + DESCRIPTION "The SC library supports parallel scientific applications." + VERSION ${PROJECT_VERSION}) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + include(CTest) + + include(cmake/options.cmake) +@@ -28,8 +30,7 @@ if(MPI_FOUND) + endif() + + # --- libb64 +-add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c +- libb64/b64dec.c libb64/b64enc.c) ++add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c) + target_include_directories(libb64 PRIVATE libb64) + + # --- sc +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a588beb..aff0eca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,8 +64,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_SOURCE_DIR}/src/sc_builti + + install(TARGETS sc + EXPORT ${PROJECT_NAME}Targets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib) ++ ARCHIVE DESTINATION ${library_reldir} ++ LIBRARY DESTINATION ${library_reldir}) + + add_subdirectory(src) + diff --git a/sci-libs/libsc/files/libsc-2.8.3-set_version.patch b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch new file mode 100644 index 000000000000..dcd63994cc67 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index dd6009e..7c5c8f3 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,36 +1,3 @@ + # --- extract version from Git + +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${_major}.${_minor}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${_major}) +- endif() +-endif() ++set(PROJECT_VERSION 2.8.3) + + diff --git a/sci-libs/libsc/files/libsc-9999-set_version.patch b/sci-libs/libsc/files/libsc-9999-set_version.patch new file mode 100644 index 000000000000..0820b001d8cd --- /dev/null +++ b/sci-libs/libsc/files/libsc-9999-set_version.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index dd6009e..7c5c8f3 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,36 +1,3 @@ + # --- extract version from Git + +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${_major}.${_minor}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${_major}) +- endif() +-endif() ++set(PROJECT_VERSION 9999.0.0) + + diff --git a/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch deleted file mode 100644 index c138bb3fc4ba..000000000000 --- a/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch +++ /dev/null @@ -1,57 +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([lua53 lua5.3 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,29 +30,9 @@ - - SC_EXTERN_C_BEGIN; - --#ifdef SC_HAVE_LUA5_3_LUA_H --#include --#include --#include --#else --#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 --#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.8.3.ebuild b/sci-libs/libsc/libsc-2.8.3.ebuild new file mode 100644 index 000000000000..9ed5ecf5c58f --- /dev/null +++ b/sci-libs/libsc/libsc-2.8.3.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake 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 threads" + +RDEPEND=" + sys-apps/util-linux + sys-libs/zlib + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-set_version.patch + "${FILESDIR}"/${P}-fix_build_system.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 -r "${ED}"/usr/include/getopt.h \ + "${ED}"/usr/include/getopt_int.h \ + "${ED}"/usr/include/sc_builtin || die "rm failed" + + mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" +} diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild index 00143eccd873..8d6bdbb8314c 100644 --- a/sci-libs/libsc/libsc-9999.ebuild +++ b/sci-libs/libsc/libsc-9999.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 +inherit cmake toolchain-funcs DESCRIPTION="Support for parallel scientific applications" HOMEPAGE="http://www.p4est.org/" @@ -21,22 +19,20 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="debug examples mpi openmp romio threads" -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - romio? ( mpi )" +IUSE="debug examples mpi openmp threads" RDEPEND=" - ${LUA_DEPS} sys-apps/util-linux + sys-libs/zlib virtual/blas virtual/lapack - mpi? ( virtual/mpi[romio?] )" + mpi? ( virtual/mpi[romio] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch + "${FILESDIR}"/${PN}-2.8.3-fix_build_system.patch + "${FILESDIR}"/${P}-set_version.patch ) pkg_pretend() { @@ -45,55 +41,25 @@ pkg_pretend() { 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)" + local mycmakeargs=( + -Dmpi="$(usex mpi)" + -Dopenmp="$(usex openmp)" + -Dlibrary_reldir="$(get_libdir)" ) - econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" + + cmake_src_configure } 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" + cmake_src_install - # 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" + rm -r "${ED}"/usr/include/getopt.h \ + "${ED}"/usr/include/getopt_int.h \ + "${ED}"/usr/include/sc_builtin || die "rm failed" - # no static archives - find "${ED}" -name '*.la' -delete || die + mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" } -- cgit v1.2.3