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

[Andreas Sturmlechner]

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
-}