gentoo auto-resync : 08:02:2024 - 09:59:13

5 files changed, 223 insertions, 3 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index acac166c491e..4cd5d15ae758 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 33afc447995f..8030df46b589 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,8 +1,11 @@
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
+AUX gnuplot-6.0.0-configure.patch 401 BLAKE2B 82246d32c49730c0688b810f19984338f072896b694dcf36bc4aedcfe65112f384323c15cf9d3ee10a9200f6b3b38f5065e97fc40537e9b9c1b9daa1c4c79a8c SHA512 4d959633c82be8532eee5ec84f90aaf5863f5d5d420d37c8c14bf7adf3df39726ff8d3e9b3befb933fd6aee8b4a73410b4aad7e08538ca27739f4db61e47243b
 AUX gnuplot-6.1-no-picins.patch 628 BLAKE2B ab7ffcfecee328d4a8653af0c5cf80470ac65299b5576835db5083b01b461b359775b2b72ef87a757072cce406daa18d3b116bae2c89f8291cd4154e0a7300e4 SHA512 45f5db5745de1d96a2abf987f2d5e85a827bbd298675f4f4b1526ff96d22de12c4b8de75b86fb87447891aaa9e45b158531d1bf7386617824057b56c9de5f0c3
 DIST gnuplot-5.4.10.tar.gz 5687565 BLAKE2B 879159fb4b581aa334b221632af7268047077cd48d89d1cecb0c6c9e855edd40bddfdaa8222177652d6200f81b97b0b52fe719da0641eea817e086832f07664f SHA512 fe5226a243dad62e8617d820764dc5923e76a51a68c58a666a699110f5b5be0f5e759e0586e923472a59ca6d1b30d1093d7a65e9c1d3a36fcd33a95df36ab89f
 DIST gnuplot-5.4.8.tar.gz 5684061 BLAKE2B bd897b55e267f50e2f5ce8a49a3a033277577cd972c9effaaaedb0bb2e75908ce34997e389edcc4bd0db1dd8a0d937925216ed6ebf4e51d6700bac50d12e6a47 SHA512 3fe0ed783db85d95bdbc13e24ec5dc9bb6b2d85b3571cc87d3c17c94f4463fb6e681376394e0918cf3915f8f53896e6423ce76cb8b6fdbefcd6ec3e1b3b80125
-EBUILD gnuplot-5.4.10.ebuild 4991 BLAKE2B 4b38aa2b1b94950cfbf5558f232d124ef20c1e7f0ed576d576adf57bb982fabeb26055ebff85928b17eb58b52748f8ab13ec327a4732570e7dc217225bd2778c SHA512 13e7c291bb4705f02dffae8c4a2cf39e6fc2d719f06770abb7f9eeab68afa36d44b5fbc25cddc7fe9be873f21dbd1e21e4cad2bf76a00ad86ad0dd2be777b4e9
+DIST gnuplot-6.0.0.tar.gz 7522870 BLAKE2B 619171272c2348db1b676d6d773d34e0b9f1b219e1a43c37287e3347d8ae6147ebc2a88cea5da13f34cb608cc1c8ebf884e89b8975249fd5c19167a38a65c8df SHA512 520b9a74ac64e4d0b0f89dda55f77b27026e60b7a9208e994d321299481d0aa1f8adc91e61682534112bf739311a3d312c5abe08c12ec9bc2a7a6319b53872ea
+EBUILD gnuplot-5.4.10.ebuild 4987 BLAKE2B 57f471696c2e27e334a7fa44371fe4cd17a73b01264f1d807475aea49f9a006317d88b6decb0ba81dc6094082c9e0212471c9072227f09a1fb0e648f82bf8849 SHA512 f1e829a9f80da8c249920260b9944e8d5ed296674db91a4e8af8c0dafc315f15747fcae377b5f03edd93c8227d3fcc42291a893abec6f0cbaa841afbf4904ccd
 EBUILD gnuplot-5.4.8.ebuild 4984 BLAKE2B fa0f0e07f0a8e6c88c14b18e2533acb346606420b2a69892f40e9b1bc038dc73399b7453694303389b799bdfc33ba5ccf1c0e729803a46b21b6344d969217557 SHA512 663c75cdf90af7c56b535605a6de44915c73e52438f717fe32625cb6e7366bccbc594e0211646bf6414561e30c3c650f4bfaacfa6a0c63f93d344afc9bef5df1
+EBUILD gnuplot-6.0.0.ebuild 4944 BLAKE2B 16725933608b96985c0e9407924f3210f598167ddb43ca429786b672f30679598b625e14e693543fc27eb6eb7c08bb3c2b2f2c8125741e3b93404c3368c3ca10 SHA512 02891d2c467056075ca8e5c56f5181bf7150c30d7886452e2cc06d70057d3888563808e3372996617dbecaaeedabff53a146357103609c726d916cd6c38d81c0
 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-6.0.0-configure.patch b/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch
new file mode 100644
index 000000000000..463dccab8c90
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-6.0.0-configure.patch
@@ -0,0 +1,11 @@
+--- gnuplot-6.0.0/configure.ac
++++ gnuplot-6.0.0/configure.ac
+@@ -1024,7 +1024,7 @@
+                [ Define to support defining a function as a here document])
+    )
+ 
+-Enable parsing of deprecated syntax
++dnl Enable parsing of deprecated syntax
+ AC_ARG_ENABLE(backward-compatibility,dnl
+ [  --enable-backward-compatibility       enable some deprecated syntax ],
+   [if test "$enableval" = yes; then
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild
index 7a6239265ec3..b619d9349e90 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv ~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}"
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild
new file mode 100644
index 000000000000..245e5266df6c
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-6.0.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2024 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.2-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 examples +gd 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 )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	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 )
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+IDEPEND="latex? ( virtual/latex-base )"
+
+GP_VERSION="${PV%.*}"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-no-picins.patch
+	"${FILESDIR}"/${PN}-6.0.0-configure.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 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=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	emake all
+
+	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
+
+	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
+}