Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/gmpy/files/, dev-python/gmpy/
Date: Mon, 12 Jul 2021 09:11:59
Message-Id: 1626081100.02549ea26529d3ab3cf1d2722d2408d638b59ea9.mgorny@gentoo
1 commit: 02549ea26529d3ab3cf1d2722d2408d638b59ea9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 12 06:45:03 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 12 09:11:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02549ea2
7
8 dev-python/gmpy: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/gmpy/Manifest | 1 -
13 .../gmpy/files/gmpy-2.0.8-fix-mpir-types.patch | 17 -----
14 .../gmpy/files/gmpy-2.0.8-test-exit-status.patch | 41 ------------
15 dev-python/gmpy/gmpy-2.0.8-r2.ebuild | 72 ----------------------
16 dev-python/gmpy/metadata.xml | 3 -
17 5 files changed, 134 deletions(-)
18
19 diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
20 index 9c471701495..45c5011b8ff 100644
21 --- a/dev-python/gmpy/Manifest
22 +++ b/dev-python/gmpy/Manifest
23 @@ -1,2 +1 @@
24 -DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
25 DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
26
27 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
28 deleted file mode 100644
29 index d21e5a55510..00000000000
30 --- a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
31 +++ /dev/null
32 @@ -1,17 +0,0 @@
33 -diff -ur gmpy2-2.0.8.orig/src/gmpy.h gmpy2-2.0.8/src/gmpy.h
34 ---- gmpy2-2.0.8.orig/src/gmpy.h 2018-04-03 22:44:35.494621951 -0700
35 -+++ gmpy2-2.0.8/src/gmpy.h 2018-04-03 22:45:33.580835296 -0700
36 -@@ -129,8 +129,13 @@
37 - #ifndef BITS_PER_UI
38 - /* Assume we are NOT using MPIR > 2.5. */
39 - #define BITS_PER_UI BITS_PER_ULONG
40 -+#if defined(__mips__) && (_MIPS_SIM == _ABIN32)
41 -+typedef unsigned long long mpir_ui;
42 -+typedef long long mpir_si;
43 -+#else
44 - typedef unsigned long mpir_ui;
45 - typedef long mpir_si;
46 -+#endif
47 - #define mpz_fits_si_p mpz_fits_slong_p
48 - #define mpz_fits_ui_p mpz_fits_ulong_p
49 - #endif
50
51 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
52 deleted file mode 100644
53 index ab4128ff55c..00000000000
54 --- a/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch
55 +++ /dev/null
56 @@ -1,41 +0,0 @@
57 -diff -dupr a/test2/gmpy_test.py b/test2/gmpy_test.py
58 ---- a/test2/gmpy_test.py 2019-11-22 09:21:42.313037873 +0100
59 -+++ b/test2/gmpy_test.py 2013-08-20 22:17:52.000000000 +0200
60 -@@ -34,11 +34,15 @@ writeln(" Caching Values: (Number)
61 - writeln(" Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
62 -
63 - pf, pt = 0, 0
64 -+ret = 0
65 - for x in test_modules:
66 - testit = x._test()
67 - failures, tests = testit
68 - if tests == 0: continue
69 -+ if failures > 0: ret = 1
70 - writeln("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
71 - pf, pt = failures, tests
72 -
73 - doctest.master.summarize(1)
74 -+
75 -+sys.exit(ret)
76 -diff -dupr a/test3/gmpy_test.py b/test3/gmpy_test.py
77 ---- a/test3/gmpy_test.py 2019-11-22 09:21:30.421908749 +0100
78 -+++ b/test3/gmpy_test.py 2013-08-20 22:17:52.000000000 +0200
79 -@@ -28,10 +28,12 @@ print(" Caching Values: (Number) {
80 - print(" Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
81 -
82 - pf, pt = 0, 0
83 -+ret = 0
84 - for x in test_modules:
85 - testit = x._test()
86 - failures, tests = testit
87 - if tests == 0: continue
88 -+ if failures > 0: ret = 1
89 - print("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
90 - pf, pt = failures, tests
91 -
92 -@@ -41,3 +43,5 @@ if sys.version_info < (3,1,1):
93 - print("There is a known bug with Fraction == mpq for versions of Python")
94 - print("less than 3.1.1. Please upgrade if you rely on comparisons between")
95 - print("Python's Fraction and gmpy2's mpq.")
96 -+
97 -+sys.exit(ret)
98
99 diff --git a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
100 deleted file mode 100644
101 index dc45e33a9a1..00000000000
102 --- a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
103 +++ /dev/null
104 @@ -1,72 +0,0 @@
105 -# Copyright 1999-2021 Gentoo Authors
106 -# Distributed under the terms of the GNU General Public License v2
107 -
108 -EAPI=7
109 -
110 -DISTUTILS_USE_SETUPTOOLS=no
111 -PYTHON_COMPAT=( python3_{7,8,9} )
112 -
113 -inherit distutils-r1
114 -
115 -MY_PN="${PN}2"
116 -MY_P="${MY_PN}-${PV}"
117 -
118 -DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
119 -HOMEPAGE="https://github.com/aleaxit/gmpy"
120 -SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
121 -S="${WORKDIR}"/${MY_P}
122 -
123 -LICENSE="LGPL-3+"
124 -SLOT="2"
125 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
126 -IUSE="mpir"
127 -
128 -RDEPEND="
129 - >=dev-libs/mpc-1.0.2:=
130 - >=dev-libs/mpfr-3.1.2:=
131 - !mpir? ( dev-libs/gmp:0= )
132 - mpir? ( sci-libs/mpir:= )"
133 -DEPEND="${RDEPEND}"
134 -BDEPEND="
135 - app-arch/unzip"
136 -
137 -PATCHES=(
138 - "${FILESDIR}"/${P}-fix-mpir-types.patch
139 - "${FILESDIR}"/gmpy-2.0.8-test-exit-status.patch
140 -)
141 -
142 -distutils_enable_sphinx docs
143 -
144 -python_prepare_all() {
145 - # rm non std test file
146 - rm test*/gmpy_test_thr.py || die
147 - # testing for contents of __dir__ is really silly, and fails
148 - sed -i -e '/__dir__/,+1d' test3/*.py || die
149 - # fix sphinx-1.8+ compat
150 - # https://github.com/aleaxit/gmpy/commit/c35c1f3319fcf95e894a59a6d523851bad4abf66
151 - sed -i -e 's:pngmath:imgmath:' docs/conf.py || die
152 -
153 - distutils-r1_python_prepare_all
154 -}
155 -
156 -python_configure_all() {
157 - mydistutilsargs=(
158 - $(usex mpir --mpir --gmp)
159 - )
160 -}
161 -
162 -python_compile() {
163 - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
164 - distutils-r1_python_compile
165 -}
166 -
167 -python_test() {
168 - cd test || die
169 - "${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
170 - if python_is_python3; then
171 - cd ../test3 || die
172 - else
173 - cd ../test2 || die
174 - fi
175 - "${EPYTHON}" gmpy_test.py || die "tests failed under ${EPYTHON}"
176 -}
177
178 diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
179 index fd738a835d7..2b02c6f120d 100644
180 --- a/dev-python/gmpy/metadata.xml
181 +++ b/dev-python/gmpy/metadata.xml
182 @@ -11,9 +11,6 @@
183 library, the MPFR (correctly rounded real floating-point arithmetic) and MPC
184 (correctly rounded complex floating-point arithmetic) libraries.
185 </longdescription>
186 - <use>
187 - <flag name="mpir">Use <pkg>sci-libs/mpir</pkg> as gmp implementation</flag>
188 - </use>
189 <upstream>
190 <remote-id type="pypi">gmpy2</remote-id>
191 <remote-id type="github">aleaxit/gmpy</remote-id>