gentoo resync : 20.03.2022

4 files changed, 103 insertions, 0 deletions

diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 85101b306008..26914dc74675 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,9 +1,13 @@
 AUX gsl-shell-2.2.0-pkg-config.patch 873 BLAKE2B 8c4dd1c126938d478965ce896209d2d1ea44a3b7a88b13ea0b080e0aa49d74fa21ef8421c8c18b6ff050e09dee65a1f0ffdc1af82e3adb17636859d49970a696 SHA512 949adbea8ed65a1b6e40cea7f9074135e30fb8b7bd2207e2bbd94f51cb30aadcdbad2a780dff0d271ab97ecc30a01bed6f7fc02c9079ad4f65a1200176e99715
 AUX gsl-shell-2.3.0-gdt-cflags.patch 551 BLAKE2B da5a266ed248ce50ded647dbf5eba443d72977522d768bb912e27530f87e71056abe30ba4613c14cc414214fafbb9c821419530695a9418008d843a6540980c1 SHA512 00260e88352c2502aaf8a05243b9dbcf204c639c8fa14777ffd05d69e185409ccae80d86cd592b85fa2815e20ee97bfd711e02302b6bc0e5ee28265d8ddab7c6
+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-font.patch 643 BLAKE2B a3dd51932ed9c5b6d4457764cf5b7838ab5af704740419a1aba89ce58ca892ca51601521af182c292cc3823be3dca8573a7539f7668c87fb9ad7687b96390417 SHA512 feeb151ff96c02b523f284acbaf214480b92cac42af497f6210726ff2a3b837c6792733ad5c2ac4be58fea68c18c5d10bf7db711336e32c9998c1456bfa3cbff
 AUX gsl-shell-nogui.patch 809 BLAKE2B 47f242696886a87179c91efd17b783dd81a74fbfbcc35a96cc5a72da453bef71dad7b2710b5248a221e53af5e956eaa842b4e9edf0da7e0afba94ad656cf5fd9 SHA512 b43d8009fef20ef847e098d4279b415ab26643970157b4fd49be1e255e1e8f59862159c2cb6054726d988c2d8b3bd6935673a509c803f486388a333040cde409
 AUX gsl-shell-strip.patch 361 BLAKE2B 7152b2fde2ac264cc9a78eb9f5b3a440e84a907e666b27361ad4a94d9e380bc9d3873066da959af8f1e67b5e165c90fb74e33425e8a83e2501cc3b07a8464330 SHA512 ecb78c52f34d678ecec5ca5f6ee9c85cf954866347501aaf2fd31133357d8085bbbaf3d6118ae2cd20e8375927ae9c1958732bfab09bf308bde7fc3255fa35bf
 AUX gsl-shell-usr.patch 250 BLAKE2B 6678c7fdd9f656be498025fc3d00b4d757c29e6aa451a95d71b78d81db9426ecd4fcc83ccd36352283a5c62c8084dae56d53feb85c144b7b725b5604141b4bc5 SHA512 e10df17a16969ad700e7f16c8fcf694e9c5f2d346e6db7ad5d616122c5160d9ea3d894354aef4214e48233a17e101b20b51c939fdbcb29b25169a4c6c07bc0c3
 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
 EBUILD gsl-shell-2.3.0_beta1-r1.ebuild 1582 BLAKE2B 2bb262fde5efa8729670639cc627cc6f7062f83d7705dd2dfa30e47af8b75dff252d8744c515d0e2b55dda4555a7d4d35393799fb311f53fc770c7bf0401bad2 SHA512 607243850f9a6071047ef192235b898816b25e42a48d97ac52335bc71e055c862d5419042d608359c71ed367c039e410cbd554af5a4b60b2913d95659a3dd6b3
+EBUILD gsl-shell-2.3.2.ebuild 1622 BLAKE2B 0c21d7db438eec818b6f0b5888feb702e0f9b1d588041ca4d8a31f0d3c628659a88085ac3137b39e00e572d2c743e5160f8f2d3160f9c862586a24eb0a366457 SHA512 91901288b855e06f537ddb45dc09dab1c5b56c410265f66329412f2eba987c782b3a080b67321071640f9fc8509b525f7c15cec3cfed747906053dd973a4a2f4
 MISC metadata.xml 850 BLAKE2B 3280ed5969c25784f14e90febf9ba123aeca053dbcb9545e75163ce2c796dc3f3e8bae24b4479e5c2005b5462195a1e3dc4de37d04a1facffd62d40c9de6b30b SHA512 ac591d09c7263a391987c96fb60b7a7147110d1087945fdf7375aa7d8af4d2c8c29bcb06746d855a5b510fb6937fba0ae8f4d3820470cbf45ae0fc145ed2ee7c
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch
new file mode 100644
index 000000000000..d8cdaa02a2c5
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-no-compile-in-install.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 39b4872..4c04865 100644
+--- a/Makefile
++++ b/Makefile
+@@ -154,8 +154,8 @@ mkdir -p $1$(PREFIX)/bin
+ mkdir -p $1$(PREFIX)/share/applications
+ mkdir -p $1$(PREFIX)/share/icons/hicolor/128x128/apps
+ mkdir -p $1$(PREFIX)/share/$(PACKAGE_NAME)/$(PACKAGE_VERSION)
+-cp $(GSL_SHELL_GUI) $(GSL_SHELL) $1$(PREFIX)/bin
+-strip $1$(PREFIX)/bin/$(GSL_SHELL) $1$(PREFIX)/bin/$(GSL_SHELL_GUI)
++test -f $(GSL_SHELL_GUI) && cp $(GSL_SHELL_GUI) $1$(PREFIX)/bin  || :
++test -f $(GSL_SHELL) && cp $(GSL_SHELL) $1$(PREFIX)/bin  || :
+ test -f $(LUAJIT_SO) && \
+   mkdir -p $1$(PREFIX)/lib && \
+   cp $(LUAJIT_SO) $1$(PREFIX)/lib && \
+@@ -168,7 +168,7 @@ $(CP_REL) $(LUA_BASE_FILES) $1$(PREFIX)/share/$(PACKAGE_NAME)/$(PACKAGE_VERSION)
+ $(CP_REL) $(EXAMPLES_FILES) $1$(PREFIX)/bin
+ endef
+ 
+-install: $(GSL_SHELL) $(GSL_SHELL_GUI)
++install:
+ 	$(call install-to-dir,$(DESTDIR))
+ 
+ debian: $(DEBIAN_PACKAGE)
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch
new file mode 100644
index 000000000000..29ddaf2fd710
--- /dev/null
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-2.3.2-sphinx-extmath-to-imgmath.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/user-manual/conf.py b/doc/user-manual/conf.py
+index 899f5d6..9475d85 100644
+--- a/doc/user-manual/conf.py
++++ b/doc/user-manual/conf.py
+@@ -25,7 +25,7 @@ import sys, os
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.pngmath']
++extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.imgmath']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.3.2.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.3.2.ebuild
new file mode 100644
index 000000000000..14ec634d1a7c
--- /dev/null
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/user-manual"
+DOCS_AUTODOC=0
+inherit toolchain-funcs 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"
+IUSE="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}"
+BDEPEND="
+	dev-lang/luajit
+	virtual/pkgconfig
+	doc? ( virtual/latex-base )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-compile-in-install.patch"
+	"${FILESDIR}/${P}-sphinx-extmath-to-imgmath.patch"
+)
+
+src_prepare() {
+	tc-export PKG_CONFIG
+	default
+}
+
+src_compile() {
+	local BLAS=$($(tc-getPKG_CONFIG) --libs blas)
+	local GSL=$($(tc-getPKG_CONFIG) --libs gsl)
+	emake -j1 gsl-shell CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" \
+		GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${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 gsl-shell-gui CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+			CFLAGS="${CFLAGS}" FOX_INCLUDES="${FOX_INCLUDES}" FOX_LIBS="${FOX_LIBS}"  \
+			GSL_LIBS="$($(tc-getPKG_CONFIG) --libs gsl) ${BLAS}"
+	fi
+	docs_compile
+}