gentoo resync : 25.08.2020

8 files changed, 5 insertions, 112 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index a80b902e84bc..c23856aa3e7e 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/fityk/Manifest b/sci-visualization/fityk/Manifest
index 124f009009fa..2db9b1fd60d5 100644
--- a/sci-visualization/fityk/Manifest
+++ b/sci-visualization/fityk/Manifest
@@ -1,3 +1,3 @@
 DIST fityk-1.3.1.tar.bz2 1518937 BLAKE2B 6eb13646e1b5cf3fb0763bcf3e91a1877d89f14f1b986f1065fd27052e7110b357c99431a326a6c1fa2ba002300912b922cd3d5589ac5da367d2fbcee209f9a2 SHA512 4a7a65691af8b8d5b47461133b7870ea21ea04ac2ee8ee5714a6b9bab2f072baa6b5d8bf011baba09c62a7ce2dc9d60f3040cc6fdb77dc498b6e03a24fc0fe08
-EBUILD fityk-1.3.1.ebuild 2149 BLAKE2B a719547248466bd5c9417051f42983097487dfbb0ea29c3964652bd7563c51fe712ad8ad95e52bae72c04f1893cb5db05e9d31b53aad9c766df52d7ee5966310 SHA512 a7df734423246b71afab679b584379ece6802fb28f158dc9407d129ed6e735c6f470f44c37fee545aa22ed4d3efa9a4fe556bf0b1ecce4a9bcfa7f588d0d2b73
+EBUILD fityk-1.3.1.ebuild 1327 BLAKE2B 3a5eb2bfe86a51256addd901c8a79d4a3d634735a5f37adbf3148724a3c2db4da454ec504a2810ef2a215eff304f3a48605b6e55faf351fb85e77cc7d674f69d SHA512 4693b15dfc6be0626f4c3c3744479aadc8c0f4e109c26c5c48d6766fcaa2157e7ca9614e4be962cfca2f3f94a0f39155d2076863f5f12cc1778c72f696e7b2dc
 MISC metadata.xml 1378 BLAKE2B a6b73be959353e2a764d5c39ae13c4fe1bc38c5c0ea5a3c2557e32825077e13d0a97504f8d79e338a65803bc98326fe25cb7e86d3aaa8c93c5d9bdce30cbec90 SHA512 38e516a5e0ec249d3ed4e54d4780830e1b53994e9dc1999c664b2f37aac0247df780522e7b25c124ffb0d9766d1292871ec0f9a238c2b3aa9994cef3581befe6
diff --git a/sci-visualization/fityk/fityk-1.3.1.ebuild b/sci-visualization/fityk/fityk-1.3.1.ebuild
index e67e8dead69c..3900bebeeb70 100644
--- a/sci-visualization/fityk/fityk-1.3.1.ebuild
+++ b/sci-visualization/fityk/fityk-1.3.1.ebuild
@@ -5,9 +5,7 @@ EAPI=6
 
 WX_GTK_VER=3.0
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit fdo-mime python-r1 wxwidgets
+inherit fdo-mime wxwidgets
 
 DESCRIPTION="General-purpose nonlinear curve fitting and data analysis"
 HOMEPAGE="http://fityk.nieto.pl/"
@@ -16,16 +14,13 @@ SRC_URI="https://github.com/wojdyr/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot nlopt python readline static-libs wxwidgets"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="gnuplot nlopt readline static-libs wxwidgets"
 
 CDEPEND="
 	>=dev-lang/lua-5.1:0
 	dev-libs/boost:=
 	>=sci-libs/xylib-1
 	nlopt? ( sci-libs/nlopt )
-	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )"
 DEPEND="${CDEPEND}
@@ -37,11 +32,6 @@ pkg_setup() {
 	use wxwidgets && setup-wxwidgets
 }
 
-src_prepare() {
-	default
-	use python && python_copy_sources
-}
-
 src_configure() {
 	common_confargs=(
 		--with-wx-config=wx-config-${WX_GTK_VER}
@@ -54,42 +44,11 @@ src_configure() {
 		$(use_enable wxwidgets GUI) \
 		$(use_with readline) \
 		$(use_enable static-libs static)
-
-	if use python; then
-		python_configure() {
-			econf \
-				"${common_confargs[@]}" \
-				--enable-python \
-				--disable-nlopt \
-				--disable-GUI \
-				--without-readline
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_compilation() {
-			emake -C fityk swig/_fityk.la
-		}
-		python_foreach_impl run_in_build_dir python_compilation
-	fi
 }
 
 src_install() {
 	default
 
-	if use python; then
-		python_installation() {
-			emake DESTDIR="${D}" -C fityk install-pyexecLTLIBRARIES
-			rm "${D%/}"/$(python_get_sitedir)/*.la || die
-		}
-		python_foreach_impl run_in_build_dir python_installation
-	fi
-
 	# No .pc file / libfityk.a has dependencies -> need .la file
 	if ! use static-libs; then
 		find "${D}" -name '*.la' -delete || die
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 0f6c8cd785ce..45eb106bae8a 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -7,7 +7,7 @@ DIST gnuplot-5.2.7.tar.gz 5335673 BLAKE2B 6ca3055f6bb2e032562c7f21beda0adca10875
 DIST gnuplot-5.2.8.tar.gz 5340677 BLAKE2B 169f5bef44a64b3b7a5be40e28ea22ef24ebc7526fe13ab09e16495453c3922712603d63a03c3b4332368d2ae8cbe4ef57ec53e18bbb4ad2cde13e4cc534245a SHA512 513dff15236dcb58c3c5471cdaa0713242787dbf30ef860c3f69152cb87c6392e4973caff5eb178707bbb84c78548e806b2920864a37686bce49425fbfdc4e8c
 EBUILD gnuplot-5.0.7.ebuild 5772 BLAKE2B fdf5b221701cd90e4dd63b7388cd3d0d7eb6b42e14d915d3c43e42bc26daf74b472a796f66223a7fd21ca835d0dcc42946f365f76a6dc5409e6c1c194ab70a3d SHA512 174d485b762c6402020bb3ee3112469ee71ede3a4d3ed3b14deaa6097066b9859e00ddbdb0bb384c4c5022806daae7e1b9d355643eafb6bb58e58006e19d10de
 EBUILD gnuplot-5.2.7.ebuild 5835 BLAKE2B 2e24c5555898aef38fcb45bf64cafe6a055d55377875d5d6ab60ff33a62570c71dc278b912b846349b4951bcd7dcbebc7babcb2064b3c54ebf67d403da768a33 SHA512 3549d714307ce3ab441e210a6e56ef9aa862240be2893e00254554bad570123666d1674a997eaa82582319c591f8fbb287f5d6748b1897db6426d8481c9e877f
-EBUILD gnuplot-5.2.8.ebuild 5847 BLAKE2B 7fb11e4fa0ffc969286090c85af7a644ceac71f121c0d4cedaeaf7534b79c936618e0804a200c6fc445909c6ac4814162e67c6cfaed8400710ef45467977d459 SHA512 84a30e20777839cd97c135158c5e603239e566851588af9a4270f2df964bf53a5914ec49f2aaa598eba406f23a7b305a724a2025d6dad80feda4d32c50d620e4
+EBUILD gnuplot-5.2.8.ebuild 5846 BLAKE2B bab2b43ebecd6c0f7c7e5eea2755d693de289dd9e2759ad2d72e21e00aa1de6932231713b89b78b996570542cc20eafcdc154cc2b2b9f607892d4f9170b14dcc SHA512 8f76e36609bda84fb49ac2586e39824d5ac6183b3b4b92874a3fdb8e5db92e00e8b32e7e8c9a80d4a99cb982f33e15624532702ea1729a0f05310c78c931198e
 EBUILD gnuplot-5.2.9999.ebuild 5742 BLAKE2B 454aafd7166509cccd7711eeb54b2c0af3bbe136d235f5581a8d495944126f9ea4c8d201af1f02aa474a55a31bf023e5f59e61419ac44f4a7c698408b3306908 SHA512 dd5e3197892c2cc99d6fa41230286a3baa62ec67a6c5d2354ba2575ad04b6e779ae601674e11186e485ea34e7561720bbd1e87825af0f272bf14637146120939
 EBUILD gnuplot-5.3.9999.ebuild 5089 BLAKE2B 26f13dee72d3af9a555278fe3be6e5315f66b522f171e08e21fceaa2bb10b82f3895a7f57f12ad7e648b5907a0c161a997196a77655e9fa169a7a909d73d100b SHA512 06d013fc5ba85f85724b077831982e078ea9aa2db41160c6cf5d7f7b7671e5620d854af6af08d765b1ac4eb8b58e8777413e5bf72e9278f43106b04db10d62b9
 MISC metadata.xml 1155 BLAKE2B eff192a398ceb9f9484a4fce82498a5eb657d7609c835843f964c8468c8d8a8f913e025413e4501affa15bf19c9eb7ee24153313f6d8f42b4f6f4284af081540 SHA512 1dfff9f997a870c33e455eb896949d0a379be4c20c93a92b2dc6c8495c08e98340ea1d254b40ee64c2520587869e529f7b33689fd1d157631da640179d5ed295
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
index a230f96553af..29dde10c36aa 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
@@ -17,7 +17,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 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot"
diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
deleted file mode 100644
index 355d0ed1c1ee..000000000000
--- a/sci-visualization/pyxplot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyxplot_0.9.2.tar.gz 4131841 BLAKE2B 8a5da46f2328ae8e73d7b841dc04b8d972bdaeb7dacaf658349e5235a696334cd806b8f8bc25b9bbebe2074f52f4fb0bad4b22ff305250b1a4d138ea039657e5 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844
-EBUILD pyxplot-0.9.2-r3.ebuild 1043 BLAKE2B 10fe324798302f00c22eadfa5aa93156e2a1bb90dcffb35168fb5ea8775ba75c7afb9934742957016ea1e691b2c704716d6a0c6d103b32ffe6ddbbb5f968539e SHA512 85733755f8e6a54fb300a3889720c264db84f0f4c4cbce3a86a4454642d56d615d2599a1d874e7520246f9aae6096ee017397a89728e77ad24f5269485111257
-MISC metadata.xml 649 BLAKE2B a709482e9a6d3f30231db228633f682ba1426640a5ababffc02b8a625900f62ec1f2bd40a6d2469085d87ed7c342081596d7371b112f0c4b56435f2ca7253f15 SHA512 2f9b6c06f24dccd4c954dc35cd4ac2b286ff77c5cf5794ed8ec6e20af4050c09099c84bdd75402823aed922f879b8d4340d9f6ce8763e116c0ba476853475531
diff --git a/sci-visualization/pyxplot/metadata.xml b/sci-visualization/pyxplot/metadata.xml
deleted file mode 100644
index ca88d83c110e..000000000000
--- a/sci-visualization/pyxplot/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  PyXPlot is a command-line graphing package with a simple interface
-  that produces publication-quality output. Its command line interface is very
-  gnuplot oriented and has actually some compatibility. The output
-  is based on LaTeX typesetting environment.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pyxplot</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
deleted file mode 100644
index 7cc957e134be..000000000000
--- a/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib python-single-r1
-
-DESCRIPTION="Gnuplot like graphing program publication-quality figures"
-HOMEPAGE="http://www.pyxplot.org.uk/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-text/gv
-	dev-libs/libxml2:2
-	media-libs/libpng:0=
-	sci-libs/cfitsio
-	sci-libs/fftw:3.0=
-	sci-libs/gsl
-	$(python_gen_cond_dep '
-		|| (
-			sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-			sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	virtual/latex-base
-	virtual/imagemagick-tools
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed \
-		-e "s:/usr/local:${EPREFIX}/usr/:" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "s:/doc/${PN}:/doc/${PF}:" \
-		-i Makefile.skel || die "sed Makefile.skel failed"
-	sed -i -e 's/-ltermcap//' configure || die
-}