* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gsl-shell/files/, sci-mathematics/gsl-shell/
@ 2016-09-06 20:25 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-09-06 20:25 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gsl-shell/files/, sci-mathematics/gsl-shell/
@ 2022-08-30 17:25 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-08-30 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 69fbff36574ef13ed6a8030df54cebded4c7ae05
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 17:24:16 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 17:25:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fbff36
sci-mathematics/gsl-shell: drop 2.3.0_beta1-r1, EAPI-6--
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/gsl-shell/Manifest | 1 -
.../files/gsl-shell-2.2.0-pkg-config.patch | 28 ----------
.../files/gsl-shell-2.3.0-gdt-cflags.patch | 20 -------
.../gsl-shell/files/gsl-shell-font.patch | 10 ----
.../gsl-shell/files/gsl-shell-nogui.patch | 25 ---------
.../gsl-shell/files/gsl-shell-strip.patch | 8 ---
.../gsl-shell/files/gsl-shell-usr.patch | 8 ---
.../gsl-shell/gsl-shell-2.3.0_beta1-r1.ebuild | 64 ----------------------
8 files changed, 164 deletions(-)
diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 4bf89166a2de..949bd19ffb3e 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,2 +1 @@
-DIST gsl-shell-2.3.0-beta1.tar.gz 3380519 BLAKE2B 3f63c74d48f01d1cd181a275facd979d31a06089004ac0db3b060d77cdcf4fb195ad064a76c64a7a13a6641102864cb79845b8f15573bc1481365952835f1fd7 SHA512 627c0b6bb35bc1a33bab16d0bb2b193b5a005a1d97a96e6a9038fbe7144936427131197983a2ef347ed91c655a82a4d477430a610d9e36453a2669ef0baae231
DIST gsl-shell-2.3.2.tar.gz 3400376 BLAKE2B 8218b4d3232048fe7575631c7acc66d313520ee4d41a1dd2c267f021c8271a427673a575cc00f8f55a4868b8ec5e9626c0cbaa6ea9fa76662a726e436a527cf3 SHA512 6379380ab15a7ec477d67d36305ce76c551d32e88d8611447eeb6deaf9877c362392bce45599a2b2988331064c22626260c41f8548624c23e2c4e3c59c87c291
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch
deleted file mode 100644
index dc4b05bc3bec..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/makepackages
-+++ b/makepackages
-@@ -52,17 +52,17 @@ else
- PTHREADS_LIBS = -lpthread
-
- else
-- AGG_INCLUDES = -I/usr/include/agg2
-- AGG_LIBS = -lagg -lX11
-+ AGG_INCLUDES = $(shell $(PKG_CONFIG) --cflags libagg)
-+ AGG_LIBS = $(shell $(PKG_CONFIG) --libs libagg) -lX11
-
-- GSL_INCLUDES =
-- GSL_LIBS = -lgsl -lblas
-+ GSL_INCLUDES = $(shell $(PKG_CONFIG) --cflags gsl)
-+ GSL_LIBS = $(shell $(PKG_CONFIG) --libs gsl)
-
-- FOX_INCLUDES := $(shell pkg-config fox --cflags)
-- FOX_LIBS = $(shell pkg-config fox --libs)
-+ FOX_INCLUDES := $(shell $(PKG_CONFIG) fox --cflags)
-+ FOX_LIBS = $(shell $(PKG_CONFIG) fox --libs)
-
-- FREETYPE_INCLUDES = -I/usr/include/freetype2
-- FREETYPE_LIBS = -lfreetype
-+ FREETYPE_INCLUDES = $(shell $(PKG_CONFIG) --cflags freetype2)
-+ FREETYPE_LIBS = $(shell $(PKG_CONFIG) --libs freetype2)
-
- PTHREADS_LIBS = -lpthread
- endif
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
deleted file mode 100644
index 388fa003f0ff..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.0-gdt-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/files/gsl-shell-font.patch b/sci-mathematics/gsl-shell/files/gsl-shell-font.patch
deleted file mode 100644
index d8879497c4cd..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-font.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U1 gsl-shell.orig/agg-plot/support_x11.cpp gsl-shell/agg-plot/support_x11.cpp
---- gsl-shell.orig/agg-plot/support_x11.cpp 2012-11-27 04:55:38.000000000 +0700
-+++ gsl-shell/agg-plot/support_x11.cpp 2012-11-30 23:02:31.000000000 +0700
-@@ -9,4 +9,4 @@
- #else
--const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont/FreeSans.ttf", "ttf-dejavu/DejaVuSans.ttf", 0};
--#define TTF_SYSTEM_DIR "/usr/share/fonts/truetype/"
-+const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont-ttf/FreeSans.ttf", "dejavu/DejaVuSans.ttf", 0};
-+#define TTF_SYSTEM_DIR "/usr/share/fonts/"
- #define CONSOLE_FONT_NAME "monospace"
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-nogui.patch b/sci-mathematics/gsl-shell/files/gsl-shell-nogui.patch
deleted file mode 100644
index 16d3eb0f04d2..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-nogui.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -U1 gsl-shell.orig/Makefile gsl-shell/Makefile
---- gsl-shell.orig/Makefile 2012-09-21 19:54:05.000000000 +0700
-+++ gsl-shell/Makefile 2012-09-21 19:53:37.000000000 +0700
-@@ -29,3 +29,2 @@
- GSL_SHELL = gsl-shell$(EXE_EXT)
--GSL_SHELL_GUI = gsl-shell-gui$(EXE_EXT)
- LUA_CFLAGS = -I$(LUADIR)/src
-@@ -73,4 +72,3 @@
- INCLUDES += $(PTHREADS_CFLAGS) -Iagg-plot
--GUI_SUBDIR = fox-gui
--SUBDIRS += agg-plot $(GUI_SUBDIR)
-+SUBDIRS += agg-plot
- LUAGSL_LIBS += agg-plot/libaggplot.a
-@@ -105,6 +103,5 @@
-
--install: $(GSL_SHELL) $(GUI_SUBDIR)
-+install: $(GSL_SHELL)
- mkdir -p $(INSTALL_BIN_DIR)
- cp $(GSL_SHELL) $(INSTALL_BIN_DIR)
-- cp fox-gui/$(GSL_SHELL_GUI) $(INSTALL_BIN_DIR)
- mkdir -p $(INSTALL_LIB_DIR)
-@@ -122,3 +119,2 @@
- $(MAKE) -C $(LUADIR) clean
-- $(MAKE) -C fox-gui clean
- $(HOST_RM) *.o $(TARGETS)
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-strip.patch b/sci-mathematics/gsl-shell/files/gsl-shell-strip.patch
deleted file mode 100644
index 1d50a7e831af..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-strip.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 gsl-shell.orig/Makefile gsl-shell/Makefile
---- gsl-shell.orig/Makefile 2012-09-12 01:13:31.000000000 +0700
-+++ gsl-shell/Makefile 2012-09-26 16:13:56.000000000 +0700
-@@ -109,4 +109,2 @@
- cp fox-gui/$(GSL_SHELL_GUI) $(INSTALL_BIN_DIR)
-- strip $(INSTALL_BIN_DIR)/$(GSL_SHELL)
-- strip $(INSTALL_BIN_DIR)/$(GSL_SHELL_GUI)
- mkdir -p $(INSTALL_LIB_DIR)
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-usr.patch b/sci-mathematics/gsl-shell/files/gsl-shell-usr.patch
deleted file mode 100644
index 20ca6d317c7a..000000000000
--- a/sci-mathematics/gsl-shell/files/gsl-shell-usr.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 gsl-shell.orig/makeconfig gsl-shell/makeconfig
---- gsl-shell.orig/makeconfig 2012-09-12 01:13:31.000000000 +0700
-+++ gsl-shell/makeconfig 2012-09-26 16:16:43.000000000 +0700
-@@ -21,3 +21,3 @@
-
--PREFIX= /usr/local
-+PREFIX= /usr
- DESTDIR=
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1-r1.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1-r1.ebuild
deleted file mode 100644
index 2ee665f06083..000000000000
--- a/sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="${RDEPEND}
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gsl-shell/files/, sci-mathematics/gsl-shell/
@ 2023-02-24 10:29 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2023-02-24 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 86bbe6f24dd20ece2e429c187697c0a87c80df27
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 10:28:23 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 10:28:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bbe6f2
sci-mathematics/gsl-shell: add 2.3.5
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-mathematics/gsl-shell/Manifest | 1 +
.../files/gsl-shell-2.3.5-no-fetching.patch | 64 ++++++++++++++++++++++
sci-mathematics/gsl-shell/gsl-shell-2.3.5.ebuild | 48 ++++++++++++++++
sci-mathematics/gsl-shell/metadata.xml | 3 +
4 files changed, 116 insertions(+)
diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 949bd19ffb3e..3c8d0e70418b 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1 +1,2 @@
DIST gsl-shell-2.3.2.tar.gz 3400376 BLAKE2B 8218b4d3232048fe7575631c7acc66d313520ee4d41a1dd2c267f021c8271a427673a575cc00f8f55a4868b8ec5e9626c0cbaa6ea9fa76662a726e436a527cf3 SHA512 6379380ab15a7ec477d67d36305ce76c551d32e88d8611447eeb6deaf9877c362392bce45599a2b2988331064c22626260c41f8548624c23e2c4e3c59c87c291
+DIST gsl-shell-2.3.5.tar.gz 2533145 BLAKE2B 9eec5ee0676429a08b628766450f366b6998c4fc14e6b3108c49a9bf2ef4019c9b7671edbb0def295849155676df6c2bc8975aacb4ff906befc243bed147d80c SHA512 9712714a6cce249b007e475916d870eb2ce8bbc4ab2f0e49b8644378243723c9a386c285eacf5a8c54e27e22bab63fb0cd74d4641652230a8682c201b7e63da8
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.5-no-fetching.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.5-no-fetching.patch
new file mode 100644
index 000000000000..7ab67369b849
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.5-no-fetching.patch
@@ -0,0 +1,64 @@
+diff --git a/meson.build b/meson.build
+index 41f7e93..faf6e0d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -14,7 +14,7 @@ if host_machine.system() == 'darwin'
+ gsl_shell_defines += '-DDARWIN_MACOSX'
+ endif
+
+-gsl_shell_link_args = []
++gsl_shell_link_args = ['-laggplatformX11']
+ cc = meson.get_compiler('c')
+ if cc.get_id() == 'gcc' and get_option('buildtype') == 'release'
+ gsl_shell_link_args += ['-static-libgcc', '-static-libstdc++']
+@@ -25,19 +25,18 @@ cpp_utils_include = include_directories('src/cpp-utils')
+
+ threads_dep = dependency('threads')
+ freetype_dep = dependency('freetype2')
+-fox_dep = dependency('fox')
+-libagg_dep = dependency('libagg', fallback: ['libagg', 'libagg_dep'])
++fox_dep = dependency('fox17')
++libagg_dep = dependency('libagg', 'libaggplatformX11', fallback: ['libagg', 'libagg_dep'])
++libX11_dep = dependency('X11')
+
+-luajit_proj = subproject('luajit', default_options: ['default_library=static', 'app=false', 'portable=true', 'shortfnsyn=true'])
+-luajit_dep = luajit_proj.get_variable('lua_dep')
++luajit_dep = dependency('luajit')
+
+ libgsl_options = ['default_library=static', 'blas=' + get_option('blas')]
+ foreach module_name : ['siman', 'wavelet', 'sparse', 'ode', 'monte', 'integ', 'min', 'fit']
+ libgsl_options += module_name + '=false'
+ endforeach
+
+-libgsl_proj = subproject('gsl', default_options: libgsl_options)
+-libgsl_dep = libgsl_proj.get_variable('libgsl_dep').as_link_whole()
++libgsl_dep = dependency('gsl')
+
+ gsl_shell_bindir = 'bin'
+ gsl_shell_datadir = 'share/gsl-shell'
+diff --git a/src/console/meson.build b/src/console/meson.build
+index 2f5a3dc..3dfe7a5 100644
+--- a/src/console/meson.build
++++ b/src/console/meson.build
+@@ -1,7 +1,7 @@
+ # Readline not supported with meson build.
+
+ executable('gsl-shell', 'gsl-shell-jit.c',
+- dependencies: [libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep],
++ dependencies: [libX11_dep, libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep],
+ include_directories: gsl_shell_include,
+ cpp_args: gsl_shell_defines,
+ link_with: [libluagsl, libaggplot, libgdt],
+diff --git a/src/fox-gui/meson.build b/src/fox-gui/meson.build
+index 8f55259..fecefd7 100644
+--- a/src/fox-gui/meson.build
++++ b/src/fox-gui/meson.build
+@@ -13,7 +13,7 @@ foxgui_sources = [
+
+ executable('gsl-shell-gui',
+ foxgui_sources,
+- dependencies: [libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep, fox_dep],
++ dependencies: [libX11_dep, libgsl_dep, libagg_dep, threads_dep, freetype_dep, luajit_dep, fox_dep],
+ include_directories: [gsl_shell_include, cpp_utils_include],
+ cpp_args: gsl_shell_defines + fox_gui_defines,
+ link_with: [libluagsl, libaggplot, libgdt],
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.5.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.5.ebuild
new file mode 100644
index 000000000000..aaa1e8873371
--- /dev/null
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/user-manual"
+DOCS_AUTODOC=0
+
+inherit meson python-any-r1 docs
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Lua interactive shell for sci-libs/gsl"
+HOMEPAGE="https://www.nongnu.org/gsl-shell/"
+SRC_URI="https://github.com/franko/gsl-shell/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=sci-libs/gsl-1.14:=
+ virtual/blas[eselect-ldso]
+ >=x11-libs/agg-2.5[X]
+ >=media-libs/freetype-2.4.10
+ sys-libs/readline:0=
+ || ( media-fonts/ubuntu-font-family media-fonts/freefont media-fonts/dejavu )
+ x11-libs/fox:1.7
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/luajit
+ virtual/pkgconfig
+ doc? ( virtual/latex-base )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-no-fetching.patch"
+)
+
+src_compile() {
+ meson_src_compile
+ docs_compile
+}
diff --git a/sci-mathematics/gsl-shell/metadata.xml b/sci-mathematics/gsl-shell/metadata.xml
index 86a8f8253446..74456c83ce16 100644
--- a/sci-mathematics/gsl-shell/metadata.xml
+++ b/sci-mathematics/gsl-shell/metadata.xml
@@ -17,4 +17,7 @@ of easily access GSL functions without having to write a complete C application.
<use>
<flag name="fox">Build a <pkg>x11-libs/fox</pkg> GUI</flag>
</use>
+ <upstream>
+ <remote-id type="github">franko/gsl-shell</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-24 10:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-06 20:25 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/gsl-shell/files/, sci-mathematics/gsl-shell/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-08-30 17:25 Andreas Sturmlechner
2023-02-24 10:29 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox