From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/, sci-libs/libsc/files/
Date: Wed, 1 Feb 2023 19:27:17 +0000 (UTC) [thread overview]
Message-ID: <1675279599.406d3fc821c6be208814445bc2ad98bed3c2e9b4.asturm@gentoo> (raw)
commit: 406d3fc821c6be208814445bc2ad98bed3c2e9b4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 15:54:11 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 19:26:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406d3fc8
sci-libs/libsc: drop 2.3.1-r1, 2.3.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/libsc/Manifest | 2 -
sci-libs/libsc/files/libsc-2.3-add_soname.patch | 13 ---
.../files/libsc-2.3-autoconf_lua_version.patch | 64 -------------
sci-libs/libsc/libsc-2.3.1-r1.ebuild | 100 ---------------------
sci-libs/libsc/libsc-2.3.3.ebuild | 100 ---------------------
sci-libs/libsc/metadata.xml | 3 -
6 files changed, 282 deletions(-)
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 05ef5652e9e8..d14ff4ef580d 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,3 +1 @@
-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
diff --git a/sci-libs/libsc/files/libsc-2.3-add_soname.patch b/sci-libs/libsc/files/libsc-2.3-add_soname.patch
deleted file mode 100644
index 61e8d56fa44d..000000000000
--- a/sci-libs/libsc/files/libsc-2.3-add_soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9d030d5..decbea8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -43,7 +43,7 @@ src_libsc_la_SOURCES = \
- $(libsc_internal_headers) \
- $(libsc_compiled_sources)
- src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS)
--## src_libsc_la_LDFLAGS = -release $(VERSION)
-+src_libsc_la_LDFLAGS = -release $(VERSION)
- LDADD += @top_builddir@/src/libsc.la
-
- nodist_include_HEADERS += $(libsc_generated_headers)
diff --git a/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch
deleted file mode 100644
index 9881d0aa6227..000000000000
--- a/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/config/sc_include.m4 b/config/sc_include.m4
-index f6f7873..3befe0e 100644
---- a/config/sc_include.m4
-+++ b/config/sc_include.m4
-@@ -281,8 +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],
-- [LUA], [$1])
-+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable], [LUA], [$1])
- SC_CHECK_BLAS_LAPACK([$1])
- SC_BUILTIN_ALL_PREFIX([$1])
- SC_CHECK_PTHREAD([$1])
-diff --git a/configure.ac b/configure.ac
-index ce462e0..b291685 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,7 @@ echo "o---------------------------------------"
- AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/select.h sys/stat.h])
- AC_CHECK_HEADERS([linux/videodev2.h])
- 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"
-diff --git a/src/sc_lua.h b/src/sc_lua.h
-index 770b52f..a6db175 100644
---- 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 <lua5.3/lua.h>
--#include <lua5.3/lualib.h>
--#include <lua5.3/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA5_2_LUA_H
--#include <lua5.2/lua.h>
--#include <lua5.2/lualib.h>
--#include <lua5.2/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA5_1_LUA_H
--#include <lua5.1/lua.h>
--#include <lua5.1/lualib.h>
--#include <lua5.1/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA_H
--#include <lua.h>
--#include <lualib.h>
--#include <lauxlib.h>
--#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.3.1-r1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
deleted file mode 100644
index 6728d0cadb05..000000000000
--- a/sci-libs/libsc/libsc-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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
-
-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.3.ebuild b/sci-libs/libsc/libsc-2.3.3.ebuild
deleted file mode 100644
index 6728d0cadb05..000000000000
--- a/sci-libs/libsc/libsc-2.3.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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
-
-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/metadata.xml b/sci-libs/libsc/metadata.xml
index 9267d0132a0b..ff1113592d21 100644
--- a/sci-libs/libsc/metadata.xml
+++ b/sci-libs/libsc/metadata.xml
@@ -13,9 +13,6 @@
The SC Library provides support for parallel scientific applications.
This support library is primarily used by <pkg>sci-libs/p4est</pkg>.
</longdescription>
- <use>
- <flag name="romio">Build with support for the ROMIO MPI-IO component</flag>
- </use>
<upstream>
<remote-id type="github">cburstedde/libsc</remote-id>
</upstream>
next reply other threads:[~2023-02-01 19:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 19:27 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-19 18:26 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/, sci-libs/libsc/files/ Matthias Maier
2021-06-07 16:41 Matthias Maier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1675279599.406d3fc821c6be208814445bc2ad98bed3c2e9b4.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox