sci-visualization/gnuplot: Update live ebuild

Update picins removal patch. Drop ggi USE flag, following upstream.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>

3 files changed, 23 insertions, 25 deletions

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
deleted file mode 100644
index b27b0bd941bd..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Do not require picins.sty.
-https://bugs.gentoo.org/577828#c4
-
---- gnuplot/docs/Makefile.am
-+++ gnuplot/docs/Makefile.am
-@@ -179,9 +179,10 @@
- 	$(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
- 	  rm -f gpinsetfigure.tex ; \
- 	  ( echo "\usepackage{graphicx}" > gpinsetfigure.tex ; \
--	    echo "\usepackage{picins}" >> gpinsetfigure.tex ; \
- 	    echo "\newcommand{\gpinsetfigure}[1]{" >> gpinsetfigure.tex ; \
--	    echo "  \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}" >> gpinsetfigure.tex ; \
-+	    echo "  \begin{figure}[htb]" >> gpinsetfigure.tex ; \
-+	    echo "  \centering\includegraphics[width=3in,keepaspectratio]{#1}" >> gpinsetfigure.tex ; \
-+	    echo "  \end{figure}" >> gpinsetfigure.tex ; \
- 	    echo "}" >> gpinsetfigure.tex ; \
- 	  ) ; \
- 	$(AM_V_GEN)touch $@
diff --git a/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch
new file mode 100644
index 000000000000..a0e2c8a429ab
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-6.1-no-picins.patch
@@ -0,0 +1,18 @@
+Do not require picins.sty.
+https://bugs.gentoo.org/577828#c4
+
+--- gnuplot/docs/Makefile.am
++++ gnuplot/docs/Makefile.am
+@@ -143,9 +143,10 @@
+ 	$(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
+ 	rm -f gpinsetfigure.tex
+ 	printf '%s\n' '\usepackage{graphicx}' \
+-		'\usepackage{picins}' \
+ 		'\newcommand{\gpinsetfigure}[1]{' \
+-		'  \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}' \
++		'  \begin{figure}[htb]' \
++		'  \centering\includegraphics[width=3in,keepaspectratio]{#1}' \
++		'  \end{figure}' \
+ 		'}' > gpinsetfigure.tex
+ 	$(AM_V_GEN)touch $@
+ 	$(AM_V_at)touch figurestyle
diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
index 3e5902c5070b..94b71cafa1fa 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-{1,2,3,4} )
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 
 inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
@@ -20,14 +20,14 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="gnuplot"
 SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+IUSE="aqua bitmap cairo doc examples +gd latex libcaca libcerf lua qt5 readline regis wxwidgets X"
 REQUIRED_USE="
 	doc? ( gd )
 	lua? ( ${LUA_REQUIRED_USE} )"
@@ -37,7 +37,6 @@ RDEPEND="
 		x11-libs/cairo
 		x11-libs/pango )
 	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
-	ggi? ( media-libs/libggi )
 	latex? (
 		virtual/latex-base
 		lua? (
@@ -79,7 +78,7 @@ GP_VERSION="${PV%.*}"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.5-no-picins.patch
+	"${FILESDIR}"/${PN}-6.1-no-picins.patch
 )
 
 pkg_setup() {
@@ -128,7 +127,6 @@ src_configure() {
 		$(use_with bitmap bitmap-terminals) \
 		$(use_with cairo) \
 		$(use_with gd) \
-		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
 		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
 		$(use_with libcerf) \
 		$(use_with lua) \