sci-libs/fgsl: Version bump to fgsl v1.0, v1.1 and v1.2 needed for latest versions of sci-libs/gsl

Package-Manager: Portage-2.3.8, Repoman-2.3.3

8 files changed, 146 insertions, 93 deletions

diff --git a/sci-libs/fgsl/ChangeLog b/sci-libs/fgsl/ChangeLog
index 5cfaa81..084cc8b 100644
--- a/sci-libs/fgsl/ChangeLog
+++ b/sci-libs/fgsl/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*fgsl-1.0.0 (28 Oct 2017)
+*fgsl-1.1.0 (28 Oct 2017)
+*fgsl-1.2.0 (28 Oct 2017)
+
+  28 Oct 2017; AstroFloyd <AstroFloyd@gmail.com> +fgsl-1.0.0.ebuild,
+  +fgsl-1.1.0.ebuild, +fgsl-1.2.0.ebuild, -fgsl-0.9.4-r1.ebuild,
+  -files/fgsl-0.9.3-sharedlibs.patch, metadata.xml:
+  sci-libs/fgsl: Version bump to fgsl v1.0, v1.1 and v1.2 needed for latest
+  versions of sci-libs/gsl
+
 *fgsl-0.9.4-r1 (02 Jun 2017)
 
   02 Jun 2017; AstroFloyd <AstroFloyd@gmail.com> -fgsl-0.9.ebuild,
@@ -15,4 +25,3 @@
   05 Nov 2016; AstroFloyd <AstroFloyd@gmail.com> fgsl-0.9.ebuild,
   fgsl-0.9.1.ebuild:
   Fix ebuilds: remove use() statement from global scope
-
diff --git a/sci-libs/fgsl/Manifest b/sci-libs/fgsl/Manifest
index 99794b3..aa76493 100644
--- a/sci-libs/fgsl/Manifest
+++ b/sci-libs/fgsl/Manifest
@@ -1,5 +1,8 @@
-AUX fgsl-0.9.3-sharedlibs.patch 726 SHA256 1c4a1bfb406e624f716c56c30345c56a49657148a10ce07ed573e0aed4e22ac3 SHA512 d8ddf2ebb436c665d6d3feff52e7527773712dfa37e1632cc8a3a44f0c207f68acd759cd8f21d655992f49e31c0f1a16dcaa481913fc95b25393ba6bb44d4b4b WHIRLPOOL 14b62d8e7315e79578ea337dbe742d22a9891858d24fdbfcdce35893cee20906f508d109c4c8458713c67a930ebf07d8a980b1eb0227e39f3c3964b9c1acb200
-DIST fgsl-0.9.4.tar.gz 999825 SHA256 f589283f5b9df5df9ef39b108114df2ed740109fabb8956fe98eaaac20924ba7 SHA512 45186a17d2b7e46968a29e99cbb1c7bb4cb22c14b322337e0166ee2e05e6bd63f709d6da566c30e7b350231dff268e65908e542288bdec7ca88ff1cb505eae3e WHIRLPOOL 3c6e2c1221b1e5f8aeee83b78951c2d777550401c41c416d4dd911e946b6f03fd4f2ede6df7c123f59ada9477e3c6cd05b202d2f0e8c121cedf250001610deb8
-EBUILD fgsl-0.9.4-r1.ebuild 1406 SHA256 7d3b2317a9df41a864215fee08ab2c2444797f2e9273a40162d6a78d8da1ac5f SHA512 efa88fec8e490b1c7b2d04fb0b23cbf4c5f16f3d77e81d4ae47af90fa518fda8f9f31b359a88658e02df853656e362d17eb1c620b2a97f6aea6e10104b9e3364 WHIRLPOOL b7d2af481cbcec7c12ee0d9a765132daa192d299a5a2f3cfbd717b2e0d770ca098364b1fee4dff8022231bf814d8f653c055c220d84cbdb6175b1819192a8f05
-MISC ChangeLog 730 SHA256 573df31106023a599764ab5c3c2ec79a6b5279808a80e56de0108f9c7a2ce47d SHA512 967f9cfce96490a33067165b3d872235cce3550c1547e6eee3d5ef85cd4a7b62cbb6b109bc53e323982aa6bbfba4c71f75051c8288a8c3443f23d876936e6728 WHIRLPOOL 6c0c0087d3dd3be3112e04686744c1bb5bf099500122a9eeaad40194b6d79011cbf2b08667268281925c1f612729383d4c9b793ee8581685fae6da74d469b9a8
-MISC metadata.xml 252 SHA256 fa82c8f8ccb7949415fff69cab33850a03547531946e14a4184f1ecda61abf26 SHA512 163d2b3a3faf9e2897150626ba1b1dcf37787379284e0222dd667c03c1fce18ac5e63489ea2674e9b3c5328e5aa636839becdfa8d0dd2b49ffd77019deb88729 WHIRLPOOL 253b5757951fa6a61178c61d6333a21e90ab81cd6167bc6cfa6032e7f9e3304a9afa8290a3b6607994df74f2bd503d3725e173b9beff10555d395eb74844fc1a
+DIST fgsl-1.0.0.tar.gz 3553743 SHA256 2841f6deb2ce05e153fc1d89fe5e46aba74c60a2595c857cef9ca771a0cf6290 SHA512 7f8910b73aeb94e1d071b30f1ccc911e3f2b705a88c90a3f2d61a82e93db4f351505a02d559498e27f5defb328070c95b902f7299f223c9d9e8af39cc6d1cec5 WHIRLPOOL 3c5d58e20bd350fe8cd197a88da16a68614b73d57190e73ea8a00cb92238d4350c38d78b7576da0ec4c8d446fd1aff4b5d5d475a59638c2b13c05f7f023bb4dd
+DIST fgsl-1.1.0.tar.gz 3675906 SHA256 18d45e2bf87695587cd83320777ada0d9e2dfdee43eb9d76e0dab660758aff47 SHA512 afb9fc633021837a254704cbe03a5e4b965fa36107712f8fe0f48a70995671594e15d92899b04fadcaf3715a858bb330e69da6561bd76d79c44b1ac59b7cff80 WHIRLPOOL a4b71e45410f836d93a3ba55e3a7dc0e13844ecf0a1231769d02f4554ee79663bc2e6fb9d05b51caf5e49ed01275b7af75491cf465446e756584434f0758f421
+DIST fgsl-1.2.0.tar.gz 3693440 SHA256 00fd467af2bb778e8d15ac8c27ddc7b9024bb8fa2f950a868d9d24b6086e5ca7 SHA512 ab09c208e2d92b52a4dfc0383df112689327d1019e96cd1f6bca71b85080334212190086b2fc419fc03cce44dc1f1bab5c30d251ca89f02f679767d9f6bdf7e6 WHIRLPOOL 52520d3b625c4a71486d4291ea5209bed27292eb83786a50e17f951084eaf59cd55b7189ffd972b71f20c52e53b563567384cfd4f71d7bfa5e0d5041663f9fad
+EBUILD fgsl-1.0.0.ebuild 1018 SHA256 999a896b39f639f3c120febff1184f2afa697d512ffe2f4f64e60602bed9f953 SHA512 3de2d12d8eb784a75a7c0e0846711e867854070fdff688cb57911f67cb28e9a7f2a0468333d8acaa0c50c69656a2e9d5579f13797c44e8e45cd7dca1c603e27c WHIRLPOOL c3865612d7e9e268ebc3ee6565027f716bf0436188b86f61a165b269480c806e4e1714c5534407643bcef6c6883f6f26a6cebabe956e60d44841dcc40cceadd3
+EBUILD fgsl-1.1.0.ebuild 1018 SHA256 24a930829d6fb136f18311fe6e5b03cf2615735ede044f5fa3ea7a900a4c1ec0 SHA512 f269742668a2267e0970c07997a040693d4b224479f33760bc76ff534659a7393b935b106de8de807cbb7823c46bbb3756fdf3af9d0639ff815eba5363a0f1d5 WHIRLPOOL aead4d18771f534843878d8f8676c192409b659aad3b0d4234bfe2ab103e45f0d4959eccce0dc528d00b53574e96a0ffbc618ab53fdc5116ee633564bab17827
+EBUILD fgsl-1.2.0.ebuild 998 SHA256 57194ac2c15ca2b606fb33a6fc4d73656dc4bf8ec378f41b76d28bd68b995e38 SHA512 efd47629ca41b9915f59fd7db94fa20fe778b0a0629191577eea1693bc8025c58ec662b069ac90eebd2c28756b09b8fe445b6240a2109e644dcba9b2ec22f7bc WHIRLPOOL 0e0dd93c239c8cb91b5c222e8f75b8910976faaf7425f2f4e14c674d5ad6aea1d47889061fa64ee49cfbb2b57a62fe990da5976acfc3d914c14bc5c756faa9ad
+MISC ChangeLog 1098 SHA256 2df30e0be5169c8bc395a1a2c5f9c2d302c15308682b4282a34e7952249b3a31 SHA512 8d1eaaa2e40e1f02edb460308dcc7d665e04699b061e42d2daa3e536db903041c91d50da96055fc343b9f9676f0a2fbee9300f4230930e43c1f2d63982abdd3b WHIRLPOOL 48cc7f5ccc23bbf4ef69c0f4d85efa88c7447ddd4f898dfee3a7ed04a6325be97b8d090372cc9f72b5ce2fcfe99a5feef6a028f91e31e127113c7879123a5d4a
+MISC metadata.xml 341 SHA256 ab38220b386a98faaad757803390a85ebb82ebc627a6d5c3c34542bc58c25bbb SHA512 0a02c7e631ac38acb09fca948040edfbaaa6fb41050b5b56995b094af73f4db08dc93ac17fdc646a6304be9ed5c9baeba28d01bfe2b334ba10e48cd535ed0063 WHIRLPOOL 38b04d03f539a7b0c2fa0ad66884460a0a1e91aa6cb5a14787ec029f4fc0c8599e18f148d11aa8da388b53c70865f26afec01cd61e6510b7093a38d19e58ded5
diff --git a/sci-libs/fgsl/fgsl-0.9.4-r1.ebuild b/sci-libs/fgsl/fgsl-0.9.4-r1.ebuild
deleted file mode 100644
index 5594e68..0000000
--- a/sci-libs/fgsl/fgsl-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="http://www.lrz.de/services/software/mathematik/gsl/fortran/"
-SRC_URI="http://www.lrz.de/services/software/mathematik/gsl/fortran/download/${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.0.0.ebuild b/sci-libs/fgsl/fgsl-1.0.0.ebuild
new file mode 100644
index 0000000..038cdb3
--- /dev/null
+++ b/sci-libs/fgsl/fgsl-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fortran-2
+
+DESCRIPTION="A Fortran interface to the GNU Scientific Library"
+HOMEPAGE="http://www.lrz.de/services/software/mathematik/gsl/fortran/"
+SRC_URI="http://www.lrz.de/services/software/mathematik/gsl/fortran/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="doc examples html-doc static-libs"
+
+RDEPEND=">=sci-libs/gsl-1.13
+		 <sci-libs/gsl-2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FORTRAN_STANDARD=2003
+
+MAKEOPTS="-j1"  # fgsl.mod cannot be built in parallel
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	dolib.so .libs/*.so .libs/*.so.*
+	dolib libfgsl.la
+	use static-libs && dolib.a .libs/*.a
+
+	insinto /usr/include/fgsl
+	doins fgsl.mod
+
+	dodoc NEWS README
+	use doc && dodoc doc/latex/refman.pdf   # ~4.6Mb
+	use html-doc && dodoc -r doc/html/      # ~11Mb
+	use examples && dodoc -r doc/examples/  # ~300kb (zipped)
+}
diff --git a/sci-libs/fgsl/fgsl-1.1.0.ebuild b/sci-libs/fgsl/fgsl-1.1.0.ebuild
new file mode 100644
index 0000000..46ac115
--- /dev/null
+++ b/sci-libs/fgsl/fgsl-1.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fortran-2
+
+DESCRIPTION="A Fortran interface to the GNU Scientific Library"
+HOMEPAGE="http://www.lrz.de/services/software/mathematik/gsl/fortran/"
+SRC_URI="http://www.lrz.de/services/software/mathematik/gsl/fortran/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="doc examples html-doc static-libs"
+
+RDEPEND=">=sci-libs/gsl-1.13
+		 <sci-libs/gsl-2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FORTRAN_STANDARD=2003
+
+MAKEOPTS="-j1"  # fgsl.mod cannot be built in parallel
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	dolib.so .libs/*.so .libs/*.so.*
+	dolib libfgsl.la
+	use static-libs && dolib.a .libs/*.a
+
+	insinto /usr/include/fgsl
+	doins fgsl.mod
+
+	dodoc NEWS README
+	use doc && dodoc doc/latex/refman.pdf   # ~4.6Mb
+	use html-doc && dodoc -r doc/html/      # ~13Mb
+	use examples && dodoc -r doc/examples/  # ~300kb (zipped)
+}
diff --git a/sci-libs/fgsl/fgsl-1.2.0.ebuild b/sci-libs/fgsl/fgsl-1.2.0.ebuild
new file mode 100644
index 0000000..b3d8cd7
--- /dev/null
+++ b/sci-libs/fgsl/fgsl-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fortran-2
+
+DESCRIPTION="A Fortran interface to the GNU Scientific Library"
+HOMEPAGE="http://www.lrz.de/services/software/mathematik/gsl/fortran/"
+SRC_URI="http://www.lrz.de/services/software/mathematik/gsl/fortran/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="doc examples html-doc static-libs"
+
+RDEPEND=">=sci-libs/gsl-2.3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FORTRAN_STANDARD=2003
+
+MAKEOPTS="-j1"  # fgsl.mod cannot be built in parallel
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	dolib.so .libs/*.so .libs/*.so.*
+	dolib libfgsl.la
+	use static-libs && dolib.a .libs/*.a
+
+	insinto /usr/include/fgsl
+	doins fgsl.mod
+
+	dodoc NEWS README
+	use doc && dodoc doc/latex/refman.pdf   # ~4.6Mb
+	use html-doc && dodoc -r doc/html/      # ~13Mb
+	use examples && dodoc -r doc/examples/  # ~300kb (zipped)
+}
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 401d750..0000000
--- 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 $^
diff --git a/sci-libs/fgsl/metadata.xml b/sci-libs/fgsl/metadata.xml
index ae34b4d..826e45b 100644
--- a/sci-libs/fgsl/metadata.xml
+++ b/sci-libs/fgsl/metadata.xml
@@ -5,4 +5,7 @@
     <email>AstroFloyd@gmail.com</email>
     <name>AstroFloyd</name>
   </maintainer>
+  <use>
+    <flag name='html-doc'>Installs (~13Mb) of HTML-documentation</flag>
+  </use>
 </pkgmetadata>