commit: 015bf07e73675ce706f5a94293ad8df3fd018a8d Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Mon Jan 18 09:46:47 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Mon Jan 18 09:46:47 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=015bf07e
sci-libs/fgsl: version bump 1.3.0, fix fetch, fix homepage Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> sci-libs/fgsl/fgsl-0.9.4.ebuild | 60 ------------------------- sci-libs/fgsl/fgsl-1.3.0.ebuild | 37 +++++++++++++++ sci-libs/fgsl/files/fgsl-0.9.3-sharedlibs.patch | 27 ----------- 3 files changed, 37 insertions(+), 87 deletions(-) diff --git a/sci-libs/fgsl/fgsl-0.9.4.ebuild b/sci-libs/fgsl/fgsl-0.9.4.ebuild deleted file mode 100644 index e59e79bf9..000000000 --- a/sci-libs/fgsl/fgsl-0.9.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils fortran-2 multilib toolchain-funcs - -DESCRIPTION="A Fortran interface to the GNU Scientific Library" -HOMEPAGE="https://www.lrz.de/services/software/mathematik/gsl/fortran/"; -SRC_URI="https://www.lrz.de/services/software/mathematik/gsl/fortran/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="static-libs" - -RDEPEND=">=sci-libs/gsl-1.14" -DEPEND="${RDEPEND} - virtual/pkgconfig" -#TODO: make docs - -FORTRAN_STANDARD=90 - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.9.3-sharedlibs.patch - if use amd64; then - ln -s interface/integer_ilp64.finc integer.finc || die - elif use x86; then - ln -s interface/integer_ilp32.finc integer.finc || die - else - die "Don't know who you are" - fi - - cat <<- EOF > "${S}/make.inc" - F90 = $(tc-getFC) - CC = $(tc-getCC) - GSL_LIB = $($(tc-getPKG_CONFIG) --libs gsl) - GSL_INC = $($(tc-getPKG_CONFIG) --cflags gsl) - PREFIX = /usr - ARFLAGS = -csrv - FPP = -cpp - LIB = $(get_libdir) - EOF - - use static-libs && echo "STATIC_LIBS = yes" >> "${S}/make.inc" -} - -src_configure() { -: -} - -src_install() { - dodoc NEWS README - ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 || die - ln -s lib${PN}.so.0.0.0 lib${PN}.so || die - dolib.so lib${PN}.so* - doheader ${PN}.mod - use static-libs && \ - newlib.a lib${PN}_$(tc-getFC).a lib${PN}.a -} diff --git a/sci-libs/fgsl/fgsl-1.3.0.ebuild b/sci-libs/fgsl/fgsl-1.3.0.ebuild new file mode 100644 index 000000000..58da9c18b --- /dev/null +++ b/sci-libs/fgsl/fgsl-1.3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" + +inherit autotools docs fortran-2 toolchain-funcs + +DESCRIPTION="A Fortran interface to the GNU Scientific Library" +HOMEPAGE="https://doku.lrz.de/display/PUBLIC/FGSL+-+A+Fortran+interface+to+the+GNU+Scientific+Library/"; +SRC_URI="https://doku.lrz.de/download/attachments/43321199/${P}.tar.gz"; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~amd64-linux" +IUSE="static-libs" + +RDEPEND=">=sci-libs/gsl-2.4" +DEPEND="${RDEPEND}" +BDEPEDN="virtual/pkgconfig" + +FORTRAN_STANDARD=90 + +DOCS=( NEWS README ) + +src_compile() { + # With -j higher than 1 we get file not found errors + emake -j1 + docs_compile +} + +src_install() { + default + mv "${ED}/usr/share/doc/fgsl" "${ED}/usr/share/doc/${PF}" || die +} diff --git a/sci-libs/fgsl/files/fgsl-0.9.3-sharedlibs.patch b/sci-libs/fgsl/files/fgsl-0.9.3-sharedlibs.patch deleted file mode 100644 index 401d75098..000000000 --- a/sci-libs/fgsl/files/fgsl-0.9.3-sharedlibs.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.orig 2010-05-01 23:35:17.000000000 +0200 -+++ Makefile 2010-08-17 10:15:38.117694977 +0200 -@@ -14,7 +14,23 @@ - @cd tests; $(MAKE) clean; $(MAKE) -j 8 run - - --lib : libfgsl_$(F90).a -+ifeq ($(STATIC_LIBS),) -+lib : libfgsl.so.0.0.0 -+else -+lib : libfgsl_$(F90).a libfgsl.so.0.0.0 -+endif -+ -+libfgsl.so.0.0.0: fgsl.lo fgsl_utils.lo -+ $(F90) -shared $(LDFLAGS) -Wl,-soname,libfgsl.so.0 -o $@ $^ $(GSL_LIB) -+ -+fgsl.lo : fgsl.f90 api/*.finc interface/*.finc -+ $(F90) -fPIC $(FFLAGS) $(DEBUG) -c fgsl.f90 -o $@ -+ -+%.lo: %.f90 -+ $(F90) -fPIC $(FFLAGS) $(DEBUG) -c -o $@ $^ -+ -+%.lo: %.c -+ $(CC) -fPIC -c $(GSL_INC) $(CFLAGS) $(CDEBUG) -o $@ $^ - - libfgsl_$(F90).a : fgsl.o fgsl_utils.o - ar $(ARFLAGS) libfgsl_$(F90).a $^
