From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- dev-python/gmpy/Manifest | 8 +- .../gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch | 132 --------------------- .../gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch | 17 --- dev-python/gmpy/gmpy-2.1.0.ebuild | 38 ------ dev-python/gmpy/gmpy-2.1.0_beta5.ebuild | 45 ------- dev-python/gmpy/gmpy-2.1.1.ebuild | 4 +- 6 files changed, 3 insertions(+), 241 deletions(-) delete mode 100644 dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch delete mode 100644 dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch delete mode 100644 dev-python/gmpy/gmpy-2.1.0.ebuild delete mode 100644 dev-python/gmpy/gmpy-2.1.0_beta5.ebuild (limited to 'dev-python/gmpy') diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest index 3222afcd874d..64b455e53c16 100644 --- a/dev-python/gmpy/Manifest +++ b/dev-python/gmpy/Manifest @@ -1,12 +1,6 @@ -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.1.0.tar.gz 258571 BLAKE2B 942786c9a2e1220ecad15e97c26cbea0b93c7719e5081f6defe7b71d43be0c4ce259355eb34fa013a0b90679022535a271f26425c615e65103d3a2705b27ec8e SHA512 0d62354a1446708548b8dfdc6d7f8000151eb5901251f87f935144f615fd586726617c7a2bd05b91dc3e2a0cfc8797cd81d60afb8c705da153b537345eaddb34 -DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a DIST gmpy2-2.1.1.tar.gz 258607 BLAKE2B 3c070d101066fb0ba5da61b8c1eacf6bbd334aed987161091f31bccc1e836430cb844e0fdcb5017718341761f54c0fc3290e37ace28a5c4fc07930a194e77256 SHA512 37a08b546476f1b49cdfdb04b3a6d4da266615f789eb03896d5e2dd326c91f0fb9523504414b0de30e7265840e2ef77362a5ff011906952100c8b1da4d88d709 DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7 -EBUILD gmpy-2.1.0.ebuild 927 BLAKE2B 7d668d55e78861a97798d3a9b0e9bd6da7744e4e103ece13bc1780af70dddfbcba660baf18555a8ecac461dd8d9f62a57719c56c0e3c3052b41a847225b4e091 SHA512 fac4132e89bb5eddc058e7c3116a71b7f96b0e8b0ad524adeaca62c7a09c2e968ecbe0c4b2fb771ea27ab2c7da6f59b57ec3e9dde4dbaeac417ec14475bc1d2f -EBUILD gmpy-2.1.0_beta5.ebuild 1288 BLAKE2B b340097a38ecfdf08bd687c28087c1dc1f4673c70f2f1684c546b27cfece75b748a47496e123c3cb34ee9e358a6438f48125b1cf1c2e25912e053452033af806 SHA512 f77c84add0eedee24a6318587bb5fc78b4fe67765dac5cd51827807c1292267fca48abeb7189643698eee7b88342776567a941a965009f8ea82086d4b85f8e30 -EBUILD gmpy-2.1.1.ebuild 927 BLAKE2B 7d668d55e78861a97798d3a9b0e9bd6da7744e4e103ece13bc1780af70dddfbcba660baf18555a8ecac461dd8d9f62a57719c56c0e3c3052b41a847225b4e091 SHA512 fac4132e89bb5eddc058e7c3116a71b7f96b0e8b0ad524adeaca62c7a09c2e968ecbe0c4b2fb771ea27ab2c7da6f59b57ec3e9dde4dbaeac417ec14475bc1d2f +EBUILD gmpy-2.1.1.ebuild 919 BLAKE2B 33220f0459520d2e9baafbd8870cbdbaac5fc83f7d4f338db115fcc2c095b3e01bb51fb801ca64d83c73fe84f3b574a330d68f64d3f6e97e00a9f3d0ba1f1f35 SHA512 cfa2102fe119a528b8f5f8f8aecb5900ee41b6ba9d1c6e8fbf5aebfc56d7e893298946d07ce0b99956ee1bf8b7f6938125afa6cb4eb799c908d884a1b5a003e8 EBUILD gmpy-2.1.2.ebuild 927 BLAKE2B 2fb9638e1fd8141e095508bbad8399bf0d13f8e38280df0c7fe252efe4f9a064cf2fbcf3c98b0add631e45eedc52d6a8441c92a2016a6a50f7a18d914832267f SHA512 c139a66f332f18aa0a6cc54e5adf2955f2b7354b64202ed80fa3dd8c77210896d9d473ee371fb5aad30e67b2cd947cf175c6a688e59389bc07d577c2017da514 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79 diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch deleted file mode 100644 index 38a98579409a..000000000000 --- a/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/src/gmpy2_mpz.c b/src/gmpy2_mpz.c -index e5087fa..66a297a 100644 ---- a/src/gmpy2_mpz.c -+++ b/src/gmpy2_mpz.c -@@ -69,7 +69,7 @@ static PyNumberMethods GMPy_MPZ_number_methods = - (binaryfunc) GMPy_MPZ_ISub_Slot, /* nb_inplace_subtract */ - (binaryfunc) GMPy_MPZ_IMul_Slot, /* nb_inplace_multiply */ - (binaryfunc) GMPy_MPZ_IRem_Slot, /* nb_inplace_remainder */ -- (ternaryfunc) GMPy_MPZ_IPow_Slot, /* nb_inplace_power */ -+ 0, /* nb_inplace_power */ - (binaryfunc) GMPy_MPZ_ILshift_Slot, /* nb_inplace_lshift */ - (binaryfunc) GMPy_MPZ_IRshift_Slot, /* nb_inplace_rshift */ - 0, /* nb_inplace_and */ -@@ -113,7 +113,7 @@ static PyNumberMethods GMPy_MPZ_number_methods = - (binaryfunc) GMPy_MPZ_IMul_Slot, /* nb_inplace_multiply */ - 0, /* nb_inplace_divide */ - (binaryfunc) GMPy_MPZ_IRem_Slot, /* nb_inplace_remainder */ -- (ternaryfunc) GMPy_MPZ_IPow_Slot, /* nb_inplace_power */ -+ 0, /* nb_inplace_power */ - (binaryfunc) GMPy_MPZ_ILshift_Slot, /* nb_inplace_lshift */ - (binaryfunc) GMPy_MPZ_IRshift_Slot, /* nb_inplace_rshift */ - 0, /* nb_inplace_and */ -@@ -229,4 +229,3 @@ static PyTypeObject MPZ_Type = - GMPy_MPZ_NewInit, /* tp_new */ - 0, /* tp_free */ - }; -- -diff --git a/src/gmpy2_pow.c b/src/gmpy2_pow.c -index ddcb43a..cf96470 100644 ---- a/src/gmpy2_pow.c -+++ b/src/gmpy2_pow.c -@@ -98,8 +98,11 @@ GMPy_Integer_Pow(PyObject *b, PyObject *e, PyObject *m, CTXT_Object *context) - unsigned long el; - - if (mpz_sgn(tempe->z) < 0) { -- VALUE_ERROR("pow() exponent cannot be negative"); -- goto err; -+ Py_DECREF((PyObject*)result); -+ Py_DECREF((PyObject*)tempb); -+ Py_DECREF((PyObject*)tempe); -+ -+ return GMPy_Real_Pow(b, e, m, context); - } - - /* Catch -1, 0, 1 getting raised to large exponents. */ -diff --git a/src/gmpy2_xmpz_inplace.c b/src/gmpy2_xmpz_inplace.c -index bbcd977..e5bbf09 100644 ---- a/src/gmpy2_xmpz_inplace.c -+++ b/src/gmpy2_xmpz_inplace.c -@@ -271,14 +271,14 @@ GMPy_XMPZ_IPow_Slot(PyObject *self, PyObject *other, PyObject *mod) - mp_bitcnt_t exp; - - exp = mp_bitcnt_t_From_Integer(other); -- if (exp == (mp_bitcnt_t)(-1) && PyErr_Occurred()) { -- PyErr_Clear(); -- Py_RETURN_NOTIMPLEMENTED; -- } -+ if (exp == (mp_bitcnt_t)(-1) && PyErr_Occurred()) -+ return NULL; - - mpz_pow_ui(MPZ(self), MPZ(self), exp); - Py_INCREF((PyObject*)self); - return (PyObject*)self; -+ -+ Py_RETURN_NOTIMPLEMENTED; - } - - /* Inplace xmpz and. -@@ -346,4 +346,3 @@ GMPy_XMPZ_IIor_Slot(PyObject *self, PyObject *other) - - Py_RETURN_NOTIMPLEMENTED; - } -- -diff --git a/test/test_gmpy2_mpz_inplace.txt b/test/test_gmpy2_mpz_inplace.txt -index e7a8b96..147118c 100644 ---- a/test/test_gmpy2_mpz_inplace.txt -+++ b/test/test_gmpy2_mpz_inplace.txt -@@ -147,18 +147,16 @@ Test ipow operator - mpz(25) - >>> x **= xmpz(2); x - mpz(625) -->>> x **= -2 --Traceback (most recent call last): -- File "", line 1, in --TypeError: unsupported operand type(s) for ** or pow(): 'mpz' and 'int' -+>>> x **= -2; x -+mpfr('2.5600000000000001e-06') -+>>> x = mpz(625) - >>> x **= 2; x - mpz(390625) -->>> x **= mpfr(2) --Traceback (most recent call last): -- File "", line 1, in --TypeError: unsupported operand type(s) for ** or pow(): 'mpz' and 'mpfr' -->>> 1 --1 -+>>> x **= mpfr(2); x -+mpfr('152587890625.0') -+>>> x = mpz(390625) -+>>> x **= mpfr(-2); x -+mpfr('6.5535999999999999e-12') - - Test iand operator - ------------------ -diff --git a/test/test_gmpy2_pow.txt b/test/test_gmpy2_pow.txt -index 89bd876..d5b1f45 100644 ---- a/test/test_gmpy2_pow.txt -+++ b/test/test_gmpy2_pow.txt -@@ -15,9 +15,7 @@ mpz(25) - >>> ctx.pow(z1, z2) - mpz(25) - >>> z1 ** -z2 --Traceback (most recent call last): -- File "", line 1, in --ValueError: pow() exponent cannot be negative -+mpfr('0.040000000000000001') - >>> z1 ** 0 - mpz(1) - >>> mpz(0) ** 32 -diff --git a/test/test_gmpy2_xmpz_inplace.txt b/test/test_gmpy2_xmpz_inplace.txt -index 94f86b7..c02f966 100644 ---- a/test/test_gmpy2_xmpz_inplace.txt -+++ b/test/test_gmpy2_xmpz_inplace.txt -@@ -135,7 +135,7 @@ xmpz(625) - >>> x **= -2 - Traceback (most recent call last): - File "", line 1, in --TypeError: unsupported operand type(s) for ** or pow(): 'xmpz' and 'int' -+ValueError: a non-negative value is required - >>> x **= 2; x - xmpz(390625) - >>> x **= mpfr(2) diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch deleted file mode 100644 index 9f59a6096fcd..000000000000 --- a/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/gmpy2_hash.c b/src/gmpy2_hash.c -index f276a42..1d2bfd1 100644 ---- a/src/gmpy2_hash.c -+++ b/src/gmpy2_hash.c -@@ -147,7 +147,12 @@ _mpfr_hash(mpfr_t f) - } - } - else { -+#if PY_VERSION_HEX >= 0x030A00A0 -+ // Python 3.10 -+ return _Py_HashPointer(f); -+#else - return _PyHASH_NAN; -+#endif - } - } - diff --git a/dev-python/gmpy/gmpy-2.1.0.ebuild b/dev-python/gmpy/gmpy-2.1.0.ebuild deleted file mode 100644 index ff00de624895..000000000000 --- a/dev-python/gmpy/gmpy-2.1.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PN="${PN}2" -MY_P="${MY_PN}-${PV/_beta/b}" - -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}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -RDEPEND=" - >=dev-libs/mpc-1.0.2:= - >=dev-libs/mpfr-3.1.2:= - dev-libs/gmp:0= -" -DEPEND="${RDEPEND}" - -PATCHES=( - # The tests program asks for input when running, disable that - "${FILESDIR}"/gmpy-2.1.0_beta5-test-input.patch -) - -distutils_enable_sphinx docs - -python_test() { - cd test || die - "${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}" -} diff --git a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild deleted file mode 100644 index 4768bf50c719..000000000000 --- a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PN="${PN}2" -MY_P="${MY_PN}-${PV/_beta/b}" - -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}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -RDEPEND=" - >=dev-libs/mpc-1.0.2:= - >=dev-libs/mpfr-3.1.2:= - dev-libs/gmp:0= -" -DEPEND="${RDEPEND}" - -PATCHES=( - # In python 3.10 _PyHASH_NAN was removed and its usage replaced with _Py_HashPointer - # see https://github.com/python/cpython/blob/3.10/Python/pyhash.c - # https://github.com/aleaxit/gmpy/pull/297 - "${FILESDIR}"/${P}-pyhash-nan.patch - # The tests program asks for input when running, disable that - "${FILESDIR}"/${P}-test-input.patch - # Based on this commit: - # https://github.com/aleaxit/gmpy/commit/db7ce2ef46fab84e7b9c32b05725e9b02e8cf206 - "${FILESDIR}"/${P}-failed-tests.patch -) - -distutils_enable_sphinx docs - -python_test() { - cd test || die - "${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}" -} diff --git a/dev-python/gmpy/gmpy-2.1.1.ebuild b/dev-python/gmpy/gmpy-2.1.1.ebuild index ff00de624895..0e73fa850314 100644 --- a/dev-python/gmpy/gmpy-2.1.1.ebuild +++ b/dev-python/gmpy/gmpy-2.1.1.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 @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="LGPL-3+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" RDEPEND=" >=dev-libs/mpc-1.0.2:= -- cgit v1.2.3