gentoo auto-resync : 24:02:2023 - 15:48:26

4 files changed, 119 insertions, 1 deletions

diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index a67cb71b3d28..0a33cf452514 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,5 +1,8 @@
 AUX gsl-shell-2.3.2-no-compile-in-install.patch 920 BLAKE2B e47e66c14d67cbbc8267ea690565d642f8e38177913730aee21e64f9bee9edb8700dfa8a673d2da7deaeb2d21fe72cdf4a5dfbe489ab57f9821b8da200ceb2a8 SHA512 7e9c46719d29202a0cf9fb48b025c8a108e73e4694a07511e711ab083e8db1a67469161261741666cdb9d78897d2bbaf73b63440128554b1298816366701befc
 AUX gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch 571 BLAKE2B efb254f4c6ab8ecea7adf4405cd7ddad22a7d7641eb108af11897987757bc313ab128127f1bf793dc7849758f5397888555bbbf6646e43990f059ad1bfacb896 SHA512 0247eafc4450951a914240bc5180cb5ac2620b24e5fbc70c67f297910eb6a35a040c15cb9d8bbdd794dffa77f90a791921ce7f150f86228b6e0d7d8b162b1821
+AUX gsl-shell-2.3.5-no-fetching.patch 2724 BLAKE2B bea4e68899a0c01508a0fd99c4e161e1ea163b6023df7a7375e1e5c5bba8679c22d1bef2a187b6efdeffd6c7b604a76cd12240a8699a26024139f68e6202e0ea SHA512 2d68573cd20603c6d7187ee42663c28e7eb47073430f0e1031a474f871d14bed5e129214fe1206224b49f2fc15343ebc7adb3c2e5cfd5a596d25dcdca4f34e7f
 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
 EBUILD gsl-shell-2.3.2.ebuild 1622 BLAKE2B 02b6b9e3938bba91a885ccf92470bc92fbeeefb06799346ed79b938a1e6ae1098a00f8994e63f6da175396b980ded82de2f0ba145918129d67993dde3f898c9e SHA512 bdffe0fd4f205b5d2c3c7020a6c4cb1ff32a2f48f2c184d30fd747ec2c4dc8301ed8ffcf01edf2d1d6e05080aaaeca77d56855132431a3fe11f8318ab00fc30a
-MISC metadata.xml 852 BLAKE2B 678048e342d63538e2b4033e7c6347ec1a0f4344a7c505138fb27d19374b9d43bb250f181b0600d72facd076167262ef784fcfe9c03e35ade80dfed94af0487e SHA512 9104b49432229f24879d2f8d40773269d37201866585ecf3687741cf6c4adc6c9a21c0053743d0ab7350afd41585b4580738d1abcef6df62e7e2538f7c16db38
+EBUILD gsl-shell-2.3.5.ebuild 977 BLAKE2B 95f33dfc4c9d5b29960f1eab0f3d55a08efd446a45837cfbd2ea54b776f1ad4c606a96d924c3777b6da1499d5cbbefeba22a95df6890c42a527348c2649c277f SHA512 6513b79adbc0c3d7d132eb3ed9787abab085afa623abc51ead2481affd1e632e398db27ed1b8cea59bad38f49e65e103d54bd2feb4a0e0bc2c0962687e295a19
+MISC metadata.xml 937 BLAKE2B 502844c8dcbcd92853cac23a10d508e59cd6212344bd507958c71d5149edf71ce5e7916e4bd010320ed1a83796ebdd054a9407f1df0219a747d5f51419d6e69a SHA512 b9711d403f615c87c7ed0d1d8b4ba58d9193f6a01740f08c421d01cff4c6eaadd21ec3f1022c928d0fb965774a8f90c0e12a166edd96ebaa620d77eaf15f68e3
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>