public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
@ 2021-06-07 16:41 Matthias Maier
  0 siblings, 0 replies; 7+ messages in thread
From: Matthias Maier @ 2021-06-07 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c52d9871a73bf583fc7e013a30893d9019e89721
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  7 15:33:21 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jun  7 16:41:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52d9871

sci-libs/libsc: version bump to 2.3.1

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/libsc/Manifest                            |   1 +
 .../files/libsc-2.3-autoconf_lua_version.patch     |  64 +++++++++++++
 sci-libs/libsc/libsc-2.3.1.ebuild                  | 100 +++++++++++++++++++++
 3 files changed, 165 insertions(+)

diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 9357d90a6a8..4cd22d93ef3 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1 +1,2 @@
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
+DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a

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
new file mode 100644
index 00000000000..9881d0aa622
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch
@@ -0,0 +1,64 @@
+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.ebuild b/sci-libs/libsc/libsc-2.3.1.ebuild
new file mode 100644
index 00000000000..1e37b3080cf
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.3.1.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..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.3-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"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
@ 2021-08-04 17:40 David Seifert
  0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-08-04 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     68d1bc6fccd1f7732b15f206a598dcc9a46514ae
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  4 17:40:37 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug  4 17:40:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d1bc6f

sci-libs/libsc: drop 2.2-r100

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/libsc/Manifest                            |   1 -
 .../files/libsc-2.2-autoconf_lua_version.patch     |  51 -----------
 sci-libs/libsc/libsc-2.2-r100.ebuild               | 100 ---------------------
 3 files changed, 152 deletions(-)

diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 4cd22d93ef3..f17c047aae4 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1 @@
-DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a

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 c2cbdb1b003..00000000000
--- 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 <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
-+#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 e29a4201d39..00000000000
--- 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"
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
@ 2022-02-14  0:51 Matthias Maier
  0 siblings, 0 replies; 7+ messages in thread
From: Matthias Maier @ 2022-02-14  0:51 UTC (permalink / raw
  To: gentoo-commits

commit:     4a36f33db8b24b3e1d642dfeeb68f0c1ed9c03cf
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 00:17:45 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 00:51:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a36f33d

sci-libs/libsc: update live ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/libsc/files/libsc-9999-set_version.patch | 44 ++++++++++++++
 sci-libs/libsc/libsc-9999.ebuild                  | 72 ++++++-----------------
 2 files changed, 63 insertions(+), 53 deletions(-)

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/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"
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
@ 2022-02-14  0:51 Matthias Maier
  0 siblings, 0 replies; 7+ messages in thread
From: Matthias Maier @ 2022-02-14  0:51 UTC (permalink / raw
  To: gentoo-commits

commit:     fc1125212d7c3f05146818f6870d48521231fda4
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 00:15:02 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 00:51:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc112521

sci-libs/libsc: version bump to 2.8.3

With the switch to CMake the new version should now obey all compiler
and linker flag overrides.

Closes: https://bugs.gentoo.org/794859
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/libsc/Manifest                            |  1 +
 .../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/libsc-2.8.3.ebuild                  | 65 ++++++++++++++++++++++
 4 files changed, 151 insertions(+)

diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index f5ddaed8843d..05ef5652e9e8 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1,3 @@
 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.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/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"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
@ 2023-06-20  0:45 Matthias Maier
  0 siblings, 0 replies; 7+ messages in thread
From: Matthias Maier @ 2023-06-20  0:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c5fa4cd54e6ce9ecb1d40b444587763d0507abd5
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 00:17:41 2023 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 00:45:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fa4cd5

sci-libs/libsc: QA: fix install locations, EAPI bump

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../libsc/files/libsc-2.8.5-fix_cmake_path.patch   | 33 ++++++++++++++++++++++
 ...libsc-2.8.5-r1.ebuild => libsc-2.8.5-r2.ebuild} |  7 ++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch
new file mode 100644
index 000000000000..d36f9151901c
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/install.cmake b/cmake/install.cmake
+index f093fa9..c281f66 100644
+--- a/cmake/install.cmake
++++ b/cmake/install.cmake
+@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion
+ 
+ install(EXPORT ${PROJECT_NAME}-targets
+ NAMESPACE ${PROJECT_NAME}::
+-DESTINATION cmake
++DESTINATION ${library_reldir}/cmake/SC
+ )
+ 
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake
+-DESTINATION cmake
++DESTINATION ${library_reldir}/cmake/SC
+ )
+ 
+ export(EXPORT ${PROJECT_NAME}-targets
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 800937f..9de0cfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,7 +75,7 @@ endif(BUILD_TESTING)
+ 
+ install(FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSC.cmake
+-DESTINATION cmake)
++DESTINATION ${library_reldir}/cmake/SC)
+ 
+ include(cmake/pkgconf.cmake)
+ include(cmake/install.cmake)

diff --git a/sci-libs/libsc/libsc-2.8.5-r1.ebuild b/sci-libs/libsc/libsc-2.8.5-r2.ebuild
similarity index 90%
rename from sci-libs/libsc/libsc-2.8.5-r1.ebuild
rename to sci-libs/libsc/libsc-2.8.5-r2.ebuild
index 33d78e6073fe..786ecf6012b8 100644
--- a/sci-libs/libsc/libsc-2.8.5-r1.ebuild
+++ b/sci-libs/libsc/libsc-2.8.5-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake toolchain-funcs
 
@@ -35,6 +35,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix_build_system.patch
 	"${FILESDIR}"/${P}-do_not_compile_zlib-ng.patch
 	"${FILESDIR}"/${P}-use_zlib-ng_symbols.patch
+	"${FILESDIR}"/${P}-fix_cmake_path.patch
 )
 
 pkg_pretend() {
@@ -58,12 +59,10 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	mv "${ED}"/usr/cmake "${ED}"/usr/$(get_libdir)/ || die "mv failed"
-
 	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"
+	mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${PF}/ || die "mv failed"
 	rm -r "${ED}"/usr/share/docs || die "rm failed"
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
@ 2023-07-15  2:15 Matthias Maier
  0 siblings, 0 replies; 7+ messages in thread
From: Matthias Maier @ 2023-07-15  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     deade5ff52628efc8005c16ca711917bf8565f99
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 01:23:44 2023 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 02:15:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deade5ff

sci-libs/libsc: add 2.3.6

This partially reverts commit 406d3fc821c6be208814445bc2ad98bed3c2e9b4
and bumps 2.3.3 to 2.3.6.

In turns out that libsc/p4est-2.8.5 has a massive performance regression
which necessitates to use the "stable" version 2.3.6. Thus, bring it
back into the tree

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/libsc/Manifest                            |   1 +
 .../files/libsc-2.3-autoconf_lua_version.patch     |  64 +++++++++++++
 .../libsc/files/libsc-2.3.6-override_soname.patch  |  13 +++
 sci-libs/libsc/libsc-2.3.6.ebuild                  | 100 +++++++++++++++++++++
 sci-libs/libsc/metadata.xml                        |   3 +
 5 files changed, 181 insertions(+)

diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index af1e9c81cb76..d17cc1e97d93 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1,3 @@
+DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117
 DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de
 DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b

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
new file mode 100644
index 000000000000..9881d0aa6227
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.3-autoconf_lua_version.patch
@@ -0,0 +1,64 @@
+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/files/libsc-2.3.6-override_soname.patch b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch
new file mode 100644
index 000000000000..54a45294c380
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.3.6-override_soname.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 914237c..0bf982a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -45,7 +45,7 @@ src_libsc_la_SOURCES = \
+ src_libsc_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBSC_CPPFLAGS)
+ ## This is the official API versioning scheme of libtool.  Please see:
+ ## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning
+-src_libsc_la_LDFLAGS = -version-info 1:0:0
++src_libsc_la_LDFLAGS = -release $(VERSION)
+ LDADD += src/libsc.la
+ 
+ nodist_include_HEADERS += $(libsc_generated_headers)

diff --git a/sci-libs/libsc/libsc-2.3.6.ebuild b/sci-libs/libsc/libsc-2.3.6.ebuild
new file mode 100644
index 000000000000..fcea0df228e5
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.3.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.6-override_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 ff1113592d21..9267d0132a0b 100644
--- a/sci-libs/libsc/metadata.xml
+++ b/sci-libs/libsc/metadata.xml
@@ -13,6 +13,9 @@
 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>


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/
@ 2024-07-04 18:10 Matthias Maier
  0 siblings, 0 replies; 7+ messages in thread
From: Matthias Maier @ 2024-07-04 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b482fa0fa81414be5041c0aab4b4135d45f60431
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  4 17:32:35 2024 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 18:09:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b482fa0f

sci-libs/libsc: add 2.8.6

 - switch to compiling against default zlib instead of zlib-ng

Closes: https://bugs.gentoo.org/928049
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/libsc/Manifest                            |  1 +
 .../libsc/files/libsc-2.8.6-fix_build_system.patch | 25 ++++++++
 .../libsc/files/libsc-2.8.6-fix_cmake_path.patch   | 40 +++++++++++++
 sci-libs/libsc/files/libsc-2.8.6-set_version.patch | 48 +++++++++++++++
 sci-libs/libsc/libsc-2.8.6.ebuild                  | 70 ++++++++++++++++++++++
 5 files changed, 184 insertions(+)

diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index fdfb64071d01..424976397546 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1,3 @@
 DIST libsc-2.3.6.tar.gz 346618 BLAKE2B 6da88f1eec572a5d30ebef5e17554874e3d88d124fbbb7582092bd43a85a547f130a5406ffd40f86d564c95a3e600b2eb854ee0378b8e0c2d755a7d45d55ff1e SHA512 9037ebeebcf84d1dc3026172ee3fd3182729fbdbdadb478e8c05670b17bd3e2f3b192bac9a509bd99312c5f944a10fb7eb0636e8c7bd133b30677eb5ead6d117
 DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b
+DIST libsc-2.8.6.tar.gz 436045 BLAKE2B e0c9911ece10703d70686c5fa67700ed28f2ad2cfa6fc5e8f31c18fadb3e85c82a062520765589f71fbb8b69f2ebc9d07803488e8b0eae50d3146cefddb6c1ad SHA512 9e8d9256fafce3a583a9dc850308020ae614434e94146dc81bd1b8a3130e6ff55eb094d97fe48bf2b9205ea16906503313f1ebf4f3386db92d6cf0bac50c2d74

diff --git a/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch
new file mode 100644
index 000000000000..ed0f30a1a7c8
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.6-fix_build_system.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ebf6ef..0a14b19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,8 @@ HOMEPAGE_URL https://www.p4est.org/
+ DESCRIPTION "The SC library supports parallel scientific applications."
+ VERSION ${PROJECT_VERSION})
+ 
++set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++
+ enable_testing()
+ 
+ include(GNUInstallDirs)
+@@ -63,7 +65,10 @@ TYPE INCLUDE
+ FILES_MATCHING PATTERN "*.h"
+ )
+ 
+-install(TARGETS sc EXPORT ${PROJECT_NAME}-targets)
++install(TARGETS sc EXPORT ${PROJECT_NAME}-targets
++ARCHIVE DESTINATION ${library_reldir}
++LIBRARY DESTINATION ${library_reldir}
++)
+ 
+ add_subdirectory(src)
+ 

diff --git a/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch b/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch
new file mode 100644
index 000000000000..6c8b65f32215
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.6-fix_cmake_path.patch
@@ -0,0 +1,40 @@
+diff --git a/cmake/install.cmake b/cmake/install.cmake
+index edd8012..93f9301 100644
+--- a/cmake/install.cmake
++++ b/cmake/install.cmake
+@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion
+ 
+ install(EXPORT ${PROJECT_NAME}-targets
+ NAMESPACE ${PROJECT_NAME}::
+-DESTINATION cmake
++DESTINATION ${library_reldir}/cmake/SC
+ )
+ 
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake
+-DESTINATION cmake
++DESTINATION ${library_reldir}/cmake/SC
+ )
+ 
+ export(EXPORT ${PROJECT_NAME}-targets
+diff --git a/cmake/pkgconf.cmake b/cmake/pkgconf.cmake
+index 1a1b865..f5bab08 100644
+--- a/cmake/pkgconf.cmake
++++ b/cmake/pkgconf.cmake
+@@ -17,14 +17,4 @@ set(pc_filename libsc-${git_version}.pc)
+ configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconf.pc.in ${pc_filename} @ONLY)
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_filename}
+-        DESTINATION lib/pkgconfig)
+-
+-set(pc_target ${pc_filename})
+-set(pc_link ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/libsc.pc)
+-
+-install(CODE "execute_process( \
+-    COMMAND ${CMAKE_COMMAND} -E create_symlink \
+-    ${pc_target} \
+-    ${pc_link}   \
+-    )"
+-  )
++        DESTINATION ${library_reldir}/pkgconfig)

diff --git a/sci-libs/libsc/files/libsc-2.8.6-set_version.patch b/sci-libs/libsc/files/libsc-2.8.6-set_version.patch
new file mode 100644
index 000000000000..c37943e21c15
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.8.6-set_version.patch
@@ -0,0 +1,48 @@
+diff --git a/cmake/git.cmake b/cmake/git.cmake
+index 4718b8e..c2c594d 100644
+--- a/cmake/git.cmake
++++ b/cmake/git.cmake
+@@ -1,39 +1,6 @@
+ # --- extract version from Git
+ 
+-set(PROJECT_MAJOR 0)
+-set(PROJECT_MINOR 0)
+-set(PROJECT_PATCH 0)
+-set(PROJECT_VERSION 0.0.0)
+-find_program(GIT_VERSION_GEN NAMES git-version-gen
+-             PATHS ${PROJECT_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(PROJECT_MAJOR "${CMAKE_MATCH_1}")
+-    set(PROJECT_MINOR "${CMAKE_MATCH_2}")
+-    set(PROJECT_PATCH "${CMAKE_MATCH_3}")
+-    set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH}.999)
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-    set(PROJECT_MAJOR "${CMAKE_MATCH_1}")
+-    set(PROJECT_MINOR "${CMAKE_MATCH_2}")
+-    set(PROJECT_PATCH "${CMAKE_MATCH_3}")
+-    set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR}.${PROJECT_PATCH})
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-    set(PROJECT_MAJOR "${CMAKE_MATCH_1}")
+-    set(PROJECT_MINOR "${CMAKE_MATCH_2}")
+-    set(PROJECT_VERSION ${PROJECT_MAJOR}.${PROJECT_MINOR})
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)")
+-    set(PROJECT_MAJOR "${CMAKE_MATCH_1}")
+-    set(PROJECT_VERSION ${PROJECT_MAJOR})
+-  endif()
+-endif()
++set(PROJECT_MAJOR 2)
++set(PROJECT_MINOR 8)
++set(PROJECT_PATCH 6)
++set(PROJECT_VERSION 2.8.6)

diff --git a/sci-libs/libsc/libsc-2.8.6.ebuild b/sci-libs/libsc/libsc-2.8.6.ebuild
new file mode 100644
index 000000000000..19acc8bc484f
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.8.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+	"${FILESDIR}"/${P}-fix_cmake_path.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# avoid using debug codepaths that are manually enabled with the
+	# RelWithDebInfo build type
+	local CMAKE_BUILD_TYPE="Release"
+
+	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/${PF}/ || die "mv failed"
+	rm -r "${ED}"/usr/share/docs || die "rm failed"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-07-04 18:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-20  0:45 [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/ Matthias Maier
  -- strict thread matches above, loose matches on Subject: below --
2024-07-04 18:10 Matthias Maier
2023-07-15  2:15 Matthias Maier
2022-02-14  0:51 Matthias Maier
2022-02-14  0:51 Matthias Maier
2021-08-04 17:40 David Seifert
2021-06-07 16:41 Matthias Maier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox