commit: 89f4110b10af316e69158d5aa5f6a100e9420ea2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 02:41:50 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 02:41:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f4110b
sci-libs/arpack: add 3.9.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/arpack/Manifest | 1 +
.../{arpack-9999.ebuild => arpack-3.9.1.ebuild} | 16 ++++++---
sci-libs/arpack/arpack-9999.ebuild | 12 ++++---
.../files/arpack-3.9.1-bashism-configure.patch | 42 ++++++++++++++++++++++
4 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index ce9b7f1fd764..2ea6ef6afd6d 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,4 +1,5 @@
DIST arpack-3.8.0.tar.gz 1014494 BLAKE2B
6daf8a237fdfce527935d777292df150b2f78892d9975f8696a37024fcb78174b29afd300e7abca2684c1907eeda658eb4478f09f580835896c0e10d106cdbbd
SHA512
8969c74c4c0459ea2d29ea49d5260f668fd33f73886df0da78a42a94aea93c9f5fb70f5df035266db68807ab09a92c13487a7a4e6ca64922145aade8a148a2de
DIST arpack-3.9.0.tar.gz 1015328 BLAKE2B
fc9960025140a9d6a570ee0359c16055c826482fe1ee58c2dc7727cd0ead04fbb940da0e08a6f11e05205d239b1059c93af0e08bf2b6e0cfee61d73f1d0d9816
SHA512
fbcaa2179dd1aa5a39fc3e7d80f377ec90ddf16ef93184a88e6ecfc464ed97e5659f2cf578294ac3e0b0c0da6408c86acf5bbdce533e1e9d2a3121848340d282
+DIST arpack-3.9.1.tar.gz 1020208 BLAKE2B
dd1b5b16cc5304bb16ab68055939c8f3c11f761eff69bcfc22b3cb9605b477929f54513649a7becb152e91275bfccdc868d3ccf464fb876732c7ec23a83fe71e
SHA512
1ca590a8c4f75aa74402f9bd62e63851039687f4cb11afa8acb05fce1f22a512bff5fd1709ea85fdbea90b344fbbc01e3944c770b5ddc4d1aabc98ac334f78d2
DIST tutorial.ps.gz 105599 BLAKE2B
99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630
SHA512
a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
DIST ug.ps.gz 248543 BLAKE2B
ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d
SHA512
3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
diff --git a/sci-libs/arpack/arpack-9999.ebuild
b/sci-libs/arpack/arpack-3.9.1.ebuild
similarity index 92%
copy from sci-libs/arpack/arpack-9999.ebuild
copy to sci-libs/arpack/arpack-3.9.1.ebuild
index 543b592a542d..605cbdf7c814 100644
--- a/sci-libs/arpack/arpack-9999.ebuild
+++ b/sci-libs/arpack/arpack-3.9.1.ebuild
@@ -1,21 +1,22 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools fortran-2 toolchain-funcs
+DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
+HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/
https://github.com/opencollab/arpack-ng";
+
if [[ ${PV} == *9999 ]]; then
- inherit git-r3
EGIT_REPO_URI="https://github.com/opencollab/arpack-ng";
+ inherit git-r3
else
SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
S="${WORKDIR}/${PN}-ng-${PV}"
fi
-DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
-HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/
https://github.com/opencollab/arpack-ng";
LICENSE="BSD"
SLOT="0"
IUSE="examples mpi"
@@ -23,10 +24,15 @@ IUSE="examples mpi"
RDEPEND="
virtual/blas
virtual/lapack
- mpi? ( virtual/mpi[fortran] )"
+ mpi? ( virtual/mpi[fortran] )
+"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.9.1-bashism-configure.patch
+)
+
src_prepare() {
default
eautoreconf
diff --git a/sci-libs/arpack/arpack-9999.ebuild
b/sci-libs/arpack/arpack-9999.ebuild
index 543b592a542d..312d55c7b9be 100644
--- a/sci-libs/arpack/arpack-9999.ebuild
+++ b/sci-libs/arpack/arpack-9999.ebuild
@@ -1,21 +1,22 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools fortran-2 toolchain-funcs
+DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
+HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/
https://github.com/opencollab/arpack-ng";
+
if [[ ${PV} == *9999 ]]; then
- inherit git-r3
EGIT_REPO_URI="https://github.com/opencollab/arpack-ng";
+ inherit git-r3
else
SRC_URI="https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
S="${WORKDIR}/${PN}-ng-${PV}"
fi
-DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
-HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/
https://github.com/opencollab/arpack-ng";
LICENSE="BSD"
SLOT="0"
IUSE="examples mpi"
@@ -23,7 +24,8 @@ IUSE="examples mpi"
RDEPEND="
virtual/blas
virtual/lapack
- mpi? ( virtual/mpi[fortran] )"
+ mpi? ( virtual/mpi[fortran] )
+"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/arpack/files/arpack-3.9.1-bashism-configure.patch
b/sci-libs/arpack/files/arpack-3.9.1-bashism-configure.patch
new file mode 100644
index 000000000000..074a43b3ee1d
--- /dev/null
+++ b/sci-libs/arpack/files/arpack-3.9.1-bashism-configure.patch
@@ -0,0 +1,42 @@
+https://github.com/opencollab/arpack-ng/pull/441
+
+From a3beacc11e2acbe0baf8b301cb47938dcf01e71d Mon Sep 17 00:00:00 2001
+From: Sam James <s...@gentoo.org>
+Date: Mon, 13 Nov 2023 02:38:46 +0000
+Subject: [PATCH] configure.ac: fix bashisms
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+checking for cheev_ in -llapack... yes
+./configure: 8590: test: x: unexpected operator
+checking how to print strings... printf
+```
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ dnl Check for LAPACK libraries
+ AX_LAPACK([], [AC_MSG_ERROR([cannot find LAPACK libraries])])
+
+ AC_ARG_VAR(INTERFACE64, [set to 1 to use the 64-bit integer interface (ILP64)
for ARPACK, BLAS and LAPACK])
+-if test x"$INTERFACE64" == x"1"; then
++if test x"$INTERFACE64" = x"1"; then
+ AC_LANG_PUSH([Fortran 77])
+ AX_CHECK_COMPILE_FLAG(-fdefault-integer-8, FFLAGS="$FFLAGS
-fdefault-integer-8",
+ AX_CHECK_COMPILE_FLAG(-i8, FFLAGS="$FFLAGS -i8",
+@@ -191,7 +191,7 @@ AS_IF([test x"$enable_mpi" != x"no"], [
+ ])
+
+ dnl TODO: this needs full re-write of parpack to support ILP64...
+-if test x"$INTERFACE64" == x"1"; then
++if test x"$INTERFACE64" = x"1"; then
+ if test x"$enable_mpi" != x"no"; then
+ AC_MSG_ERROR([Parallel arpack does not support ILP64.])
+ fi
+
