Backport fix for cython-0.22, #542448

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index d0638dfd118f777532fc5042d20e55386108fd5b..dd588705f702f31bee5784263fae10e7058c643c 100644 (file)
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.122 2015/03/03 15:18:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.123 2015/03/07 16:15:36 jlec Exp $
+
+  07 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/scipy-0.14.0-cython-0.22-backport.patch, scipy-0.14.0-r1.ebuild:
+  Backport fix for cython-0.22, #542448
 
 *scipy-0.15.1 (03 Mar 2015)
 

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 93741db22c0d2baf310576645efc26a2f69f7603..5519065c604fdfbbe80de4d0e1904b84b925cdcc 100644 (file)
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -5,6 +5,7 @@ AUX scipy-0.12.0-blitz.patch 731 SHA256 4f487a746aa62a39cdab9381dd4191cef0ccb912
 AUX scipy-0.12.0-cephes-missing-include.patch 394 SHA256 0263ba4e9f13c7be0e7160ae73ce98ea37f698ea7e06c3fc090bc4ff7732bc66 SHA512 a4f9adf9b29743b6ca7f42de0695af23ddf7791330a4a58a2f47cd5599af1361aee3b141a016ea1a81a3bc5b8bfcaa3f0478370a09acd37bcd8e519765701510 WHIRLPOOL 59651015bf540ad2218dd65764d68fb5f2b907116245e3e83d14084579314af6c58c34be3f74300166c2450e00833fa4ae6d6de057392d3e947a979555add1bc
 AUX scipy-0.12.0-gerqf.patch 731 SHA256 1f3c2723f1094cb6834349f26d40d060ed4e09c722eea876e160fc9ce2b3ced2 SHA512 007bf3d85364c824c03532a07c2678e48c90858d82fa7248cb5139a6f74b853bc4a27e6932638a14bb61e72abbbfd95265e10502c4fd2eb363758f3132722a10 WHIRLPOOL c2d7de949048dcc76e1bf72f2165226b7a741212ef0c6cfc3709ddd91f11fd274ecfcdf62dd47fb11d824d73b41c57d468414b3ef9e8169f7841688f67bcf6af
 AUX scipy-0.12.0-restore-sys-argv.patch 483 SHA256 c00daf7d49c042972d2c59bf645c21f3bc437459a745da758e2548a973000170 SHA512 7c439aa7e1e0ccc7444c2c091ef03d3d39f2999a33ef487224c78e74cd3a1b84bd18a9e92d84ab2cd3fc7578644beb3b667fdaacb20a239600cb9b1765eeb7fc WHIRLPOOL f0d4a84e40ee26399b121f0d9159914d480789c83f749cf060bc65f63df315f27718359df7c13c64ae7a04eea00470ea109b110310abeba79944a90b97ebb102
+AUX scipy-0.14.0-cython-0.22-backport.patch 1272 SHA256 4a09eb0743d95e0215baacb95b18e0a1038bed16eb33a5240181eba35f1b7c73 SHA512 49b3c79a4487a7a3f4cac0a9c50078150bc78e1e4a7656d627e6ed1fdec6c7815b16b193a86cde9d95e9c41e46cb226d678aa47d69bc8656ea7d8f1460ebc3b0 WHIRLPOOL a7c66395e0ba5519eb5457249db514036b213c9fface6377ce7838fb8cf046db95a4367976e4bc2588bd7881b7a74f543c5450c76d2d9541b287af1ee0e64aaf
 AUX scipy-0.14.0-lsqr-backport.patch 3764 SHA256 e5db9922b84a51452afebd22d6783eef982f3c7160dcf543388daef4bacfa7e2 SHA512 7fbf7c257c6f68045b14dd1dfc3518c47aaeff9c027441acec9399b3c02bd0c473512cbd9f5c1eed2ac54ed8c53d4416759ebd946516fa776324e5fa88d182cf WHIRLPOOL f2e57e4743ac3d0623057aed4ab225988613d95d09cf38a0db26ecc6e1cb3e7769006a45539d5e8fb1728b910766c0620b09973b609aef5967bf66bd9cff8d95
 DIST scipy-0.13.0-html.zip 18283054 SHA256 3010783ebdc18988440cd0047f061bbfcac98677782cd10e8b4f09e20bbbc23d SHA512 082cb1e0915f6095f80522a76fed4e106ed82889df613c1bcada9a4faded8917fd7e686448f585a5bee5478280ae21f6adf9bd4add125b9082f93eb93e61feef WHIRLPOOL 48b5e2ee9274f324969c413986110a87422b5f3667b617884dd01c660cdabeb05c5e17ca33e861b2fa2cc5caf89e1233aba9f2855386fe211255c5ceee437ac7
 DIST scipy-0.13.0-ref.pdf 14748179 SHA256 52caa5fd7e74f2e5a78f26296d2150808eee9e153ca3cee62d05892bbd1bac8c SHA512 9e2d40b154c73e9ad3405038e2c71e01650b9a05781355d499b09d647ae6a73d65d542c36b60a87ac530f9b7509bf1c023624952c2f4f2b2f9fb56394456ec91 WHIRLPOOL 5071c593b999db1a57057731e995153fead4155f04b69b770fd1b2203cc5eb13f6f9395a179c4a06e1d8fc5dfa559f51c494f52a27d524b2794d9683e487e273
@@ -15,27 +16,27 @@ DIST scipy-0.15.0.tar.gz 11398495 SHA256 0c74e31e08acc8bf9b6ceb9bced73df2ae0cc76
 DIST scipy-0.15.1-html.zip 24956050 SHA256 c27d3656ffed1b988890cf192c692f646b00d02a0716122dcf447eff5f186cf2 SHA512 ec8c25d1a8da23a6794315a97177bf3bc1fbac331d562eb2ae6300575eafe040f3ff8d5a884dfe79d7e623313b7b474c095ddb090ce07007cba8fe9bf0fbab27 WHIRLPOOL f4a0a55c209ab3806cf97af74d2948c3f4461d3bdccb36ab1a219a1bcba11c95e1c90f216b36680d161ad24966cbda22356340195f0c13ce23bcafc60a72a279
 DIST scipy-0.15.1-ref.pdf 18313446 SHA256 d96046ddbc91383fb37e3ae2bbdc6945e0c2fc70fa230e0bcda0789e6025ca7e SHA512 9ca6a656e454058273f5153d84acbca42f4ea9b99d0dbfde4a019cbb3ef7e87c4068660bc787506ca749024d45efaea7254614486d56b114c762fc8a69c3b496 WHIRLPOOL b907a6011671b0e0919d48b3e4587fd09cad3f2b463a302e1c9be22facec5f2d599b1eb9497a0cf1e3a0125b3beda0b1e00e7ca2cd40453c49a2df368b9c794e
 DIST scipy-0.15.1.tar.gz 11401878 SHA256 a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a SHA512 fff4412d850c431a1b4e6ee3b17958ee5ab3beb81e6cb8a8e7d56d368751eaa8781d7c3e69d932dc002d718fddc66a72098acfe74cfe29ec80b24e6736317275 WHIRLPOOL 31f2f6ca33be1945bedf41f84cf62831c9b22f4d7079d2b0b7b21706b17eb4ab5f3a948be645bcb86a35f3a714e4f277bd66261d02d20d8aeb5077b2095c952f
-EBUILD scipy-0.14.0-r1.ebuild 3975 SHA256 6ca3a4e3dcb128b3d89825e0614916b1b63b406facafbeeac1b89e17288137a8 SHA512 8a10bfda4cd44a9b992aeb9d5f910e4141125b9d5496ee54a00a3f204f48e23cd79526d375db3ddbbb6849ddd95b1c61e5f65432252ad6bb0ad240067f41dba2 WHIRLPOOL ae94eac8ec5de0e248378a0cf9ab3fa7d82652083c88fb1e09f6f4f4a3f391789522a60619e673bb38de70a0437baf6584ab9f75563e5927d72615240c376ead
+EBUILD scipy-0.14.0-r1.ebuild 4022 SHA256 efbcec005a45145976bc58939a07e33a3ca7553d6f3cc35043b041a44c2f7b32 SHA512 c83026f8237f425f97b5bacfc667af28bba5a44110d747b22e49d56b1a7f458f38b3034fda87340bb3b9578571f83b2433a549438b54503f48244f9ea1890b19 WHIRLPOOL d9afeddbc7c908d46e6c40ef6d34df6efa55556cdfe4527ebe69162333d159cc9957ea0773de769fbdbda101e7eda35b78c5a45550c580d33488a3060d711b69
 EBUILD scipy-0.15.0.ebuild 3888 SHA256 a7ff5593b74412f546f8a75f7d01b2b7c10a95be8757c1b6c2ec0cbdb5ec5488 SHA512 781b3288f5bcf847bcd48ef73f904ac832c6388f35a9be3811a5bbd3027421e4abcb08a79b8fd251481506c870f0d8d12a8b8e9dffe9c1569b5a3997bd2a53aa WHIRLPOOL 03bf867a3eaa436e2c75c09d20ffe1c2d6dd32eb28f9726af0cafeac45dc6abb22c97e4167619b9524f2d7ff04f168e03a41d4eddf97d22950273d88670098ae
 EBUILD scipy-0.15.1.ebuild 3888 SHA256 084bc743af5a7130523060cd098c28d2d40e0a3da13bb7919e1708a4783df269 SHA512 b682e149b94e63bcb9d67a89ae8af48c75c7298be87e65495f4a35da7bdf1c29e78f031cb8a45fb400db99509e57e36539993031e157382381306895f7ead389 WHIRLPOOL 2d57568fd377302b72380a0baad380d9dfe70dfaac30563733ea6a6f5e29baf63fbfc02e15f85612b6eae66f3d5f5b504132e7faa31b34f5562f314ed45609a9
-MISC ChangeLog 22029 SHA256 2f489cc5f59bec370fbaa1631907ce2c53533dd09dd6e428f73024c235201439 SHA512 08b3e66cce88c86fc1fa5d95b348d1e528c04635f0d079f4837e1444d13a2001d4bb0f0cf5a03a21c57cd6b3c66d92e4ce0847ca43fd0c1a50a6df38fe2ef8ee WHIRLPOOL e4abbf71782de221b484be63b3c925523c35ad2c2b842b8378ef570909f84ea42e2b36c9ffa3647e4f46e61757f80312b180256f0cd9457a94f50011cf18940d
+MISC ChangeLog 22191 SHA256 405b8d7259aca5af8aa5528f6f4b305624ff88811f0121424baacb99ec2176d5 SHA512 1e9d368395c951e458fc76de50b534b490b35f36a1444155967d009a661f65c2e0dde3c86c9a8069849da454523f30e23d3ce9b8bc8560245f257f4427d50c1c WHIRLPOOL 2f2953f9fb7a501c30ff5e9a6f41bc6a35880f08efd17f5b466c79f3acb6e44c7bbad522f1425f1d0e09367a671dad4fb9d802b8134437f31736fdb3feffd8ed
 MISC metadata.xml 778 SHA256 c585563656be41d539826dbd6ac5f633a0704b73a39b3603b50ce6092d767e73 SHA512 da239d303a88f7bc4356a27965aed91befd379ee142c529ab5177276eb86ac7976b527a2b1397584754f1cec1c6743c98b9af4a540e6cc503607ac3cf529de06 WHIRLPOOL e04375da88108229b3386ae79ba452705a4d4fcdbff9f38c491a4436846c9037d8c68bd8d5524d5435e351a557bd604211477a28da5661c9cce804fe27a34b2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU9dDkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU+yQtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirWScP/2ZtBZ9jeWumAZ85NJrDZDkK
-3zCTft8pVqqKha3xkVg28qEb9RWgIe4WxnYabGgWKR5gKS9AQEKSxfLYi9Pf4UgF
-3Zrovhus10h7FEtrDjZYmFyGBOtwckIeA1KdVMDWzXQFvqwmsQc3rvaHsscJvxQ5
-F/cu1LB5cj1UC+q9rlKbg3DELV8q+Blc+vUnTlBfBVLFd7pjP1uKvz5OxJJLzinD
-K/xBWyKHG6fnpr7GugsoFSjYVc3KKrMPpQ5TjMu99Gq9VFdXuKKQZcLvjkBEZxjf
-z0cQ990lSHENtehoWaQ96OVTWC3nAJCU58LLPYjt7jm+Cu+TDAIO2w20wainNTQK
-52FGVBRPoYeqLkVGCT76HwkboVeNCz9nHMqMC394BlSN8vD+Jab1oqL+jvCPSc9r
-3IbFgdA0DxJWfBzKg23eTAHoB8yucp+f3dIcz7uZJDc7vbWto5uFAvWh/Tf9uSU1
-rTOgXGlgOuO8P/McPGb4espe7QCuBqY6DxeSb2hxhdK4c8aH5KzbN4/RVlbWgt01
-gltvGkgNkeXUet+8Rk6QenQ8hQytdFTuvnZU9niajciYLypv9y5NXLGwXAOM6G0Y
-CSRrP8s8LRMYuO40pLM/ooc8xJW8Tj1iwBnzmrWECtlHRile7TmVN3J7ra/AoTsu
-VdVfwUfK1tgVupy10zl4
-=Lz9a
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir07sP/33u6gZty4KEOZ7dcuwmvdYP
+mXwxkUBZVWaUnaETPaDM0PY72SqANoKEGjbc71rFKvZBlmvEaq1utFSJ8FoB+D3T
+rNXZzkh45WlKCeIrJxC3SJVU7S3+P2RdUdj6DeBMIZa98SoHXRU4zdNoP9+iABSh
+Ni5+pcnFD9SSrkveG9HbijF0J3BKWhthJtZ72vZ0qfqkcdW9oInZI/sNieHOhOz9
+hOi5Ofz4XE7oTVIXySpo6gP+UE+m4crk5ggV0iCDSOxjYceG2MUuaegHpgjaD+r9
+wS3N5oaxK8Jm+WqZisE8iEhdCZhRAJ6WVXIkVjUBINQEk5lDsspfNpSHYK9wx6Ki
+oCOWQ7dnhIhTEzqzxoe0g9U3+dOy9ujuXThKW3XcsG3cB1dSRbrvl+lSG0gCCC8Q
+6rFpVONDsVx0PwjMi6k7VJ4WhZh/StBCqe1iXeY+75AdeC3cmfi7Zaxhp8UzIIww
+ntJH/wfSdnI6bpw2IZzaho/1bhex5IdYAGgln3jh1rCsFStdmEc1FzmkkJqYizyu
+8U5wOruHyvdA8SokFbA7BMRoW+oBcjKGx+YwmdfWHCkFgCSdS4eHPcF+SflJ/mVz
+wqWnC1XwSwWLE4LRzgI3sxFvAvlzssSa8K5rLX0r9vqUaeQcdP2XNahedGFzTv9A
+KCiKhylGht8WRzwTYvJE
+=QYQo
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/scipy/files/scipy-0.14.0-cython-0.22-backport.patch b/sci-libs/scipy/files/scipy-0.14.0-cython-0.22-backport.patch
new file mode 100644 (file)
index 0000000..a53f3cd
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.14.0-cython-0.22-backport.patch
@@ -0,0 +1,36 @@
+From 55ad71112d3dda1656a724118b32afaba73d6dae Mon Sep 17 00:00:00 2001
+From: Ian Henriksen <insertinterestingnamehere@gmail.com>
+Date: Sat, 18 Oct 2014 23:03:34 -0600
+Subject: [PATCH] BUG: Match exception declarations between
+ scipy/io/matlab/streams.pyx and scipy/io/matlab/streams.pxd to prevent an
+ error in recent versions of cython.
+
+---
+ scipy/io/matlab/streams.pyx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scipy/io/matlab/streams.pyx b/scipy/io/matlab/streams.pyx
+index d74e424..0ca3fc5 100644
+--- a/scipy/io/matlab/streams.pyx
++++ b/scipy/io/matlab/streams.pyx
+@@ -201,7 +201,7 @@ cdef class ZlibInputStream(GenericStream):
+         return (self._max_length == self._read_bytes) and \
+                (self._buffer_size == self._buffer_position)
+ 
+-    cpdef long int tell(self):
++    cpdef long int tell(self) except -1:
+         return self._total_position
+ 
+     cpdef int seek(self, long int offset, int whence=0) except -1:
+@@ -304,7 +304,7 @@ cdef class FileStream(GenericStream):
+             raise IOError('Failed seek')
+         return ret
+ 
+-    cpdef long int tell(self):
++    cpdef long int tell(self) except -1:
+         return ftell(self.file)
+ 
+     cdef int read_into(self, void *buf, size_t n) except -1:
+-- 
+2.3.1
+

diff --git a/sci-libs/scipy/scipy-0.14.0-r1.ebuild b/sci-libs/scipy/scipy-0.14.0-r1.ebuild
index a39270dca157677454aec91a9f8906729d297dd6..be3f057add8661100495c2491f8e341d5a56a3ce 100644 (file)
--- a/sci-libs/scipy/scipy-0.14.0-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.14.0-r1.ebuild,v 1.2 2015/02/16 10:36:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.14.0-r1.ebuild,v 1.3 2015/03/07 16:15:36 jlec Exp $
 
 EAPI=5
 
@@ -104,6 +104,7 @@ python_prepare_all() {
                "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
                "${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
                "${FILESDIR}"/${P}-lsqr-backport.patch
+               "${FILESDIR}"/${P}-cython-0.22-backport.patch
        )
        distutils-r1_python_prepare_all
 }