Adding metadata

3 files changed, 65 insertions, 53 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index ab4306579d0a..9434c11b3b7e 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +1,3 @@
 DIST gnuplot-5.4.10.tar.gz 5687565 BLAKE2B 879159fb4b581aa334b221632af7268047077cd48d89d1cecb0c6c9e855edd40bddfdaa8222177652d6200f81b97b0b52fe719da0641eea817e086832f07664f SHA512 fe5226a243dad62e8617d820764dc5923e76a51a68c58a666a699110f5b5be0f5e759e0586e923472a59ca6d1b30d1093d7a65e9c1d3a36fcd33a95df36ab89f
-DIST gnuplot-6.0.2.tar.gz 7637308 BLAKE2B e06923c89f3f89bcefbf69c469036763d0da5cdc8c860e07631be7bef12a7e2e81b1315aa671c1e6a6948202e860bd0dcd4f0f57c1dba9b9cff37659ce586999 SHA512 5c26c91a91238be0dad91b0835427355b4db526e6a83225219219b3c980e245abcd4b54d1c693523d645c469f3c610658da0c889df691ba8ba6799efe440ed01
 DIST gnuplot-6.0.3.tar.gz 7616904 BLAKE2B 114ff2da63554cc273e2819a2c207f8d908c4daa97206fddecc21e92efd70f53b95a06a9ee8615988133da4dcad62bbb27e140e51587ae74fb68ca53308e09f4 SHA512 33b0954ff70f1655e23ce0b6986b317a2b1be5ff6c3edda4df0499ef1e2db9bef97f2f3f5ca6c18272bd3375e60c8c07db3639f1c139be51416e8a6aba6e33c9
+DIST gnuplot-6.0.4.tar.gz 7549894 BLAKE2B b2e4daa5ec31fb46dd963c8aa341b0cfbd6a80572d6679780c526c04d4a16d27801e8611458944d99b7707dd28fa2770e43810fcdd9da5009cef965e17396a45 SHA512 086e109cc040c0b9ebedded17d551c2758629c13dc2a5bf950fe129c8c0dec38b01a3d1e89a8f138f7b0bedccb68996676ab2ff9e9f53aebea8e8d0c0ce98a75
diff --git a/sci-visualization/gnuplot/gnuplot-6.0.2-r2.ebuild b/sci-visualization/gnuplot/gnuplot-6.0.4.ebuild
index 01545e230e7a..183b1464b908 100644
--- a/sci-visualization/gnuplot/gnuplot-6.0.2-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 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="https://downloads.sourceforge.net/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -29,9 +29,7 @@ LICENSE="gnuplot"
 SLOT="0"
 IUSE="amos aqua bitmap cairo doc examples +gd gpic latex libcaca libcerf lua metafont metapost qt6 readline regis tgif wxwidgets X"
 
-REQUIRED_USE="
-	doc? ( gd )
-	lua? ( ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
 	amos? ( dev-libs/openspecfun )
@@ -123,37 +121,46 @@ src_configure() {
 	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 amos) \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_with gd) \
-		$(use_with gpic) \
-		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with libcerf) \
-		$(use_with lua) \
-		$(use_with metafont) \
-		$(use_with metapost) \
-		$(use_with qt6 qt qt6) \
-		$(use_with regis) \
-		$(use_with tgif) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="https://bugs.gentoo.org/" \
+	local myconf=(
+		--with-texdir="${TEXMF}/tex/latex/${PN}"
+		--with-readline=$(usex readline gnu builtin)
+		$(use_with amos)
+		$(use_with bitmap bitmap-terminals)
+		$(use_with cairo)
+		$(use_with gd)
+		$(use_with gpic)
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")"
+		$(use_with libcerf)
+		$(use_with lua)
+		$(use_with metafont)
+		$(use_with metapost)
+		$(use_with qt6 qt qt6)
+		$(use_with regis)
+		$(use_with tgif)
+		$(use_with X x)
+		--enable-stats
+		$(use_enable wxwidgets)
+		DIST_CONTACT="https://bugs.gentoo.org/"
 		EMACS=no
+		# pdflatex fails in titlepag.tex: "Argument of  has an extra }."
+		# Work around this by using lualatex to build the user manual,
+		# see release notes of gnuplot-6.0.3
+		PDFLATEX=lualatex
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_compile() {
-	# Prevent access violations, see bug 201871
-	export VARTEXFONTS="${T}/fonts"
+	# Prevent access violations #201871
+	local -x VARTEXFONTS="${T}/fonts"
+	# Work around luatex braindamage #950021
+	local -x TEXMFCACHE="${T}/texmf-var" TEXMFVAR="${T}/texmf-var"
 
 	emake all
 
-	# pdflatex fails in titlepag.tex: "Argument of  has an extra }."
-	# Install the pre-built gnuplot.pdf instead.
+	# Building the documentation is broken for some configurations.
+	# Install the pre-built gnuplot.pdf instead. #577828 #689894 #960528
 	#if use doc; then
 	#	if use cairo; then
 	#		emake -C docs pdf
diff --git a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
index e4cdeb8becdc..3623ece84e96 100644
--- a/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-6.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -123,32 +123,37 @@ src_configure() {
 	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 amos) \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_with gd) \
-		$(use_with gpic) \
-		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with libcerf) \
-		$(use_with lua) \
-		$(use_with metafont) \
-		$(use_with metapost) \
-		$(use_with qt6 qt qt6) \
-		$(use_with regis) \
-		$(use_with tgif) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="https://bugs.gentoo.org/" \
+	local myconf=(
+		--with-texdir="${TEXMF}/tex/latex/${PN}"
+		--with-readline=$(usex readline gnu builtin)
+		$(use_with amos)
+		$(use_with bitmap bitmap-terminals)
+		$(use_with cairo)
+		$(use_with gd)
+		$(use_with gpic)
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")"
+		$(use_with libcerf)
+		$(use_with lua)
+		$(use_with metafont)
+		$(use_with metapost)
+		$(use_with qt6 qt qt6)
+		$(use_with regis)
+		$(use_with tgif)
+		$(use_with X x)
+		--enable-stats
+		$(use_enable wxwidgets)
+		DIST_CONTACT="https://bugs.gentoo.org/"
 		EMACS=no
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_compile() {
-	# Prevent access violations, see bug 201871
-	local -x TEXMFVAR="${T}" TEXMFCACHE="${T}" VARTEXFONTS="${T}/fonts"
+	# Prevent access violations #201871
+	local -x VARTEXFONTS="${T}/fonts"
+	# Work around luatex braindamage #950021
+	local -x TEXMFCACHE="${T}/texmf-var" TEXMFVAR="${T}/texmf-var"
 
 	emake all