gentoo resync : 17.07.2021

5 files changed, 1 insertions, 138 deletions

diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 2ba64f36f2f2..b55c10dd513d 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,10 +1,6 @@
-AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
-AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
 AUX gmpy-2.1.0_beta5-failed-tests.patch 4756 BLAKE2B 1258a1b0dd5d0a86ffde979c8766e4829d35ef91c9c829c2d2b433ac5811d45995bdf089b3dc2dc6b58d9b3a10f0283b22d52551b06da4f7709d4f78c8366240 SHA512 a4478447e966292db24e208b763ac11463e7684372e7df5d2115e5908ca6fd88718005c3f8169dc0171e22160d10d3dac034106f50680bc7e1d86d96cc3bde11
 AUX gmpy-2.1.0_beta5-pyhash-nan.patch 379 BLAKE2B 2703f8fc891bb2742d8159834ae252014071745f5097b54990393ca560b804d1cf21b540efd71fea7d4371bb76f040d76596bc73f12f998554b58ae1a77c0051 SHA512 133d1c825f0af2108131ea9e702b5499e1970eef027fc63ee6516fea6cbe5a684aca2a3b8c09c20e3cbdbad87478d692d664bde75a04bae58feed63b8148e6bb
 AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
-DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
 DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
-EBUILD gmpy-2.0.8-r2.ebuild 1716 BLAKE2B 85e9237fcdedc534b93243109f28754577f34328602317fb6a7d599f33839c5c3b019973e2a73974211d6e96e93653942de09946031ad87d996f66c90c1fc0d4 SHA512 195083630391eed0b1b392116d6a34722bbf4a1e40dc94448a0683d3b149a3f2f65937a95456879ce961fde2ee9da39370392599af5112f3ff913000369d6b50
 EBUILD gmpy-2.1.0_beta5.ebuild 1281 BLAKE2B 92940940091499078cf28762247c4cff6e93b083d4e9b0deca4d9640c44a9c96bbf3da8b8176af5d6d9140b42b2cad6ce7438a28c177dfb5dcf4838992742c5e SHA512 73f82946da64c4491d6c3aad5d2019df990818506f107be09a26cf7a5ac430ae197cd2040061d9f40120ccba99d51e1d3bdafc479e2218f6000565d6c436adf8
-MISC metadata.xml 779 BLAKE2B 39be0ec90382e04ec8e482738f0ee8a984f7532e4efa4db27bcd4d9c201b2aadc380e6c3faf180fb32e2d920638bbed4c15b1fefad1af1edfbce8b1f6a1feccb SHA512 af0aadfa3d9c3caaddf2763c33aaf77e0ab285228448f03a8388ec0a2abd199bc88256cce57b78141a437d16eb493e57785791b953898e69f9712dbf26b741fb
+MISC metadata.xml 686 BLAKE2B 825fe2a9401b5dc0f1c78febd69b60f26554bc909e253f0c6ae84c110cfd7c756cccbf46822b045130e770a6ef908eb78570f72ef8b186d5f3eeb915dc299dfb SHA512 6ce00ad42436897a2a2c25db8e7948854142f5e87b9638a56cae0db108173019ed186fb783f75e9967941b0a0fae51d0cecdec0cfbe2291a4d6320d83220e311
diff --git a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch b/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
deleted file mode 100644
index d21e5a55510d..000000000000
--- a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur gmpy2-2.0.8.orig/src/gmpy.h gmpy2-2.0.8/src/gmpy.h
---- gmpy2-2.0.8.orig/src/gmpy.h	2018-04-03 22:44:35.494621951 -0700
-+++ gmpy2-2.0.8/src/gmpy.h	2018-04-03 22:45:33.580835296 -0700
-@@ -129,8 +129,13 @@
- #ifndef BITS_PER_UI
- /* Assume we are NOT using MPIR > 2.5. */
- #define BITS_PER_UI         BITS_PER_ULONG
-+#if defined(__mips__) && (_MIPS_SIM == _ABIN32)
-+typedef unsigned long long  mpir_ui;
-+typedef long long           mpir_si;
-+#else
- typedef unsigned long       mpir_ui;
- typedef long                mpir_si;
-+#endif
- #define mpz_fits_si_p       mpz_fits_slong_p
- #define mpz_fits_ui_p       mpz_fits_ulong_p
- #endif
diff --git a/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch b/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch
deleted file mode 100644
index ab4128ff55ca..000000000000
--- a/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -dupr a/test2/gmpy_test.py b/test2/gmpy_test.py
---- a/test2/gmpy_test.py	2019-11-22 09:21:42.313037873 +0100
-+++ b/test2/gmpy_test.py	2013-08-20 22:17:52.000000000 +0200
-@@ -34,11 +34,15 @@ writeln("  Caching Values: (Number)
- writeln("  Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
- 
- pf, pt = 0, 0
-+ret = 0
- for x in test_modules:
-     testit = x._test()
-     failures, tests = testit
-     if tests == 0: continue
-+    if failures > 0: ret = 1
-     writeln("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
-     pf, pt = failures, tests
- 
- doctest.master.summarize(1)
-+
-+sys.exit(ret)
-diff -dupr a/test3/gmpy_test.py b/test3/gmpy_test.py
---- a/test3/gmpy_test.py	2019-11-22 09:21:30.421908749 +0100
-+++ b/test3/gmpy_test.py	2013-08-20 22:17:52.000000000 +0200
-@@ -28,10 +28,12 @@ print("  Caching Values: (Number)      {
- print("  Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
- 
- pf, pt = 0, 0
-+ret = 0
- for x in test_modules:
-     testit = x._test()
-     failures, tests = testit
-     if tests == 0: continue
-+    if failures > 0: ret = 1
-     print("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
-     pf, pt = failures, tests
- 
-@@ -41,3 +43,5 @@ if sys.version_info < (3,1,1):
-     print("There is a known bug with Fraction == mpq for versions of Python")
-     print("less than 3.1.1. Please upgrade if you rely on comparisons between")
-     print("Python's Fraction and gmpy2's mpq.")
-+
-+sys.exit(ret)
diff --git a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
deleted file mode 100644
index dc45e33a9a13..000000000000
--- a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="mpir"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-mpir-types.patch
-	"${FILESDIR}"/gmpy-2.0.8-test-exit-status.patch
-)
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# rm non std test file
-	rm test*/gmpy_test_thr.py || die
-	# testing for contents of __dir__ is really silly, and fails
-	sed -i -e '/__dir__/,+1d' test3/*.py || die
-	# fix sphinx-1.8+ compat
-	# https://github.com/aleaxit/gmpy/commit/c35c1f3319fcf95e894a59a6d523851bad4abf66
-	sed -i -e 's:pngmath:imgmath:' docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex mpir --mpir --gmp)
-	)
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-	if python_is_python3; then
-		cd ../test3 || die
-	else
-		cd ../test2 || die
-	fi
-	"${EPYTHON}" gmpy_test.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
index fd738a835d7c..2b02c6f120d5 100644
--- a/dev-python/gmpy/metadata.xml
+++ b/dev-python/gmpy/metadata.xml
@@ -11,9 +11,6 @@
 		library, the MPFR (correctly rounded real floating-point arithmetic) and MPC
 		(correctly rounded complex floating-point arithmetic) libraries.
 	</longdescription>
-	<use>
-		<flag name="mpir">Use <pkg>sci-libs/mpir</pkg> as gmp implementation</flag>
-	</use>
 	<upstream>
 		<remote-id type="pypi">gmpy2</remote-id>
 		<remote-id type="github">aleaxit/gmpy</remote-id>