gentoo resync : 25.08.2020

4 files changed, 12 insertions, 59 deletions

diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index fe3b1debbf4f..3b16c004bf1f 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,6 +1,4 @@
 AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
-DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
 DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
-EBUILD mpmath-1.0.0.ebuild 965 BLAKE2B 6516b708f6796943be71bb2b77e0403746b672c443074ee55614d276d70eb0c2750bff3da7650807fac689f61416b81659ab1e6c14d0329f3b641ead04d8b3ac SHA512 5399977dbba604a6237a36e290ff5eca05f628ff5cee6b5d730cc510c428078f026e7c24afdf7ccaaf0c45daf4b1c1baf0fc95ecef07160fc2e85ee116b61693
-EBUILD mpmath-1.1.0.ebuild 992 BLAKE2B 3b3f4e59ecd7934d229275f161931b736b3a6a8eef9e4ebf2dd6c3b026f2a9131a297e75a91c35c912fda3dbabb78d8f9fa85a91a574e5d5df775406edd468ad SHA512 cbd70c1fdf5ff1d05503a0d2c0f195dc5a11c17abf487734ed39cb44a035c8c249f3ce798bb35db1ec860c32570361d831cf3e5058a723d24777d2154f73d6ad
-MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
+EBUILD mpmath-1.1.0.ebuild 1035 BLAKE2B f9cc254300298441a3339787b93e117a927283b6a3b71e5f98effc9434246e34e25cdd95bdd934dc320f6fd593a583b17dc00a609be6902c246345206f15c56d SHA512 c787a372ffb0b8c75b88dc629b3ae2a3b05f12e561db3d5760361ee006c0d7b9f56631fafaf2b75b928c54ad795eaaf9270d1cb2e9943ca7e8ed1a81fe890d23
+MISC metadata.xml 534 BLAKE2B 19f996d0a1fd717bf099b05dba1c2313dfea37108b412da6ae4efd37f5d982e924f6134a4ea6a5f9e62af33ce52793d7208b31aa993e34ced42b56e0441c7ef4 SHA512 d791c8fd0722872e136f3c9fc222d55d39c5b1ee5f71f1dab0a475c7e39a164e646274c003e97b52111505f0f1d96f973971fbb51965d713c2e60e27b5b37f92
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
index 75c9c7ac5925..c769837f2044 100644
--- a/dev-python/mpmath/metadata.xml
+++ b/dev-python/mpmath/metadata.xml
@@ -9,9 +9,6 @@
   <email>sci-mathematics@gentoo.org</email>
   <name>Gentoo Mathematics Project</name>
 </maintainer>
-<longdescription lang="en">
-  A Python library for arbitrary-precision floating-point arithmetic
-</longdescription>
 <use>
   <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
 </use>
diff --git a/dev-python/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild
deleted file mode 100644
index 0b40bbf7c867..000000000000
--- a/dev-python/mpmath/mpmath-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="http://mpmath.org/"
-SRC_URI="http://mpmath.org/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="gmp matplotlib test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}.patch"
-		)
-
-	# this fails with the current version of dev-python/py
-	rm ${PN}/conftest.py || die
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
index 83effa8f6031..6c2236b75bc6 100644
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
 HOMEPAGE="http://mpmath.org/"
@@ -14,7 +15,6 @@ SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="gmp matplotlib test"
 RESTRICT="!test? ( test )"
 
@@ -27,16 +27,17 @@ DEPEND="${RDEPEND}
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-1.0.0.patch"
-		)
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
+	)
 
 	distutils-r1_python_prepare_all
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
 	pushd ${PN}/tests >/dev/null
-	${EPYTHON} runtests.py -local
+	${EPYTHON} runtests.py -local || die "Tests failed with ${EPYTHON}"
 	popd >/dev/null
 }