[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gsl-shell/files/, sci-mathematics/gsl-shell/

[David Seifert]

commit:     5d7c81be8900a8f0c8e482a0c77852b08d71a5ad
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Tue Sep  6 14:48:43 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 20:04:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7c81be

sci-mathematics/gsl-shell: Version bump to 2.3.0_beta1

* EAPI=6

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2257

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/gsl-shell/Manifest                 |  1 +
 .../files/gsl-shell-2.3.0-gdt-cflags.patch         | 20 +++++++
 .../gsl-shell/gsl-shell-2.3.0_beta1.ebuild         | 65 ++++++++++++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 8fe68cc..d5d1505 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1 +1,2 @@
 DIST gsl-shell-2.2.0.tar.gz 3138063 SHA256 e05bcc78ea3c70d209b12a3db5c86b5ed23e50617d68cb0081046382973b2d33 SHA512 1394cbafecd55ddf5c8c992273f1fa400825b21202cd53ac548a99e34a9183ba4a5dcb2ef10ef9a7930f78ed4e6343b8d2a5d34c38a8e7766300b5bf73596d89 WHIRLPOOL 9bbfa55c988611fa0c771fc6c49473e139eff936f4f22b4b419c409e8450c733a57f2d9bbbc799f754654ff5cf5b303ab263bb502ef712ad439564c6e3b28fef
+DIST gsl-shell-2.3.0-beta1.tar.gz 3380519 SHA256 a57e1d5b8e40418ca453c1bf900cf57546258d8ef87b2d0647207f7473be1cb4 SHA512 627c0b6bb35bc1a33bab16d0bb2b193b5a005a1d97a96e6a9038fbe7144936427131197983a2ef347ed91c655a82a4d477430a610d9e36453a2669ef0baae231 WHIRLPOOL 737ad32ff8f1f10a2caa5d76d24a107994a8fae9179a5f536880d0e9359562b1f9c59aee5825327a3175a06c30bbbb7b272cde07061364172a58dc4860e867bf

diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.0-gdt-cflags.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.0-gdt-cflags.patch
new file mode 100644
index 00000000..388fa00
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.0-gdt-cflags.patch
@@ -0,0 +1,20 @@
+--- a/gdt/Makefile
++++ b/gdt/Makefile
+@@ -27,7 +27,7 @@ include $(GSH_BASE_DIR)/makedefs
+ 
+ INCLUDES += -I$(GSH_BASE_DIR)
+ 
+-CFLAGS += -std=c99
++GDT_CFLAGS = $(CFLAGS) -std=c99
+ 
+ GDT_SRC_FILES = char_buffer.c gdt_index.c gdt_table.c
+ GDT_OBJ_FILES := $(GDT_SRC_FILES:%.c=%.o)
+@@ -36,7 +36,7 @@ DEP_FILES := $(GDT_SRC_FILES:%.c=.deps/%.P)
+ 
+ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+ 
+-COMPILE = $(CC) $(CFLAGS) $(LUA_CFLAGS) $(DEFS) $(INCLUDES)
++COMPILE = $(CC) $(GDT_CFLAGS) $(LUA_CFLAGS) $(DEFS) $(INCLUDES)
+ 
+ TARGETS = libgdt.a
+ 

diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild
new file mode 100644
index 00000000..03f9f39
--- /dev/null
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P=${P/_/-}
+DESCRIPTION="Lua interactive shell for sci-libs/gsl"
+HOMEPAGE="http://www.nongnu.org/gsl-shell/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fox"
+
+RDEPEND="
+	>=sci-libs/gsl-1.14
+	virtual/blas
+	>=x11-libs/agg-2.5
+	>=media-libs/freetype-2.4.10
+	sys-libs/readline:0=
+	|| ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu )
+	fox? ( x11-libs/fox:1.6 )"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[latex] )"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-font.patch
+	"${FILESDIR}"/${PN}-strip.patch
+	"${FILESDIR}"/${PN}-usr.patch
+	"${FILESDIR}"/${PN}-2.2.0-pkg-config.patch
+	"${FILESDIR}"/${P/_beta*/}-gdt-cflags.patch
+)
+
+src_prepare() {
+	tc-export PKG_CONFIG
+	use fox || PATCHES+=( "${FILESDIR}"/${PN}-nogui.patch )
+	default
+}
+
+src_compile() {
+	local BLAS=$($(tc-getPKG_CONFIG) --libs blas)
+
+	if use fox; then
+		local FOX_INCLUDES="$(WANT_FOX=1.6 fox-config --cflags)"
+		local FOX_LIBS="$(WANT_FOX=1.6 fox-config --libs)"
+		emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}" \
+			FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}"
+	else
+		emake -j1 CFLAGS="${CFLAGS}" GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}"
+	fi
+
+	use doc && emake -C doc/user-manual -j1 html
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( doc/user-manual/_build/html/. )
+	default
+}