* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2012-02-24 7:55 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2012-02-24 7:55 UTC (permalink / raw
To: gentoo-commits
commit: 7304f47bb744cd7310a34c4cba0582d0684b00fa
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 12:14:10 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 12:14:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7304f47b
Correct usage of autotools-eclass, prevents double call of elibtoolize
(Portage version: 2.2.0_alpha89/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/gsl/ChangeLog | 5 ++++-
sci-libs/gsl/gsl-1.15-r2.ebuild | 11 ++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 20599ae..b8c6407 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-libs/gsl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+ 23 Feb 2012; Justin Lecher <jlec@gentoo.org> gsl-1.15-r2.ebuild:
+ Correct usage of autotools-eclass, prevents double call of elibtoolize
+
*gsl-1.15-r2 (11 Oct 2011)
11 Oct 2011; Justin Lecher <jlec@gentoo.org> -gsl-1.15-r1.ebuild,
diff --git a/sci-libs/gsl/gsl-1.15-r2.ebuild b/sci-libs/gsl/gsl-1.15-r2.ebuild
index 1367d6c..1c97b0d 100644
--- a/sci-libs/gsl/gsl-1.15-r2.ebuild
+++ b/sci-libs/gsl/gsl-1.15-r2.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
-inherit eutils autotools-utils alternatives-2
+AUTOTOOLS_AUTORECONF=true
+
+inherit alternatives-2 autotools-utils eutils
DESCRIPTION="The GNU Scientific Library"
HOMEPAGE="http://www.gnu.org/software/gsl/"
@@ -20,11 +22,6 @@ PATCHES=(
"${FILESDIR}/${P}-cblas.patch"
)
-src_prepare() {
- autotools-utils_src_prepare
- eautoreconf
-}
-
src_install() {
autotools-utils_src_install
local libname=gslcblas
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2013-02-22 10:15 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2013-02-22 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 084d6b96aa0db5b2767399e54dde272f1e80e3a1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:53:21 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:53:21 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=084d6b96
sci-libs/gsl: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
Package-Manager: portage-2.2.0_alpha163
---
sci-libs/gsl/ChangeLog | 6 +++++-
sci-libs/gsl/gsl-1.15-r3.ebuild | 8 ++++----
sci-libs/gsl/metadata.xml | 10 +++++-----
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 2c1ceb5..786abee 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/gsl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+ 22 Feb 2013; Justin Lecher <jlec@gentoo.org> gsl-1.15-r3.ebuild,
+ metadata.xml:
+ Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
+
*gsl-1.15-r3 (19 Dec 2012)
19 Dec 2012; Denis Dupeyron <calchan@gentoo.org> -gsl-1.15-r2.ebuild,
diff --git a/sci-libs/gsl/gsl-1.15-r3.ebuild b/sci-libs/gsl/gsl-1.15-r3.ebuild
index aecb495..03159bd 100644
--- a/sci-libs/gsl/gsl-1.15-r3.ebuild
+++ b/sci-libs/gsl/gsl-1.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,7 +6,7 @@ EAPI=4
AUTOTOOLS_AUTORECONF=true
-inherit alternatives-2 autotools-utils eutils
+inherit alternatives-2 autotools-utils eutils toolchain-funcs
DESCRIPTION="The GNU Scientific Library"
HOMEPAGE="http://www.gnu.org/software/gsl/"
@@ -26,8 +26,8 @@ DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
src_configure() {
if use cblas-external; then
- export CBLAS_LIBS="$(pkg-config --libs cblas)"
- export CBLAS_CFLAGS="$(pkg-config --cflags cblas)"
+ export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+ export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
fi
autotools-utils_src_configure
}
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index a0ffae8..7ab2ed0 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The GNU Scientific Library (GSL) is a collection of routines for
numerical analysis. The routines are written from scratch by the GSL
team in C, and present a modern API for C programmers, while allowing
@@ -15,8 +15,8 @@
differential equations, quadrature, Monte Carlo integration, special
functions, physical constants, and much more.
</longdescription>
-<use>
- <flag name='cblas-external'>Link gsl with external cblas provided by
+ <use>
+ <flag name="cblas-external">Link gsl with external cblas provided by
(<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
-</use>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2014-07-02 0:09 Francois Bissey
0 siblings, 0 replies; 12+ messages in thread
From: Francois Bissey @ 2014-07-02 0:09 UTC (permalink / raw
To: gentoo-commits
commit: 4a1bb90c574ea27b61d9ff5d70ac4ec88763a0e2
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Wed Jul 2 00:09:01 2014 +0000
Commit: Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Wed Jul 2 00:09:01 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4a1bb90c
Tested on x64-macos, keywording.
Package-Manager: portage-2.2.10
---
sci-libs/gsl/ChangeLog | 6 +++++-
sci-libs/gsl/gsl-1.16-r1.ebuild | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index f35223d..81ecb25 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/gsl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+ 02 Jul 2014; François Bissey <francois.bissey@canterbury.ac.nz>
+ gsl-1.16-r1.ebuild:
+ Tested on x64-macos, keywording.
+
*gsl-1.16-r1 (19 Aug 2013)
19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/gsl/gsl-1.16-r1.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild
index c1fd0e5..f19bba1 100644
--- a/sci-libs/gsl/gsl-1.16-r1.ebuild
+++ b/sci-libs/gsl/gsl-1.16-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external static-libs"
RDEPEND="cblas-external? ( virtual/cblas )"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2014-11-10 23:33 Christoph Junghans
0 siblings, 0 replies; 12+ messages in thread
From: Christoph Junghans @ 2014-11-10 23:33 UTC (permalink / raw
To: gentoo-commits
commit: abe549ffad5e6e319ca9947fa96e65f443ef6012
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 23:25:42 2014 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 23:25:42 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=abe549ff
added multilib support (bug #528622)
Package-Manager: portage-2.2.8-r2
---
sci-libs/gsl/ChangeLog | 5 ++++
sci-libs/gsl/gsl-1.16-r2.ebuild | 60 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 81ecb25..0ffe3bd 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+*gsl-1.16-r2 (10 Nov 2014)
+
+ 10 Nov 2014; Christoph Junghans <ottxor@gentoo.org> +gsl-1.16-r2.ebuild:
+ added multilib support (bug #528622)
+
02 Jul 2014; François Bissey <francois.bissey@canterbury.ac.nz>
gsl-1.16-r1.ebuild:
Tested on x64-macos, keywording.
diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild
new file mode 100644
index 0000000..7cf4402
--- /dev/null
+++ b/sci-libs/gsl/gsl-1.16-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit alternatives-2 autotools-multilib eutils toolchain-funcs
+
+DESCRIPTION="GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external static-libs"
+
+RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
+
+src_configure() {
+ if use cblas-external; then
+ export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+ export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+ fi
+ local myeconfargs=(
+ $(use_with cblas-external)
+ )
+ autotools-multilib_src_configure
+}
+
+multilib_src_install() {
+ autotools-utils_src_install
+ local libname=gslcblas
+
+ cat <<-EOF > ${libname}.pc
+ prefix=${EPREFIX}/usr
+ libdir=\${prefix}/$(get_libdir)
+ includedir=\${prefix}/include
+ Name: ${libname}
+ Description: ${DESCRIPTION} CBLAS implementation
+ Version: ${PV}
+ URL: ${HOMEPAGE}
+ Libs: -L\${libdir} -l${libname}
+ Libs.private: -lm
+ Cflags: -I\${includedir}
+ EOF
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${libname}.pc
+
+ # Don't add gsl as a cblas alternative if using cblas-external
+ use cblas-external || alternatives_for cblas gsl 0 \
+ /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc \
+ /usr/include/cblas.h gsl/gsl_cblas.h
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2015-06-16 13:32 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2015-06-16 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 83bbe850f91ca9ffd05dc7dd6a0051ecb50b1fd2
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 13:32:19 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 13:32:19 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=83bbe850
sci-libs/gsl: Fix problems during installation with multilib and alternatives, https://github.com/gentoo-science/sci/issues/438
Package-Manager: portage-2.2.20
sci-libs/gsl/ChangeLog | 7 ++++-
sci-libs/gsl/gsl-1.16-r1.ebuild | 60 -----------------------------------------
sci-libs/gsl/gsl-1.16-r2.ebuild | 8 ++++--
sci-libs/gsl/metadata.xml | 10 +++----
4 files changed, 17 insertions(+), 68 deletions(-)
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog
index 0ffe3bd..936c4df 100644
--- a/sci-libs/gsl/ChangeLog
+++ b/sci-libs/gsl/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for sci-libs/gsl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.77 2010/08/09 09:32:55 xarthisius Exp $
+ 16 Jun 2015; Justin Lecher <jlec@gentoo.org> -gsl-1.16-r1.ebuild,
+ gsl-1.16-r2.ebuild, metadata.xml:
+ sci-libs/gsl: Fix problems during installation with multilib and alternatives,
+ https://github.com/gentoo-science/sci/issues/438
+
*gsl-1.16-r2 (10 Nov 2014)
10 Nov 2014; Christoph Junghans <ottxor@gentoo.org> +gsl-1.16-r2.ebuild:
diff --git a/sci-libs/gsl/gsl-1.16-r1.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild
deleted file mode 100644
index f19bba1..0000000
--- a/sci-libs/gsl/gsl-1.16-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit alternatives-2 autotools-utils eutils toolchain-funcs
-
-DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-cblas-external.patch )
-
-src_configure() {
- if use cblas-external; then
- export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
- export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
- fi
- local myeconfargs=(
- $(use_with cblas-external)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
- local libname=gslcblas
-
- cat <<-EOF > ${libname}.pc
- prefix=${EPREFIX}/usr
- libdir=\${prefix}/$(get_libdir)
- includedir=\${prefix}/include
- Name: ${libname}
- Description: ${DESCRIPTION} CBLAS implementation
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -l${libname}
- Libs.private: -lm
- Cflags: -I\${includedir}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${libname}.pc
-
- # Don't add gsl as a cblas alternative if using cblas-external
- use cblas-external || alternatives_for cblas gsl 0 \
- /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc \
- /usr/include/cblas.h gsl/gsl_cblas.h
-}
diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild
index 7cf4402..fada147 100644
--- a/sci-libs/gsl/gsl-1.16-r2.ebuild
+++ b/sci-libs/gsl/gsl-1.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -53,8 +53,12 @@ multilib_src_install() {
insinto /usr/$(get_libdir)/pkgconfig
doins ${libname}.pc
+ GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
+}
+
+multilib_src_install_all() {
# Don't add gsl as a cblas alternative if using cblas-external
use cblas-external || alternatives_for cblas gsl 0 \
- /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc \
+ ${GSL_ALTERNATIVES[@]} \
/usr/include/cblas.h gsl/gsl_cblas.h
}
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 9be87ca..2d7f4e7 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
The GNU Scientific Library (GSL) is a collection of routines for
numerical analysis. The routines are written from scratch by the GSL
team in C, and present a modern API for C programmers, while allowing
@@ -15,8 +15,8 @@
differential equations, quadrature, Monte Carlo integration, special
functions, physical constants, and much more.
</longdescription>
-<use>
- <flag name="cblas-external">Link gsl with external cblas provided by
+ <use>
+ <flag name="cblas-external">Link gsl with external cblas provided by
(<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
-</use>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2016-02-12 9:54 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2016-02-12 9:54 UTC (permalink / raw
To: gentoo-commits
commit: f0160cfce0dcc6b8e67f5cc8e8cbadf8acd26299
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 09:54:17 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 09:54:17 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f0160cfc
sci-libs/gsl: Add subslot
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/gsl/gsl-2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
index 2a95c67..afb0c6a 100644
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ b/sci-libs/gsl/gsl-2.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/gsl/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/19"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external static-libs"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2016-02-26 9:46 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2016-02-26 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 99655e523db39a13c683be7e39e0bf2104fec652
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 09:30:11 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 09:30:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=99655e52
sci-libs/gsl: Set MULTILIB_COMPAT for x86
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/gsl/gsl-1.16-r2.ebuild | 5 +++--
sci-libs/gsl/gsl-2.1.ebuild | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild
index 6fbf5d3..e00f2d3 100644
--- a/sci-libs/gsl/gsl-1.16-r2.ebuild
+++ b/sci-libs/gsl/gsl-1.16-r2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_AUTORECONF=1
+MULTILIB_COMPAT=( abi_x86_{32,64} )
inherit alternatives-2 autotools-multilib eutils toolchain-funcs
@@ -14,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~mips ~s390 ~sh ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external static-libs"
RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
index afb0c6a..28c850c 100644
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ b/sci-libs/gsl/gsl-2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~mips ~s390 ~sh ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cblas-external static-libs"
RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2017-03-08 7:30 Marius Brehler
0 siblings, 0 replies; 12+ messages in thread
From: Marius Brehler @ 2017-03-08 7:30 UTC (permalink / raw
To: gentoo-commits
commit: ea25aa461fffa2684f7a81fbdaf151f62e46f1f6
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Sat Mar 4 21:40:01 2017 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Mar 7 18:59:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ea25aa46
sci-libs/gsl: restore keywords to its original state in 2.3
Package-Manager: portage-2.3.3
sci-libs/gsl/gsl-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
index 609c0cb62..7af97c8aa 100644
--- a/sci-libs/gsl/gsl-2.3.ebuild
+++ b/sci-libs/gsl/gsl-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/19"
-KEYWORDS="~amd64 ~mips ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="cblas-external static-libs"
RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2017-03-08 7:30 Marius Brehler
0 siblings, 0 replies; 12+ messages in thread
From: Marius Brehler @ 2017-03-08 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 05087873dcd1d294a3ae1c0c528b108b90eb01d5
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Sat Mar 4 21:26:52 2017 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Mar 7 18:59:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=05087873
sci-libs/gsl: use run_in_build_dir instead of cd ${BUILDDIR}. Move 2.3-r1 to 2.3 to ease review.
Package-Manager: portage-2.3.3
sci-libs/gsl/gsl-2.1.ebuild | 18 ++++------------
sci-libs/gsl/{gsl-2.3-r1.ebuild => gsl-2.3.ebuild} | 24 +++++++---------------
2 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
index b26a45748..94c797b45 100644
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ b/sci-libs/gsl/gsl-2.1.ebuild
@@ -28,35 +28,25 @@ src_prepare() {
src_configure() {
gsl_configure() {
- cd "${BUILD_DIR}"
if use cblas-external; then
export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
fi
econf $(use_with cblas-external)
}
- multilib_foreach_abi gsl_configure
+ multilib_foreach_abi run_in_build_dir gsl_configure
}
src_compile() {
- gsl_compile() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_compile
+ multilib_foreach_abi run_in_build_dir default
}
src_test() {
- gsl_test() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_test
+ multilib_foreach_abi run_in_build_dir default
}
src_install() {
gsl_install() {
- cd "${BUILD_DIR}"
local libname=gslcblas
create_pkgconfig \
@@ -73,7 +63,7 @@ src_install() {
default
}
- multilib_foreach_abi gsl_install
+ multilib_foreach_abi run_in_build_dir gsl_install
# Don't add gsl as a cblas alternative if using cblas-external
use cblas-external || alternatives_for cblas gsl 0 \
diff --git a/sci-libs/gsl/gsl-2.3-r1.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
similarity index 85%
rename from sci-libs/gsl/gsl-2.3-r1.ebuild
rename to sci-libs/gsl/gsl-2.3.ebuild
index 95b4344be..609c0cb62 100644
--- a/sci-libs/gsl/gsl-2.3-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.3.ebuild
@@ -30,27 +30,25 @@ src_prepare() {
src_configure() {
gsl_configure() {
- cd "${BUILD_DIR}"
if use cblas-external; then
export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
fi
econf $(use_with cblas-external)
}
- multilib_foreach_abi gsl_configure
+ multilib_foreach_abi run_in_build_dir gsl_configure
}
src_compile() {
- gsl_compile() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_compile
+ multilib_foreach_abi run_in_build_dir default
+}
+
+src_test() {
+ multilib_foreach_abi run_in_build_dir default
}
src_install() {
gsl_install() {
- cd "${BUILD_DIR}"
local libname=gslcblas
create_pkgconfig \
@@ -67,18 +65,10 @@ src_install() {
default
}
- multilib_foreach_abi gsl_install
+ multilib_foreach_abi run_in_build_dir gsl_install
# Don't add gsl as a cblas alternative if using cblas-external
use cblas-external || alternatives_for cblas gsl 0 \
${GSL_ALTERNATIVES[@]} \
/usr/include/cblas.h gsl/gsl_cblas.h
}
-
-src_test() {
- gsl_test() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_test
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2017-03-08 7:30 Marius Brehler
0 siblings, 0 replies; 12+ messages in thread
From: Marius Brehler @ 2017-03-08 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 283b7dfd5d637a69faa429db68f8fa66da6db3e8
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Sat Mar 4 19:22:39 2017 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Mar 7 18:59:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=283b7dfd
sci-libs/gsl: mv 2.1 to 2.1-r1 to ease comparison
Package-Manager: portage-2.3.3
sci-libs/gsl/{gsl-2.1-r1.ebuild => gsl-2.1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-libs/gsl/gsl-2.1-r1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
similarity index 100%
rename from sci-libs/gsl/gsl-2.1-r1.ebuild
rename to sci-libs/gsl/gsl-2.1.ebuild
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2017-09-23 4:59 Benda XU
0 siblings, 0 replies; 12+ messages in thread
From: Benda XU @ 2017-09-23 4:59 UTC (permalink / raw
To: gentoo-commits
commit: 62ddc7e141cc60ceec4fc2f36ffc9ff1b23b6af5
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Thu Sep 21 05:40:27 2017 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 04:59:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=62ddc7e1
sci-libs/gsl: bump to gsl-2.4.
Change over to https in all ebuilds to keep repoman happy.
Closes: https://github.com/gentoo/sci/pull/815
Closes: https://github.com/gentoo/sci/issues/813
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sci-libs/gsl/gsl-1.16-r2.ebuild | 4 ++--
sci-libs/gsl/gsl-2.1.ebuild | 2 +-
sci-libs/gsl/gsl-2.3.ebuild | 2 +-
sci-libs/gsl/{gsl-2.3.ebuild => gsl-2.4.ebuild} | 10 +++++++---
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/sci-libs/gsl/gsl-1.16-r2.ebuild b/sci-libs/gsl/gsl-1.16-r2.ebuild
index 7c5ef46a1..a28f92b5c 100644
--- a/sci-libs/gsl/gsl-1.16-r2.ebuild
+++ b/sci-libs/gsl/gsl-1.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ MULTILIB_COMPAT=( abi_x86_{32,64} )
inherit alternatives-2 autotools-multilib eutils toolchain-funcs
DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
index 94c797b45..299a889fc 100644
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ b/sci-libs/gsl/gsl-2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
index 7af97c8aa..296d8e964 100644
--- a/sci-libs/gsl/gsl-2.3.ebuild
+++ b/sci-libs/gsl/gsl-2.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/sci-libs/gsl/gsl-2.3.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
similarity index 83%
copy from sci-libs/gsl/gsl-2.3.ebuild
copy to sci-libs/gsl/gsl-2.4.ebuild
index 7af97c8aa..f8cb47e0f 100644
--- a/sci-libs/gsl/gsl-2.3.ebuild
+++ b/sci-libs/gsl/gsl-2.4.ebuild
@@ -3,14 +3,14 @@
EAPI=6
-inherit alternatives-2 autotools multilib-build numeric toolchain-funcs
+inherit alternatives-2 autotools flag-o-matic multilib-build numeric toolchain-funcs
DESCRIPTION="GNU Scientific Library"
-HOMEPAGE="http://www.gnu.org/software/gsl/"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
-SLOT="0/19"
+SLOT="0/23"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="cblas-external static-libs"
@@ -36,6 +36,10 @@ src_configure() {
fi
econf $(use_with cblas-external)
}
+ # fma flags, which can be enabled by -march=native, cause some tests to fail.
+ # https://github.com/gentoo/sci/pull/815
+ append-cflags $(test-flags-CC -mno-fma -mno-fma4)
+
multilib_foreach_abi run_in_build_dir gsl_configure
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/
@ 2018-10-28 6:21 Justin Lecher
0 siblings, 0 replies; 12+ messages in thread
From: Justin Lecher @ 2018-10-28 6:21 UTC (permalink / raw
To: gentoo-commits
commit: 66fede0cb8250476db850b329baa0cfe9df6d3c0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 06:20:35 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 06:21:09 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=66fede0c
sci-libs/gsl: Version Bump
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sci-libs/gsl/gsl-2.5.ebuild | 78 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
new file mode 100644
index 000000000..3dda7b878
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit alternatives-2 autotools flag-o-matic multilib-build numeric toolchain-funcs
+
+DESCRIPTION="GNU Scientific Library"
+HOMEPAGE="https://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/23"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cblas-external static-libs"
+
+RDEPEND="cblas-external? ( >=virtual/cblas-2.0-r3[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3-cblas-external.patch
+ )
+
+src_prepare() {
+ default
+ eautoreconf
+ multilib_copy_sources
+}
+
+src_configure() {
+ gsl_configure() {
+ if use cblas-external; then
+ export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+ export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+ fi
+ econf $(use_with cblas-external)
+ }
+ # fma flags, which can be enabled by -march=native, cause some tests to fail.
+ # https://github.com/gentoo/sci/pull/815
+ append-cflags $(test-flags-CC -mno-fma -mno-fma4)
+
+ multilib_foreach_abi run_in_build_dir gsl_configure
+}
+
+src_compile() {
+ multilib_foreach_abi run_in_build_dir default
+}
+
+src_test() {
+ multilib_foreach_abi run_in_build_dir default
+}
+
+src_install() {
+ gsl_install() {
+ local libname=gslcblas
+
+ create_pkgconfig \
+ --name "${libname}" \
+ --description "${PN} CBLAS implementation" \
+ --libs "-l${libname}" \
+ --libs-private "-lm" \
+ --cflags "-I\${includedir}/${PN}" \
+ --version "${PV}" \
+ --url "${HOMEPAGE}" \
+ "${libname}"
+
+ GSL_ALTERNATIVES+=( /usr/$(get_libdir)/pkgconfig/cblas.pc ${libname}.pc )
+
+ default
+ }
+ multilib_foreach_abi run_in_build_dir gsl_install
+
+ # Don't add gsl as a cblas alternative if using cblas-external
+ use cblas-external || alternatives_for cblas gsl 0 \
+ ${GSL_ALTERNATIVES[@]} \
+ /usr/include/cblas.h gsl/gsl_cblas.h
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-10-28 6:21 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-08 7:30 [gentoo-commits] proj/sci:master commit in: sci-libs/gsl/ Marius Brehler
-- strict thread matches above, loose matches on Subject: below --
2018-10-28 6:21 Justin Lecher
2017-09-23 4:59 Benda XU
2017-03-08 7:30 Marius Brehler
2017-03-08 7:30 Marius Brehler
2016-02-26 9:46 Justin Lecher
2016-02-12 9:54 Justin Lecher
2015-06-16 13:32 Justin Lecher
2014-11-10 23:33 Christoph Junghans
2014-07-02 0:09 Francois Bissey
2013-02-22 10:15 Justin Lecher
2012-02-24 7:55 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox