gentoo auto-resync : 29:05:2023 - 21:18:33

7 files changed, 29 insertions, 245 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 27c2d08ba0e3..d2b0852fde27 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 7b4b802fcd11..407019d832ef 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,11 +1,10 @@
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
-AUX gnuplot-5.5-no-picins.patch 830 BLAKE2B 8e0a303ff5306f3afa07a585b220fe65440432c455710fc5abd67f7afe73dc923e5b796a3dc184f2195709a9def277933678c05c804cebd9686a6b0353f9a53b SHA512 9ca6c6f53a4940cda8634078556052be966a7f62d1b33566ce42dad066265b65970034f38c0abff66230531b49af4feda5301f6af270b0dd622b28b251b3cf5a
+AUX gnuplot-6.1-no-picins.patch 628 BLAKE2B ab7ffcfecee328d4a8653af0c5cf80470ac65299b5576835db5083b01b461b359775b2b72ef87a757072cce406daa18d3b116bae2c89f8291cd4154e0a7300e4 SHA512 45f5db5745de1d96a2abf987f2d5e85a827bbd298675f4f4b1526ff96d22de12c4b8de75b86fb87447891aaa9e45b158531d1bf7386617824057b56c9de5f0c3
 DIST gnuplot-5.4.4.tar.gz 5639573 BLAKE2B 739849d123836c6c982c72a292274d55808cfecd34a36143ecc454b11215951d28efda1815b15048316e96a2f046789b35b8324c53655f2ac1361653235a23b6 SHA512 ec2f4f34e119a79adeaf2bc3ec1e9335147bd8808d6e689844b891b60319b6d0f627d8ec1b90c4df6bae5e6ed6373c51e1fb70373258c32b93cfc4b2ed821cb9
-DIST gnuplot-5.4.5.tar.gz 5643171 BLAKE2B c9be50a170d14b7860a8bd0927ba81b06d530719fa55d3d6267e4534f564cbef8821e0c0761b7f339aa82bd72486a16cd9f710d148de276ad3eb95959f17dcaf SHA512 dbd0b338c5662304566fc0d790c8f53db071d7c486e7422f6ba4b7a9e0d8e50db756ab37dade9bdc01ed1a1ca6fe4e63749038c0ceec95b78bf8b92a0ae2dd20
 DIST gnuplot-5.4.6.tar.gz 5655661 BLAKE2B a4e42679c9942936bc4692ba71a17c748002e0ce216b7980a79866d6f4090ff012b7079a8a1fb1b7d91c5df86afa8b2cb9f8c0b458184a4e0044cf7fbe715e45 SHA512 a78333f7c0ed3429b24fcdeb6296e67fb760e6f8ffc0801a6b379fcb12ae7e80cebe65a2655cb3530c2a2d4083adc34060c9a7cbe67ce98b660682c0edba174b
+DIST gnuplot-5.4.7.tar.gz 5683635 BLAKE2B 79cb89084d82f8589157caf3a47178bff8541d6a01ff8fc8d2ec201f62e7b448125011a2fb1cbca4b03e20f611ef8a75590c21f9a745581b8aeb2f59e36b0fad SHA512 78f5af8b76d53202002f9a6e69df23a6384b7b06730b5d3c47d2d580b34b7c7ff317ebb7f052f926eed7a530e27abff62a3ec1838325393c3cc1ddf5200ef12d
 EBUILD gnuplot-5.4.4.ebuild 4984 BLAKE2B 9b213f11c3aaaae7657c94b90a5370674d7dfe62a87f286a987e7c19f21237ad9adf64cf7c6d852f7a349a75551609851324ad1d0b055cdf2b4169f18b972ee0 SHA512 8f7f27a98516897ed39cf63f65d44d371a27594b0c9ac1e66f602a93c953a74266c1cb51096a6bb540fb34d25aa779e324ea6d6611ec86458872d284ccb7addd
-EBUILD gnuplot-5.4.5.ebuild 4991 BLAKE2B 2c40d952b1d22721acc136e391f962b0bc28e89f42a7bd79e6c3d0faa73931958a5e1487719be20322999e5612f23b9c81a99006181602e4ec4712347f650b35 SHA512 a6b0516b008c97dedfcc1b1801812561e0d054190b271f6d42da2a3cff9d44c62a2aec928fd81cd84572708e7cc3a0c1d7e6964abd8e77105df01bdb33be1529
-EBUILD gnuplot-5.4.6-r1.ebuild 5185 BLAKE2B 8f15933aab5407498321cc4fae1c631e9941ea486d11ac0597151e3b603aa6c3ee623fe6af25a545258e11215da4a7162dbdb3ffa70b76d165fc22f6dfc5a80e SHA512 d88e0cc7f621f782d9e440b2b46c6c70c0a678332a14ca84110b83829a1938da9d86629374f2a12314da565bcbb1b46dcd0378a715d28a889f711dad42bf7050
 EBUILD gnuplot-5.4.6.ebuild 4990 BLAKE2B f22947c3f5548c5d3bbfc948ba159f8686585e58b2e6c3a1008d393b8c3070c8f6e44693c8ea4a268f37ce29939a887ad3580cbd677760c75b7514796b4e8982 SHA512 563301a91cc95fa2f663c7b9940f20babcda74d9ba780a4f5552235e8bcbd8b4e9e0542eca5cb9e1ea106cb05672dec2fd292e39bd52c1d87be1734c6cd1c1b1
-EBUILD gnuplot-5.5.9999-r1.ebuild 4976 BLAKE2B fa99fbce453bf8fc61894d677afab11dfaa9ff1962c40c0f5fe6cd4f5ace567b9ccfb1902a83d97ec08535ad06516f914d24fa40a7c86ce2f848e80e0fe98f93 SHA512 3ccdcae7b3de1abfda94531386b399b38e292841321e3a6c17b3acdab8e8da95e6b54b5c71a64ae4432739a46d297e9b1f9046536ebcfbb74f6f853645d7b976
+EBUILD gnuplot-5.4.7.ebuild 4991 BLAKE2B 4b38aa2b1b94950cfbf5558f232d124ef20c1e7f0ed576d576adf57bb982fabeb26055ebff85928b17eb58b52748f8ab13ec327a4732570e7dc217225bd2778c SHA512 13e7c291bb4705f02dffae8c4a2cf39e6fc2d719f06770abb7f9eeab68afa36d44b5fbc25cddc7fe9be873f21dbd1e21e4cad2bf76a00ad86ad0dd2be777b4e9
+EBUILD gnuplot-6.1.9999.ebuild 4901 BLAKE2B 8d6e8ff2d8af772c659b77cf1f94668ff3b855dcd1c04bd0b1039235465f641aff486e07d8924442217700fed7b8228996adb774bff602a519cc17643e3a33e0 SHA512 2e0a2e83ede7a17314b44bceae134dc6318a2142b9519898fd12cd6d7c7c8c127afa35c3315fdcdfb384eb2adc70a89ab2ef781f2a135ab65cb7c8966ed74d51
 MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a
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.4.6-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.6-r1.ebuild
deleted file mode 100644
index 1f4e3ac973e8..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.6-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# 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"
-
-inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
-	EGIT_BRANCH="master"
-	MY_P="${PN}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	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 emacs examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
-REQUIRED_USE="
-	doc? ( gd )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	emacs? ( !<app-emacs/gnuplot-mode-0.8.1 )
-	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	libcaca? ( media-libs/libcaca )
-	lua? ( ${LUA_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5=
-		dev-qt/qtgui:5=
-		dev-qt/qtnetwork:5=
-		dev-qt/qtprintsupport:5=
-		dev-qt/qtsvg:5=
-		dev-qt/qtwidgets:5= )
-	readline? ( sys-libs/readline:0= )
-	libcerf? ( sci-libs/libcerf )
-	wxwidgets? (
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gtk+:3 )
-	X? ( x11-libs/libXaw )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-langgreek
-		dev-texlive/texlive-mathscience
-		app-text/ghostscript-gpl )
-	emacs? ( app-editors/emacs )
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-IDEPEND="latex? ( virtual/latex-base )"
-
-GP_VERSION="${PV%.*}"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV##*.} = 9999 ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	eautoreconf
-
-	# Make sure we don't mix build & host flags.
-	sed -i \
-		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
-		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
-		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
-		-e 's:@CC@:$(CC_FOR_BUILD):' \
-		docs/Makefile.in || die
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	use wxwidgets && setup-wxwidgets
-
-	tc-export CC CXX			#453174
-	tc-export_build_env BUILD_CC
-	export CC_FOR_BUILD=${BUILD_CC}
-
-	econf \
-		--with-texdir="${TEXMF}/tex/latex/${PN}" \
-		--with-readline=$(usex readline gnu builtin) \
-		$(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) \
-		$(use_with regis) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_with qt5 qt qt5) \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="https://bugs.gentoo.org/" \
-		EMACS=$(usex emacs "${EPREFIX}/usr/bin/emacs" no)
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	export VARTEXFONTS="${T}/fonts"
-
-	emake all
-
-	use emacs && emake -C docs info
-
-	if use doc; then
-		if use cairo; then
-			emake -C docs pdf
-		else
-			ewarn "Cannot build figures unless cairo is enabled."
-			ewarn "Building documentation without figures."
-			emake -C docs pdf_nofig
-			mv docs/nofigures.pdf docs/gnuplot.pdf || die
-		fi
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-
-	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
-		use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information."
-	readme.gentoo_create_doc
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
-		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
-	fi
-
-	use emacs && doinfo docs/gnuplot.info
-
-	if use doc; then
-		# Manual, FAQ
-		dodoc docs/gnuplot.pdf FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-}
-
-src_test() {
-	emake check GNUTERM="dumb"
-}
-
-pkg_postinst() {
-	use latex && texmf-update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.5.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.7.ebuild
index 188beec468bd..7a6239265ec3 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.5.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.7.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
 
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) \