gentoo resync : 17.02.2021

4 files changed, 111 insertions, 36 deletions

diff --git a/dev-libs/openspecfun/Manifest b/dev-libs/openspecfun/Manifest
index 322fa3ac3ad3..d036b2253da4 100644
--- a/dev-libs/openspecfun/Manifest
+++ b/dev-libs/openspecfun/Manifest
@@ -1,3 +1,4 @@
-DIST openspecfun-0.5.1.tar.gz 121110 BLAKE2B 157bf05d63048d88674d4dc2657d91b0ff5b69f93659eb86a235e805893571ce9eb3dd84be63ff5ea691b8047a25417a8d7f755d547ccbc8b3956b2d2b70a529 SHA512 7f7b0dd04d5c325a99bf5a44521edaed87ba75acc8d85be64e3be55ff697a1544430d1fe4b5330d5ceb907bada26b42750cf6654fc8ed12b1738ec29fcbeb0b3
-EBUILD openspecfun-0.5.1.ebuild 847 BLAKE2B 4a8b66e01f5bb06425a5572a80f1d0e897e399c43ffe927d2fe25f3cc13d519bea71f33e37ea5aca5526d49b7caafd05105a399d80054764d6bb386fbc8bd352 SHA512 dc1de34e5d70653450dd534f3e4ea6f8ebbe8142fda62ff72aeccc9f5752261470179ab7d2883b85fbab4e31290f0dc7eff53bf21e15eb2dc90587fbd466b08d
+AUX openspecfun-0.5.3-Makefile.patch 1754 BLAKE2B 7e116594fd8f64f3d3aa1938963bc51518cd774f5640e44d03382cb73b942d545dcd4312c60aae7c6c72fca078beb1b05cff3c79dfdfd40f4f63715d0e380a55 SHA512 e57585f8274706171049c58b7b943072cf3e9e22a12973bdb021232e8e8789a02a78e62c2d814201914d8d3deb5bf57f583ffa842f7f6ae2a7f5bcc40b87036d
+DIST openspecfun-0.5.3.tar.gz 121156 BLAKE2B 4b1d883634524db9a5c1d5c2e291667264f3bc15c2b6cd1c335ef7a4748668091255c4940c54cea27ab0fd301e7c08156825bcdecfef71802b7d571d74af021e SHA512 503da7592b126cce9ecb8af5ce16c667a9b022676721063e5f551fb88c0955f465ed66df7728ed2391f068ea14b77414bfd9934c0ee38081d11b998826d6b88a
+EBUILD openspecfun-0.5.3.ebuild 846 BLAKE2B 8a4e82c5387f30b2207808473812ca9e16353a812fa2ad81a508d9a74d2306f5724ad24f3dec1e3ddd4181252f016937d7aada30fef6c46fb14c2ca6fc7061fb SHA512 1d39fad14ca2b13b56f1e5cec714720001baf66bc80b42cdbd41368e7290d897921afaf2f3abe9900099ae104270a978e284640abc299e075c62825d920b78f2
 MISC metadata.xml 463 BLAKE2B 2b6c6898e8ca4d4c4483de5364421049b3d631b1a4c09480cdb473cc2a1eb050b5de006919c2888ce97a295bcf88734072676be03fb21af3fdd23b5296f67798 SHA512 04269bd766d4549c8f5182f075d709b61ca75e170e3c2cee36ad7b172c9f0b20967ce921cba055c75c390bdf2a0b0ff36b550c76ece580d8411fcdb10ab20406
diff --git a/dev-libs/openspecfun/files/openspecfun-0.5.3-Makefile.patch b/dev-libs/openspecfun/files/openspecfun-0.5.3-Makefile.patch
new file mode 100644
index 000000000000..a7ebb8609f15
--- /dev/null
+++ b/dev-libs/openspecfun/files/openspecfun-0.5.3-Makefile.patch
@@ -0,0 +1,67 @@
+--- a/Makefile
++++ b/Makefile
+@@ -35,9 +35,7 @@
+ endif
+ endif
+ 
+-all: libopenspecfun.a libopenspecfun.$(OSF_MAJOR_MINOR_SHLIB_EXT)
+-libopenspecfun.a: $(OBJS)
+-	$(AR) -rcs libopenspecfun.a $(OBJS)
++all: libopenspecfun.$(OSF_MAJOR_MINOR_SHLIB_EXT)
+ libopenspecfun.$(OSF_MAJOR_MINOR_SHLIB_EXT): $(OBJS)
+ 	$(FC) -shared $(OBJS) $(LDFLAGS) $(LDFLAGS_add) -Wl,$(SONAME_FLAG),libopenspecfun.$(OSF_MAJOR_SHLIB_EXT) -o $@
+ ifneq ($(OS),WINNT)
+@@ -50,7 +48,6 @@
+ 	mkdir -p $(DESTDIR)$(libdir)
+ 	mkdir -p $(DESTDIR)$(includedir)
+ 	cp -a libopenspecfun.*$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
+-	cp -a libopenspecfun.a $(DESTDIR)$(libdir)/
+ 	cp -a Faddeeva/Faddeeva.h $(DESTDIR)$(includedir)
+ 
+ clean:
+--- a/Make.inc
++++ b/Make.inc
+@@ -14,42 +14,18 @@
+ libdir = $(prefix)/lib
+ includedir = $(prefix)/include
+ 
+-FC = gfortran
+ # CFLAGS_add and FFLAGS_add are flags that we always want to include
+ # They are not overridable by the user, whereas CFLAGS and FFLAGS are
+ # simply defaults and are overridable via environment variables or
+ # `make CFLAGS="foo"` on the command line
+ 
+-FFLAGS = -O3
+-CFLAGS = -std=c99 -Wall -O3
+-CPPFLAGS =
++CFLAGS += -std=c99 -Wall
+ 
+ override FFLAGS_add =
+ override CFLAGS_add =
+ override CPPFLAGS_add =
+ override LDFLAGS_add =
+ 
+-USEGCC = 1
+-USECLANG = 0
+-
+-ifeq ($(OS), Darwin)
+-USEGCC = 0
+-USECLANG = 1
+-endif
+-
+-AR = ar
+-
+-ifeq ($(USECLANG),1)
+-USEGCC = 0
+-CC = clang
+-override CFLAGS_add += -fno-builtin
+-endif
+-
+-ifeq ($(USEGCC),1)
+-CC = gcc
+-override CFLAGS_add += -fno-gnu89-inline -std=c99
+-endif
+-
+ ARCH := $(shell $(CC) -dumpmachine | sed "s/\([^-]*\).*$$/\1/")
+ ifeq ($(ARCH),mingw32)
+ $(error "the mingw32 compiler you are using fails the openblas testsuite. please see the Julia README.windows.md document for a replacement")
diff --git a/dev-libs/openspecfun/openspecfun-0.5.1.ebuild b/dev-libs/openspecfun/openspecfun-0.5.1.ebuild
deleted file mode 100644
index 40545b5459de..000000000000
--- a/dev-libs/openspecfun/openspecfun-0.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fortran-2 multilib
-
-DESCRIPTION="A collection of special mathematical functions"
-HOMEPAGE="https://julialang.org"
-SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="sci-libs/openlibm"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s:/lib:/$(get_libdir):" Make.inc || die
-	default
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" USE_OPENLIBM=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs || rm "${D}/${EPREFIX}/usr/$(get_libdir)/libopenspecfun.a" || die "rm failed"
-	dodoc README.md
-}
diff --git a/dev-libs/openspecfun/openspecfun-0.5.3.ebuild b/dev-libs/openspecfun/openspecfun-0.5.3.ebuild
new file mode 100644
index 000000000000..5fc0b9cb540f
--- /dev/null
+++ b/dev-libs/openspecfun/openspecfun-0.5.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fortran-2 toolchain-funcs
+
+DESCRIPTION="A collection of special mathematical functions"
+HOMEPAGE="https://julialang.org"
+SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="sci-libs/openlibm:="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	emake \
+		prefix="${EPREFIX}"/usr \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		USE_OPENLIBM=1
+}
+
+src_install() {
+	emake \
+		prefix="${EPREFIX}"/usr \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}