Version bump

Package-Manager: portage-2.2.10/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

5 files changed, 42 insertions, 71 deletions

diff --git a/dev-python/mpmath/ChangeLog b/dev-python/mpmath/ChangeLog
index 0ff6c45a1a32..403598670143 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.31 2014/02/02 17:14:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/ChangeLog,v 1.32 2014/06/11 07:01:40 grozin Exp $
+
+*mpmath-0.19 (11 Jun 2014)
+
+  11 Jun 2014; Andrey Grozin <grozin@gentoo.org> -mpmath-0.17-r1.ebuild,
+  +mpmath-0.19.ebuild, -files/mpmath-0.17-gmpy2.patch,
+  -files/mpmath-0.17-python-3.2.patch:
+  Version bump
 
 *mpmath-0.17-r1 (02 Feb 2014)
 
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index 2ef3c00dafeb..0d4e605eea9d 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,9 +1,29 @@
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
+DIST mpmath-all-0.19.tar.gz 2123129 SHA256 21a824db176799f42843e4510da4bc6db36ef92b5a43fff70fad7e29bffb9c86 SHA512 5a6ed0b5fad84c1e8399467ea7a1295f9b77c8e673b821c11e3298e88df6c48d9967eed84e2979bf12868e2f9b42bffba01a0c1836a6d82ac42d5f423fed6580 WHIRLPOOL 360fedc4d6942a138b33c63867f8a5e4ce4c101a8f7221c61503933e75073807676cbb240c9bddea765159cb134efd608256c9b921b7d282763b57d2897eefdb
 EBUILD mpmath-0.18.ebuild 1484 SHA256 b9f6a182b81bff9e35ec73f9e64864c3ba59f3f6601538cd2b44fcd627f9c558 SHA512 ba06bd6d3c8129880e8a982382c5bd7db6a973885a8dc846c0054cf5c98bb530efa23fb69fc7a71ebc3aab62a0e4943bfcebbf01a0dc1e0fd30e7ac57585543c WHIRLPOOL a15f79b7c36c62097806dbe844b82f9d0d1e86f5fc0254f235f1500c62865cebc50de461380bc4e8fd164aedecc3308956fa39b579935d2ea7f07be75682a453
-MISC ChangeLog 4798 SHA256 b6f485cb0c40ab7d9e85a4f56bf23a2af806d113520b682011989b10afac205e SHA512 04bd3cc729e499f0d06c4b59bb630cbfc12506c2fc799489a425092e401b16cf3ed8274ff734e9d832fc740640baebdfe81d4095c7803f0d85a3a3bceb5a553f WHIRLPOOL 693da129071ee77b89a50cea6d0058efaf89516a277ec518c804a18861d18b2dd7b7ec978f64108cf22c2d52ae2d51bffac1fd5ef1327e15cc0454d68f99e99c
+EBUILD mpmath-0.19.ebuild 1471 SHA256 b44735d40e93393663b945734bf3544b3a547b20b586e1d75394cb048c165543 SHA512 d0f069deedd9fcb76785c4d62cd4ec1cf5bf06c93ebf7de0523d76d0b1be2f9738981769d587ff9cc15021929c86a814350e0d2a5c80809f65160074a45a64ed WHIRLPOOL 17addb9232af15ecda5831d746bb1dba06ec0146d8481e47fc6a42be342d3eff27e2dc9529ec9521fe0aefa55b9194eafc63aed4dffb2bf47d60b28be0bd583d
+MISC ChangeLog 5007 SHA256 889bb173635255cc8777a6af2337ac980710da5889df0b8b4632ab3f3022267d SHA512 f28f6a287df9bbe1ef5492e4df06de2fa2aa35fb6373a2dd5dba0f0fda5375ab6e27bf3fca89b52f3fa533b21a5f073bc9db1ac6cb6e6d60d30b92e2cb6798af WHIRLPOOL 4efaf38b30c57b6fbf5c6fac6a7c79cb8d01c863ace8fa8185f171058144072af67684c0ec3d448ed27a54224be3b03b633c01c3cf20376dd6c4c52d419dd93f
 MISC metadata.xml 537 SHA256 808fec09b3892f6253e0e5110bc3083bf894ed9de4adc3e956d53495ca6f72a5 SHA512 d5be52365ca4d983f63f91e6649fed1dc8345e416310470a5ff3914d6967f502f6bc34bd5c6ba8da2a0c1d590d1615bf32e240895ba3f794de8ed124abaff69c WHIRLPOOL 72e7d8b429b1f6347de2000992b5fdeffcd1263cee88424793a6e32830f5fff05a4f6badb4a7a8c165341c80fb61b936f5a6d1ab10f913a7a20d70cdfe88e8ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJTl/0JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MpbsP/j954H8H14SOSRiZwMngkgmc
+8FHYBNgTHb9URRxxIckQ62xB5DSQEEgwowhLmyLSGhzvJc5bHcPPkOwaERdQJkRL
+9ddsKSIN1Diwb70qt8OsN0caem0+MAkw7aMTYUu27Qk8anCQeCv/YnA3NCJAUVDQ
+YgeuhzIvQvdYl84FDxIDOGVobykjVYV//3bPK6HxIsAYfRnzn26pOwH5jIKN/eeT
+0s9Xl+hxVN+aR/MriDzBwF+pMQf0Lbe9dN8zG6nRHcVBJXe8/ozmKLzNRsx85Alq
+qaWGhtnreCUtynV3rVo74TrHGUTQMh0CtstH9a2xI7/oAG04YtZHA4T9AYizsygS
+mQdBPmbFDaFQ55YajZax2wya4OUFbDmP4KDwPmwWVbZAW/+lq1AjMoFwmtlX3Xwa
+n77B0M7tFQmVFx6qy0VvcDQpeXLKv4ouiG8haprKPl7yRZI8NvcurgL4R5jisMk2
+IZa7jKMnmQ83aBxAzgTY7cW6NUlXkaBO3N09Tp1u/YzeWGfwJqTatiajkgwSKwZG
+OxETveEot1rKn46a34CZooNWPreO7V2D4k5p99pPYOsKaRdvqJR6yrg0iM9EoLX8
+uwsWaiZxP8yoDuhHFTRPCzE6nD3NfpIo+c6ZZMSFCxDeseLovsOIK7s0SwveqKbR
+DW+IbwDEj/He1CJgcyS5
+=a6U4
+-----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
deleted file mode 100644
index 7e1093d60bd3..000000000000
--- a/dev-python/mpmath/files/mpmath-0.17-gmpy2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 00c74af9c7fe..000000000000
--- a/dev-python/mpmath/files/mpmath-0.17-python-3.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.19.ebuild
index 46b770eab094..10f2a71f3bbc 100644
--- a/dev-python/mpmath/mpmath-0.17-r1.ebuild
+++ b/dev-python/mpmath/mpmath-0.19.ebuild
@@ -1,23 +1,24 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.19.ebuild,v 1.1 2014/06/11 07:01:41 grozin Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit distutils-r1 eutils # virtualx
+inherit distutils-r1 eutils
 
 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"
+HOMEPAGE="http://mpmath.org/"
+SRC_URI="http://mpmath.org/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
+
 IUSE="doc examples gmp matplotlib test"
 
 RDEPEND="
@@ -32,15 +33,13 @@ 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
+	rm ${PN}/conftest.py || die
 
 	# this test requires X
-	rm -f ${PN}/tests/test_visualization.py || die
+	rm ${PN}/tests/test_visualization.py || die
 
 	distutils-r1_python_prepare_all
 }
@@ -53,32 +52,12 @@ python_compile_all() {
 	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
+	use examples && local EXAMPLES=( demo/. )
 	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
-}