re-add older versions

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 132 insertions, 12 deletions

diff --git a/dev-python/mpmath/ChangeLog b/dev-python/mpmath/ChangeLog
index 8e8b89e55ab8..0ff6c45a1a32 100644
--- a/dev-python/mpmath/ChangeLog
+++ b/dev-python/mpmath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/mpmath
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/ChangeLog,v 1.30 2014/02/02 02:28:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/ChangeLog,v 1.31 2014/02/02 17:14:59 bicatali Exp $
+
+*mpmath-0.17-r1 (02 Feb 2014)
+
+  02 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/mpmath-0.17-gmpy2.patch, +files/mpmath-0.17-python-3.2.patch,
+  +mpmath-0.17-r1.ebuild:
+  re-add older versions
 
   02 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org>
   -files/mpmath-0.17-gmpy2.patch, -files/mpmath-0.17-python-3.2.patch,
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index 8f896fb05a74..2ef3c00dafeb 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,15 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX mpmath-0.17-gmpy2.patch 694 SHA256 af5a49cd92ff7b8216d581e1d879f579f2aa58cf25bf305bf4153ae67356df0f SHA512 46e8adc75d8351a362ad2a23e5cf9867f8aac64a352793f33ad8f88fcde1c49c4106f75a4d180257bec45fd895d2265e64b202c6e266dc38d3840314a9055f34 WHIRLPOOL 79124ce27ed19e473303d910fa20d19419fc59be48ce3404f9fdcff50dff08bfe5f1ecb40cdf2d756bad47f92a8d433bba812ed09841aa0836996ca1593d143b
+AUX mpmath-0.17-python-3.2.patch 595 SHA256 d22d12808bd8a80be948aef941047b8fbe9e0f648b707a377df6d5ed04974f89 SHA512 c638b79db09fe337f86bd9293fea27aec80c0ee08979e0e68602b08b6c23f3d729d4a0585a77d93d28e2232433909139720ba039e9bf22eab9fde3f653519f9f WHIRLPOOL 1a9074dbea2673f46b3862e76958e6e7d24e18e64c1f334c3ea8fd75f49ff69439785611d2ab3201786954cb63906d846db2350c46cff6460ad74c19bf3d36f2
 AUX mpmath.patch 434 SHA256 e15c6536596321479b5378d5919c9a310d1037c13de8c13c8f0421f95319dd19 SHA512 2ffc7ffa375f5c25d044974a8b1fac145a00d9b1f190d12e1ade6cadad44dae11098617de5ee0a523931f046b4cd0e785552a3de6f66f438052955b6987bda39 WHIRLPOOL ff01b799d5e7862dce8cdfa2536f56e9b683b877fc94f154df7e9f4045d53c7d6be4376502fcd18fb0a6da29136b74b8c89f28ff0515377ae7ef78fbe92c531c
+DIST mpmath-all-0.17.tar.gz 2085528 SHA256 cc33bcfe579139b0c07f3eb3841f1409f36896fe64e9f932f5f9e4915fdeeb88 SHA512 ece00ee36302d8aed5f82d0ec93088b8869f4e3f4ec649d5a4ce34fd9ec8b36611677565243de8af025d176c8bc3079fb46b80514f4d2d5e538931d103993390 WHIRLPOOL d90e6174390650b6f67d68cdfd7c7bb4774102bb3a2404037f1b2f648e9fa6952ab762ed8f97b62373852d1323c56cdb2ebf1d755750e8cf4f85e71165512ab5
 DIST mpmath-all-0.18.tar.gz 2122954 SHA256 47cc9587ea10202cdfb1afce4fb7410821e91ae6ecb1b54d62be1adfce80ee40 SHA512 a22e1c82f33a30584c975d196601e7bddaf33d4a41b1f288216a9df038ba5a45fd1002c5aa5f15084d05bee3abad944168ad131ac7e4feb218aac22789d8a63f WHIRLPOOL 7544b09310fbb262f2a4f487fa29af429196142e3fcab5822c1383420c7d8948a70b0f505adc0ce4fd7c0e6b6936b8dc6832a5e3d92e7c7cb71d05f6343dd79a
+EBUILD mpmath-0.17-r1.ebuild 2009 SHA256 5e7209d2a483dc239baef4e8fc31371ec590ec9865f4df27c222ac21018fb19e SHA512 f783bc370b8fb43246be727597787f0384d10d022f754b912b54154fc9f7a366c13258b0c12b30757bac9f5629595d301299599c51c14fa4ead64eca45e9eb15 WHIRLPOOL 51f78f469bf0a1fcdcd6bbaac8e65d634fcb562e7c244fe29f48839e31489f4599a8042010832aa934e44418c3eb60f63f8f13d40796598f11912c37978a0c39
 EBUILD mpmath-0.18.ebuild 1484 SHA256 b9f6a182b81bff9e35ec73f9e64864c3ba59f3f6601538cd2b44fcd627f9c558 SHA512 ba06bd6d3c8129880e8a982382c5bd7db6a973885a8dc846c0054cf5c98bb530efa23fb69fc7a71ebc3aab62a0e4943bfcebbf01a0dc1e0fd30e7ac57585543c WHIRLPOOL a15f79b7c36c62097806dbe844b82f9d0d1e86f5fc0254f235f1500c62865cebc50de461380bc4e8fd164aedecc3308956fa39b579935d2ea7f07be75682a453
-MISC ChangeLog 4590 SHA256 3405692dac9bb3bd76ac564da7f47cb88cf0c34167c6ad82cf5098929645cc80 SHA512 5de874691926b0eaf37811fd476f50c48a02b5d1b86a36fd654c1eb920b4a19eac42655ddccabd709d8d45c1318de127ac09f89c5c282dd82c2224ece5429caf WHIRLPOOL 42f0770444a4deb41756cbb3a744a659e2a90395d30042ce727090220e9d4603c872f9d20ba70af4677375b04faa79d4aa7b5958b68f78e8fa56e42003962f0f
+MISC ChangeLog 4798 SHA256 b6f485cb0c40ab7d9e85a4f56bf23a2af806d113520b682011989b10afac205e SHA512 04bd3cc729e499f0d06c4b59bb630cbfc12506c2fc799489a425092e401b16cf3ed8274ff734e9d832fc740640baebdfe81d4095c7803f0d85a3a3bceb5a553f WHIRLPOOL 693da129071ee77b89a50cea6d0058efaf89516a277ec518c804a18861d18b2dd7b7ec978f64108cf22c2d52ae2d51bffac1fd5ef1327e15cc0454d68f99e99c
 MISC metadata.xml 537 SHA256 808fec09b3892f6253e0e5110bc3083bf894ed9de4adc3e956d53495ca6f72a5 SHA512 d5be52365ca4d983f63f91e6649fed1dc8345e416310470a5ff3914d6967f502f6bc34bd5c6ba8da2a0c1d590d1615bf32e240895ba3f794de8ed124abaff69c WHIRLPOOL 72e7d8b429b1f6347de2000992b5fdeffcd1263cee88424793a6e32830f5fff05a4f6badb4a7a8c165341c80fb61b936f5a6d1ab10f913a7a20d70cdfe88e8ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLtrUkACgkQ1ycZbhPLE2C15wCeOCA2Q+foeGL2Df8BH3DTH2dE
-4esAnAuOLvgOTZb/RBxsW9L7UuOt7D0k
-=qz8y
------END PGP SIGNATURE-----
diff --git a/dev-python/mpmath/files/mpmath-0.17-gmpy2.patch b/dev-python/mpmath/files/mpmath-0.17-gmpy2.patch
new file mode 100644
index 000000000000..7e1093d60bd3
--- /dev/null
+++ b/dev-python/mpmath/files/mpmath-0.17-gmpy2.patch
@@ -0,0 +1,19 @@
+Index: mpmath/libmp/libintmath.py
+===================================================================
+--- mpmath/libmp/libintmath.py	(revision 1234)
++++ mpmath/libmp/libintmath.py	(revision 1235)
+@@ -298,8 +298,12 @@
+ sqrt_fixed2 = sqrt_fixed
+ 
+ if BACKEND == 'gmpy':
+-    isqrt_small = isqrt_fast = isqrt = gmpy.sqrt
+-    sqrtrem = gmpy.sqrtrem
++    if gmpy.version() >= '2':
++        isqrt_small = isqrt_fast = isqrt = gmpy.isqrt
++        sqrtrem = gmpy.isqrt_rem
++    else:
++        isqrt_small = isqrt_fast = isqrt = gmpy.sqrt
++        sqrtrem = gmpy.sqrtrem
+ elif BACKEND == 'sage':
+     isqrt_small = isqrt_fast = isqrt = \
+         getattr(sage_utils, "isqrt", lambda n: MPZ(n).isqrt())
diff --git a/dev-python/mpmath/files/mpmath-0.17-python-3.2.patch b/dev-python/mpmath/files/mpmath-0.17-python-3.2.patch
new file mode 100644
index 000000000000..00c74af9c7fe
--- /dev/null
+++ b/dev-python/mpmath/files/mpmath-0.17-python-3.2.patch
@@ -0,0 +1,16 @@
+http://code.google.com/p/mpmath/issues/detail?id=203
+http://code.google.com/p/mpmath/source/detail?r=1238
+
+--- mpmath/tests/test_basic_ops.py
++++ mpmath/tests/test_basic_ops.py
+@@ -148,8 +148,8 @@
+     assert hash(mp.mpq(5,1)) == hash(5)
+     assert hash(mp.mpq(1,2)) == hash(0.5)
+     if sys.version >= "3.2":
+-        assert hash(mpf(1))*2**2000 == hash(2**2000)
+-        assert hash(mpf(1))/2**2000 == hash(mpq(1,2**2000))
++        assert hash(mpf(1)*2**2000) == hash(2**2000)
++        assert hash(mpf(1)/2**2000) == hash(mpq(1,2**2000))
+ 
+ # Advanced rounding test
+ def test_add_rounding():
diff --git a/dev-python/mpmath/mpmath-0.17-r1.ebuild b/dev-python/mpmath/mpmath-0.17-r1.ebuild
new file mode 100644
index 000000000000..46b770eab094
--- /dev/null
+++ b/dev-python/mpmath/mpmath-0.17-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.17-r1.ebuild,v 1.5 2014/02/02 17:14:58 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1 eutils # virtualx
+
+MY_PN=${PN}-all
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
+HOMEPAGE="http://code.google.com/p/mpmath/ http://pypi.python.org/pypi/mpmath/"
+SRC_URI="http://mpmath.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
+IUSE="doc examples gmp matplotlib test"
+
+RDEPEND="
+	gmp? ( dev-python/gmpy )
+	matplotlib? ( dev-python/matplotlib )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}.patch"
+		"${FILESDIR}/${P}-python-3.2.patch"
+		"${FILESDIR}/${P}-gmpy2.patch"
+		)
+
+	# this fails with the current version of dev-python/py
+	rm -f ${PN}/conftest.py || die
+
+	# this test requires X
+	rm -f ${PN}/tests/test_visualization.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		cd doc || die
+		"${PYTHON}" build.py || die "Generation of documentation failed"
+	fi
+}
+
+#src_test() {
+#	local DISTUTILS_NO_PARALLEL_BUILD=true
+#	VIRTUALX_COMMAND="distutils-r1_src_test"
+#	virtualmake
+#}
+
+python_test() {
+	py.test -v || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/. )
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demo/*
+	fi
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	local path="${ED}$(python_get_sitedir)/${PN}/libmp/"
+	if [[ "${EPYTHON}" != python2* ]]; then
+		rm -f "${path}exec_py2.py" || ide
+	elif [[ "${EPYTHON}" != python3 ]]; then
+		rm -f "${path}exec_py3.py" || die
+	fi
+}