gentoo resync : 25.03.2022

5 files changed, 4 insertions, 217 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ef9408b05346..f254757a73a3 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 591cda533994..ab94a34a47db 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,11 +1,9 @@
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
 AUX gnuplot-5.4.2-signed-char.patch 911 BLAKE2B 1387aee900be9686906743e3f98e011164a913744b4fb1b9617e9a9235a35a1e39456a97372f41aa1767603164be11a36a602fa986848b770fcde08e4ff0baf7 SHA512 ce89ff63565640aa3764d39056430dbabf7bba7bc73ebff5a9f9fd2ad8d6a570d01629dca13fb46a293f86b240cdc6e4d7cdcb820bf497383a085137f0360d85
 AUX gnuplot-5.5-no-picins.patch 830 BLAKE2B 8e0a303ff5306f3afa07a585b220fe65440432c455710fc5abd67f7afe73dc923e5b796a3dc184f2195709a9def277933678c05c804cebd9686a6b0353f9a53b SHA512 9ca6c6f53a4940cda8634078556052be966a7f62d1b33566ce42dad066265b65970034f38c0abff66230531b49af4feda5301f6af270b0dd622b28b251b3cf5a
-DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
 DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4
 DIST gnuplot-5.4.3.tar.gz 5656008 BLAKE2B 44745bfc23f3c9f2d27499e0c1430ac32d7995fd12210d83996b87cd989cfdeca75848f0407ce25271f86b866405e726a56523c88a80a476015423cafb32b501 SHA512 fc35ab68a992acc8e35402c89cb7704c0efe117ec1fb272739d4378289d6c5a2e8f4b747b339fca916e559453547f2405863fb52038576883f0d5643a7220b5e
-EBUILD gnuplot-5.4.1-r2.ebuild 5042 BLAKE2B 6fa53714315ccba15617f2d1432b16954fdd1ae4149092b969d3e290ee3c6db4ec25bcde7c2df8463c8869b2a41b18498b1a7032bf5b7ca88a6f12d289363e01 SHA512 9da90847f61f7ae65c0c277c4e7acbf9a6f4526fd00910c74e1b425014d112a641ab0bc0239f6de6ffccaf3feb61991568216b75181e139f6f62e36df477f4e3
 EBUILD gnuplot-5.4.2-r1.ebuild 5130 BLAKE2B 5e10a5250dc13e34a7962c12a4280880e15eb2801ef176d161483c609d2bd05f089ecd4c794b4f7066c9d132f2ad56e33d1ada15a2550951a337fa46d861a2d7 SHA512 37e8bb451c4f3ec5dda87d2e6e0e1bd242cf7ca06c5d0d5a3a24c0c1b8b0ecdd4843cef9befe12918e43d6166f7cc8f7054c120684ac9f3d53c6448a87eb336a
-EBUILD gnuplot-5.4.3.ebuild 5099 BLAKE2B e34e82330619cad637ece8e6056c78bffcf50214d13cc06aff365b8cbdfc49d9ef4d4cac7d231866f2bf5cb443aa4695583687ad417823f2d4f95f8428035d4d SHA512 6cc74ccc409765c5f790e95193a16ebabcab24bdfff45620974beadb815e558dbd123cf801fbaa0af3e0808ade0bd1cc5d6e84e58080609248ee820dd76c260a
-EBUILD gnuplot-5.5.9999-r1.ebuild 5091 BLAKE2B 70e126dfefdf64242cd31672e9a783f98b0f85d45d29f5efcc0f92447258b8aa2d1185f981bec5b50eccd56777eac3fa5a35b84ee162e68104fd7156b9304baa SHA512 bd590b42775e62687c335e967cc025095847f6c1237c96ad657bc2fa910069854833d2dcc80aeff1b3b2506ce6223e3d2be76f2a720d632de46be6298e7dfd07
+EBUILD gnuplot-5.4.3.ebuild 5006 BLAKE2B 0bd5ddf7501896c951fa066cb5aa413cbc84005840b782a142c160d523c62e4b33516c1868804ce4b31150955eb898797a4262b8fe38e4a05526964fe7c04d3e SHA512 32320f7bf94d6817a0dce1f79513b18a87bb4fae1700c32e85d122249007ea3e4642f9dc9646f345f2c00dedf9045ecf9580493d905da8e6c915b0988cdb8bfe
+EBUILD gnuplot-5.5.9999-r1.ebuild 5004 BLAKE2B 50c97333406cb28a5a14405190815e8629dd69028da084ab3cef4720ba3be4b6e12e1382428c60a98e57d3013fabc2d74763239923c05860a59f88bcb5f70844 SHA512 df00dca2a95c77c21a75a68bd925401a6739b5666dd9b120ed133c73379be97fec81307f5e9f6584034520a4a64bc314155e8baefabcaa36024e66a45cff1749
 MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
deleted file mode 100644
index 5e3a9e7067f0..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,2,3} )
-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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-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"
-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] )
-	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 )
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-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=no
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	export VARTEXFONTS="${T}/fonts"
-
-	emake all
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		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
-}
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.3.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.3.ebuild
index 8d395bb4e472..e95661e51f3a 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.3.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.3.ebuild
@@ -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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -148,8 +148,6 @@ src_compile() {
 	emake all
 
 	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
 		if use cairo; then
 			emake -C docs pdf
 		else
diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
index e54da6c07a20..ef66f5e1c7b3 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -148,8 +148,6 @@ src_compile() {
 	emake all
 
 	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
 		if use cairo; then
 			emake -C docs pdf
 		else