[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-08-02 Thread Michał Górny
commit: b18d82d0669173e87fde9cc3b6ca0fe3df1c6722
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  2 11:57:51 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  2 12:02:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18d82d0

sci-libs/scipy: Remove py2.7

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/scipy-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild 
b/sci-libs/scipy/scipy-1.1.0.ebuild
index a4576826f4c..119210dc4f0 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-07-24 Thread Michał Górny
commit: 511cd9618f77457ce2ced159fe8eb4fd927e22ca
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jul 24 12:29:19 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jul 24 14:31:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511cd961

sci-libs/scipy: Bump to 1.5.2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/Manifest   |   3 +
 sci-libs/scipy/scipy-1.5.2.ebuild | 160 ++
 2 files changed, 163 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 44754c74cdb..9ed4593e3fc 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -10,3 +10,6 @@ DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B 
f505e5f0627687aeefe0af0886b03eead9f6426
 DIST scipy-1.5.1-html.zip 23582280 BLAKE2B 
97b256bc7367836f35ce7e0ac47436dd72c1afe249dea1a2f437ea883e74ecb8f5bbe22e20bb804aac66b86fb35e8b4f0e329c44d9d601318ef1accc82e8e850
 SHA512 
eb0c7736d2bdc9f45926d19f4a22e1168d0f06e21b338cd7e7884af79c7634885350c510251d4cd1629b2a294003e93f8e71bafd8ec64c1aea4d4174c3946597
 DIST scipy-1.5.1-ref.pdf 33698325 BLAKE2B 
6ff0d13474acf2960352580765c86ef54faa9bb616b4b8097665fa3b8a3a6033acb524d5bb76757b23d0ea9550b556293509a91e5cbeb7b0a388ea75d1bec29b
 SHA512 
c0fbebb5dec19aebe7783507ccebf28134227096caad915e1f28f963386a07b1246fa624e4680691809c5ba31a09d3dd6e4f27f9e86f5985f8a7eecb1eea82d3
 DIST scipy-1.5.1.tar.gz 25575560 BLAKE2B 
e431a54f1810590b75d0f115bdbcd3c561d0d918664d91654fa4f2583d4d2807deae36b3293be0a5add650fb5d99f744e1d893d369f6053741d863e2826dcc3c
 SHA512 
d46abaaa52e5521d8f3f6d79f58c8473a8649faa01e93d250d2ee19d5778e31c13aaa855bd8f059ddc1424ae13001f15a41f240fa6b0acf3ffd911ea30da1040
+DIST scipy-1.5.2-html.zip 23166876 BLAKE2B 
a90d6a2eb25c56147c0c1cccb58cddd230c20cd70dcc5c39b7307acaeac5320ff1c6ed46e3027ec40f604db503a90620cf87212e45f3158c667ec20d95bac649
 SHA512 
35c675821675844b163eacdaf448173edb78adb5e9f3e438a70809b8b59425a987fd3ed7d6f7863612111ece4a6a36504279ef4492166f5e24a9b2c7ea9d21e7
+DIST scipy-1.5.2-ref.pdf 33462200 BLAKE2B 
5784612eb41221a02520778d72341702a7dd4ee8c0147592e170054107219b03af4ccebe1f5e2a57f90f3b892455f95ec45d8eac8e4a7155e21e9ae0526b302f
 SHA512 
15961b7280eb903d2db7a05915b94b3c298cabf68a6694da217680e23fe621885dd169dc88a033ee001a89bc6e6b13ef787ec61009f6ffe38aeaa2dfb84f8a47
+DIST scipy-1.5.2.tar.gz 25423944 BLAKE2B 
0a4987da0cde4f33bbb0e2be571b59e9064b1c6554c61c1655100abdecfde54d64845cd30c5b3fcac3ae7426572757aa9a66065dd3b48e6e4cdd4d0ea847868e
 SHA512 
45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923

diff --git a/sci-libs/scipy/scipy-1.5.2.ebuild 
b/sci-libs/scipy/scipy-1.5.2.ebuild
new file mode 100644
index 000..a3d305b0846
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.5.2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+   default
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+   $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+   sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+   $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+   sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-07-08 Thread Michał Górny
commit: 2f59c125c3e9a50c6dcc61a71c78b98dd1c3574f
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul  8 06:31:22 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jul  8 08:25:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f59c125

sci-libs/scipy: Bump to 1.5.1

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/Manifest   |   3 +
 sci-libs/scipy/scipy-1.5.1.ebuild | 154 ++
 2 files changed, 157 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 86ad48b6cf0..44754c74cdb 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -7,3 +7,6 @@ DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B 
e35f6234404839cbd24d463c8cc2f1ea66aed91
 DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 
6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79
 SHA512 
a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
 DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B 
a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972
 SHA512 
3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
 DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B 
f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c
 SHA512 
4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be
+DIST scipy-1.5.1-html.zip 23582280 BLAKE2B 
97b256bc7367836f35ce7e0ac47436dd72c1afe249dea1a2f437ea883e74ecb8f5bbe22e20bb804aac66b86fb35e8b4f0e329c44d9d601318ef1accc82e8e850
 SHA512 
eb0c7736d2bdc9f45926d19f4a22e1168d0f06e21b338cd7e7884af79c7634885350c510251d4cd1629b2a294003e93f8e71bafd8ec64c1aea4d4174c3946597
+DIST scipy-1.5.1-ref.pdf 33698325 BLAKE2B 
6ff0d13474acf2960352580765c86ef54faa9bb616b4b8097665fa3b8a3a6033acb524d5bb76757b23d0ea9550b556293509a91e5cbeb7b0a388ea75d1bec29b
 SHA512 
c0fbebb5dec19aebe7783507ccebf28134227096caad915e1f28f963386a07b1246fa624e4680691809c5ba31a09d3dd6e4f27f9e86f5985f8a7eecb1eea82d3
+DIST scipy-1.5.1.tar.gz 25575560 BLAKE2B 
e431a54f1810590b75d0f115bdbcd3c561d0d918664d91654fa4f2583d4d2807deae36b3293be0a5add650fb5d99f744e1d893d369f6053741d863e2826dcc3c
 SHA512 
d46abaaa52e5521d8f3f6d79f58c8473a8649faa01e93d250d2ee19d5778e31c13aaa855bd8f059ddc1424ae13001f15a41f240fa6b0acf3ffd911ea30da1040

diff --git a/sci-libs/scipy/scipy-1.5.1.ebuild 
b/sci-libs/scipy/scipy-1.5.1.ebuild
new file mode 100644
index 000..21948a8eb2c
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.5.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+   default
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+   $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+   sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+   $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+   sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+  

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-22 Thread Michał Górny
commit: 5acefedc6e63a1eb65ae36a84231694e91f6bc0d
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jun 22 10:55:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jun 22 15:35:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5acefedc

sci-libs/scipy: Bump to 1.5.0

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/Manifest   |   3 +
 sci-libs/scipy/scipy-1.5.0.ebuild | 154 ++
 2 files changed, 157 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index e77eff00229..86ad48b6cf0 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -4,3 +4,6 @@ DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 
477753e622ee26a3bc8c2cb6829410152df84b2
 DIST scipy-1.4.1-html.zip 61414053 BLAKE2B 
e1f0c1a7a8941958512dcc3c0f40ef4a590bab0b44b33f842bc6e1c5d103c17f223d8b0a2f4e564f57645d601d4d74005c1ec605be2dd3bf4db19d2ac1f614d1
 SHA512 
9eeae83cd723d63aa1dc7a610ce3118cb68a2336be24cbfeaa8e57b34de413b2efa2fdad0978eb5bdac0ebca6b15f564b9509637efbd87d1007c969ae954e3ae
 DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 
8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2
 SHA512 
76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
 DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B 
e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54
 SHA512 
79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
+DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 
6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79
 SHA512 
a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
+DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B 
a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972
 SHA512 
3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
+DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B 
f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c
 SHA512 
4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be

diff --git a/sci-libs/scipy/scipy-1.5.0.ebuild 
b/sci-libs/scipy/scipy-1.5.0.ebuild
new file mode 100644
index 000..21948a8eb2c
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.5.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+   default
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+   $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+   sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+   $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+   sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+  

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-16 Thread David Seifert
commit: c695c8ece7b823d102964684c5642f17389cba72
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jun 16 22:01:58 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jun 16 22:01:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c695c8ec

sci-libs/scipy: Conditionally add -fallow-argument-mismatch

Closes: https://bugs.gentoo.org/721860
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/scipy/scipy-1.1.0.ebuild | 6 ++
 sci-libs/scipy/scipy-1.4.1.ebuild | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild 
b/sci-libs/scipy/scipy-1.1.0.ebuild
index a676281fbac..e57e5cd5b7b 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -105,6 +105,12 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 }
 
+python_configure_all() {
+   # bug 721860
+   test-flag-FC -fallow-argument-mismatch &&
+   append-fflags -fallow-argument-mismatch
+}
+
 python_compile() {
# FIXME: parallel python building fails, bug #614464
${EPYTHON} tools/cythonize.py || die

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index 8babb5d3237..90fb741b4d7 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -110,6 +110,12 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 }
 
+python_configure_all() {
+   # bug 721860
+   test-flag-FC -fallow-argument-mismatch &&
+   append-fflags -fallow-argument-mismatch
+}
+
 python_compile() {
# FIXME: parallel python building fails, bug #614464
export MAKEOPTS=-j1



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-10 Thread Michał Górny
commit: 2933bd1ef1ce72243f8987d09bb46d6262c030bd
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jun 10 08:08:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun 10 08:11:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2933bd1e

sci-libs/scipy: Add python@ as (co-)maint

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index a4d8cf78982..f1d093c366a 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -5,6 +5,10 @@
 s...@gentoo.org
 Gentoo Science Project
   
+  
+pyt...@gentoo.org
+Python
+  
   
   SciPy is an open source library of scientific tools for Python. SciPy
   supplements the popular numpy module, gathering a variety of high level



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-10 Thread Michał Górny
commit: f6c0210ce848041372b479522d549a5f18001fa6
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jun 10 07:36:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun 10 07:36:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c0210c

sci-libs/scipy: Revert "-fallow-argument-mismatch for gfortran v10"

This breaks older gcc versions.

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index b1e80d62112..8babb5d3237 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -89,9 +89,6 @@ python_prepare_all() {
export SCIPY_FCONFIG="config_fc --noopt --noarch"
append-fflags -fPIC
 
-   # Remove once upstream PR #11842 lands into next release
-   append-fflags -fallow-argument-mismatch
-
local libdir="${EPREFIX}"/usr/$(get_libdir)
cat >> site.cfg <<-EOF || die
[blas]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-07 Thread Alexey Shvetsov
commit: d80e7eafbdb6184a289564ca15d5976d67bf8d17
Author: Alexei Colin  isi  edu>
AuthorDate: Sat Jun  6 20:04:51 2020 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sun Jun  7 21:03:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80e7eaf

sci-libs/scipy: -fallow-argument-mismatch for gfortran v10

Already fixed in upstream master:
https://github.com/scipy/scipy/pull/11842

Closes: https://bugs.gentoo.org/721860

Signed-off-by: Alexei Colin  isi.edu>
Closes: https://github.com/gentoo/gentoo/pull/16093
Signed-off-by: Alexey Shvetsov  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index 8babb5d3237..b1e80d62112 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -89,6 +89,9 @@ python_prepare_all() {
export SCIPY_FCONFIG="config_fc --noopt --noarch"
append-fflags -fPIC
 
+   # Remove once upstream PR #11842 lands into next release
+   append-fflags -fallow-argument-mismatch
+
local libdir="${EPREFIX}"/usr/$(get_libdir)
cat >> site.cfg <<-EOF || die
[blas]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-05 Thread Michał Górny
commit: c053b900384eb2823d6c79b0cff91eef5fc52002
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun  5 13:09:54 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun  5 13:13:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c053b900

sci-libs/scipy: Port to py39

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index 42e1b169419..8babb5d3237 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-05 Thread Michał Górny
commit: 760cd9532e1ec83eb8bf0193536fc57c9f3e873a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun  5 10:54:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun  5 10:55:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=760cd953

sci-libs/scipy: Remove unmaintained live ebuild

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/scipy-.ebuild | 126 ---
 1 file changed, 126 deletions(-)

diff --git a/sci-libs/scipy/scipy-.ebuild b/sci-libs/scipy/scipy-.ebuild
deleted file mode 100644
index 574e0220962..000
--- a/sci-libs/scipy/scipy-.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic git-r3 multiprocessing 
toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/;
-EGIT_REPO_URI="https://github.com/scipy/scipy.git;
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="sparse test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-   sci-libs/arpack:0=
-   virtual/cblas
-   virtual/lapack
-   sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-   dev-lang/swig
-   >=dev-python/cython-0.23.4[${PYTHON_USEDEP}]
-   virtual/pkgconfig
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )
-   "
-
-RDEPEND="${CDEPEND}
-   dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-pc_incdir() {
-   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-   $(tc-getPKG_CONFIG) --libs-only-L $@ | \
-   sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-   $(tc-getPKG_CONFIG) --libs-only-l $@ | \
-   sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-   -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-   | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-   # scipy automatically detects libraries by default
-   export {FFTW,FFTW3,UMFPACK}=None
-   use sparse && unset UMFPACK
-   # the missing symbols are in -lpythonX.Y, but since the version can
-   # differ, we just introduce the same scaryness as on Linux/ELF
-   [[ ${CHOST} == *-darwin* ]] \
-   && append-ldflags -bundle "-undefined dynamic_lookup" \
-   || append-ldflags -shared
-   [[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-   # hack to force F77 to be FC until bug #278772 is fixed
-   [[ -z ${F77} ]] && export F77="$(tc-getFC)"
-   export F90="${FC}"
-   export SCIPY_FCONFIG="config_fc --noopt --noarch"
-   append-fflags -fPIC
-
-   local libdir="${EPREFIX}"/usr/$(get_libdir)
-   cat >> site.cfg <<-EOF || die
-   [blas]
-   include_dirs = $(pc_incdir cblas)
-   library_dirs = $(pc_libdir cblas blas):${libdir}
-   blas_libs = $(pc_libs cblas blas)
-   [lapack]
-   library_dirs = $(pc_libdir lapack):${libdir}
-   lapack_libs = $(pc_libs lapack)
-   EOF
-
-   # Drop hashes to force rebuild of cython based .c code
-   rm cythonize.dat || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_compile() {
-   ${EPYTHON} tools/cythonize.py || die
-   distutils-r1_python_compile \
-   "-j $(makeopts_jobs)" \
-   ${SCIPY_FCONFIG}
-}
-
-python_test() {
-   # fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-   distutils_install_for_testing ${SCIPY_FCONFIG}
-   cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-   einfo "Run test I"
-   "${PYTHON}" -c \
-   'import numpy as np; print("relaxed strides checking:", 
np.ones((10,1),order="C").flags.f_contiguous)' \
-   || die
-   einfo "Run test II"
-   # https://github.com/scipy/scipy/issues/5426
-   "${EPYTHON}" -c \
-   "import scipy, sys; r = scipy.test('fast', verbose=2, 
raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-   || die "Tests fail with ${EPYTHON}"
-#  "${EPYTHON}" -c \
-#  "import scipy, sys; r = scipy.test('fast',verbose=2); 
sys.exit(0 if r.wasSuccessful() else 1)" \
-#  || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-   distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-   elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-   elog "to your prefered image viewer. Example:"
-   elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-06-05 Thread Michał Górny
commit: 8312da3860c9f396691ecbd2bcb1129240d60882
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jun  5 10:54:30 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jun  5 10:55:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8312da38

sci-libs/scipy: Fix running tests

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index 5de99c92dbd..42e1b169419 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -21,9 +21,9 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
@@ -99,6 +99,10 @@ python_prepare_all() {
library_dirs = $(pc_libdir lapack):${libdir}
lapack_libs = $(pc_libs lapack)
EOF
+   cat >> setup.cfg <<-EOF || die
+   [options]
+   zip_safe = False
+   EOF
 
# Drop hashes to force rebuild of cython based .c code
rm cythonize.dat || die
@@ -118,13 +122,11 @@ python_compile() {
 python_test() {
# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
distutils_install_for_testing ${SCIPY_FCONFIG}
-   cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-   "${PYTHON}" -c \
-   'import numpy as np; print("relaxed strides checking:", 
np.ones((10,1),order="C").flags.f_contiguous)' \
-   || die
-   "${EPYTHON}" -c \
-   "import scipy, sys; r = scipy.test('fast', verbose=2); 
sys.exit(r)" \
-   || die "Tests fail with ${EPYTHON}"
+   cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+   PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-05-13 Thread Agostino Sarubbo
commit: c65aa7af130d988b1af9ac405a2e51e07d29723b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 10:07:41 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 10:07:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65aa7af

sci-libs/scipy: x86 stable wrt bug #722660

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index 9037f156625..5de99c92dbd 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-05-12 Thread Agostino Sarubbo
commit: 8ec7bbeb35ee4c2788a4623254d28e2acc8141e9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 12 14:46:59 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 12 14:46:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec7bbeb

sci-libs/scipy: amd64 stable wrt bug #722660

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index d00d7da75c7..9037f156625 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy-python2/

2020-05-01 Thread Pacho Ramos
commit: 6c0fa2f0110c90577825ff2d7d056e16d9f9bb9c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri May  1 17:15:41 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri May  1 17:15:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0fa2f0

sci-libs/scipy-python2: Bump to 1.2.3

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 sci-libs/scipy-python2/Manifest   |   1 +
 sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild | 129 ++
 2 files changed, 130 insertions(+)

diff --git a/sci-libs/scipy-python2/Manifest b/sci-libs/scipy-python2/Manifest
index e9452548014..f554d62f88c 100644
--- a/sci-libs/scipy-python2/Manifest
+++ b/sci-libs/scipy-python2/Manifest
@@ -1 +1,2 @@
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 
477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404
 SHA512 
72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
+DIST scipy-1.2.3.tar.gz 23335997 BLAKE2B 
183a0e8266a6fa08ca4fa05511d28f51a5ff9b3e8d00c24a355d2db00327eb973befbefbcf47cb288aafd60718db903ac29f775f519484a7c6d0919693c0a21f
 SHA512 
d7739fa2f25689fc14ddf09477207c990b39b593a85f5c74687df1ffe097f6eee1bb2123aaa286189309f6d3b25cdd7757053d8b1008d1d6b3367a8e3a0a53b1

diff --git a/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild 
b/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild
new file mode 100644
index 000..05b35f960a4
--- /dev/null
+++ b/sci-libs/scipy-python2/scipy-python2-1.2.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+MY_PN=${PN/-python2}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Scientific algorithms library for Python (py2 version)"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="sparse test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   || (
+   >=dev-python/numpy-python2-1.10[lapack,${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   )
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+RDEPEND="${CDEPEND}
+   !> site.cfg <<-EOF || die
+   [blas]
+   include_dirs = $(pc_incdir cblas)
+   library_dirs = $(pc_libdir cblas blas):${libdir}
+   blas_libs = $(pc_libs cblas blas)
+   [lapack]
+   library_dirs = $(pc_libdir lapack):${libdir}
+   lapack_libs = $(pc_libs lapack)
+   EOF
+
+   # Drop hashes to force rebuild of cython based .c code
+   rm cythonize.dat || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_compile() {
+   # FIXME: parallel python building fails, bug #614464
+   ${EPYTHON} tools/cythonize.py || die
+   distutils-r1_python_compile \
+   ${SCIPY_FCONFIG}
+}
+
+python_test() {
+   # fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+   distutils_install_for_testing ${SCIPY_FCONFIG}
+   cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+   "${PYTHON}" -c \
+   'import numpy as np; print("relaxed strides checking:", 
np.ones((10,1),order="C").flags.f_contiguous)' \
+   || die
+   "${EPYTHON}" -c \
+   "import scipy, sys; r = scipy.test('fast', verbose=2); 
sys.exit(r)" \
+   || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+   distutils-r1_python_install ${SCIPY_FCONFIG}
+   python_optimize
+}
+
+pkg_postinst() {
+   elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+   elog "to your prefered image viewer. Example:"
+   elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-03-07 Thread Michał Górny
commit: abe83e4c034d15817fadee0a5617a44d6224fbe3
Author: Roy Bamford  gentoo  org>
AuthorDate: Fri Mar  6 16:40:00 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar  7 15:10:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe83e4c

sci-libs/scipy: added ~arm64 keyword

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index b176683c887..d00d7da75c7 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy-python2/

2020-01-28 Thread Michał Górny
commit: 0f29cb1a064d642e5d62882785e4772d78610dfc
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 28 20:46:05 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 28 21:30:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f29cb1a

sci-libs/scipy-python2: Split from scipy

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy-python2/Manifest   |   1 +
 sci-libs/scipy-python2/metadata.xml   |  23 
 sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild | 128 ++
 3 files changed, 152 insertions(+)

diff --git a/sci-libs/scipy-python2/Manifest b/sci-libs/scipy-python2/Manifest
new file mode 100644
index 000..e9452548014
--- /dev/null
+++ b/sci-libs/scipy-python2/Manifest
@@ -0,0 +1 @@
+DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 
477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404
 SHA512 
72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973

diff --git a/sci-libs/scipy-python2/metadata.xml 
b/sci-libs/scipy-python2/metadata.xml
new file mode 100644
index 000..2425e896a8a
--- /dev/null
+++ b/sci-libs/scipy-python2/metadata.xml
@@ -0,0 +1,23 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+s...@gentoo.org
+Gentoo Science Project
+  
+  
+SciPy is an open source library of scientific tools for Python. SciPy
+supplements the popular numpy module, gathering a variety of high level
+science and engineering modules together as a single package.
+SciPy includes modules for graphics and plotting, optimization,
+integration, special functions, signal and image processing, genetic
+algorithms, ODE solvers, and others.
+  
+  
+Adds support for sparse solving with 
sci-libs/umfpack
+  
+  
+scipy
+scipy
+  
+

diff --git a/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild 
b/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild
new file mode 100644
index 000..23d6871c6c3
--- /dev/null
+++ b/sci-libs/scipy-python2/scipy-python2-1.1.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+MY_PN=${PN/-python2}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Scientific algorithms library for Python (py2 version)"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="sparse test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   || (
+   >=dev-python/numpy-python2-1.10[lapack,${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   )
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+RDEPEND="${CDEPEND}
+   !> site.cfg <<-EOF || die
+   [blas]
+   include_dirs = $(pc_incdir cblas)
+   library_dirs = $(pc_libdir cblas blas):${libdir}
+   blas_libs = $(pc_libs cblas blas)
+   [lapack]
+   library_dirs = $(pc_libdir lapack):${libdir}
+   lapack_libs = $(pc_libs lapack)
+   EOF
+
+   # Drop hashes to force rebuild of cython based .c code
+   rm cythonize.dat || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_compile() {
+   # FIXME: parallel python building fails, bug #614464
+   ${EPYTHON} tools/cythonize.py || die
+   distutils-r1_python_compile \
+   ${SCIPY_FCONFIG}
+}
+
+python_test() {
+   # fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+   distutils_install_for_testing ${SCIPY_FCONFIG}
+   cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+   "${PYTHON}" -c \
+   'import numpy as np; print("relaxed strides checking:", 
np.ones((10,1),order="C").flags.f_contiguous)' \
+   || die
+   "${EPYTHON}" -c \
+   "import scipy, sys; r = scipy.test('fast', verbose=2); 
sys.exit(r)" \
+   || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+   distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+pkg_postinst() {
+   elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+   elog "to your prefered image viewer. Example:"
+   elog "\t echo \"export 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-01-27 Thread Michał Górny
commit: be70e7ea0c9382d2c68d7bb48444e4265940317c
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jan 27 20:42:49 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jan 27 20:54:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be70e7ea

sci-libs/scipy: Revert "fixing numpy deps"

Change done in explicit violation of maintainer's request.

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/{scipy-1.1.0-r2.ebuild => scipy-1.1.0.ebuild} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-libs/scipy/scipy-1.1.0-r2.ebuild 
b/sci-libs/scipy/scipy-1.1.0.ebuild
similarity index 94%
rename from sci-libs/scipy/scipy-1.1.0-r2.ebuild
rename to sci-libs/scipy/scipy-1.1.0.ebuild
index 68223502d2c..a676281fbac 100644
--- a/sci-libs/scipy/scipy-1.1.0-r2.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -26,8 +26,7 @@ RESTRICT="!test? ( test )"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
-   $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] 
>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*')
-   $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 
'python3*')
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
sci-libs/arpack:0=
virtual/cblas
virtual/lapack



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-01-27 Thread Rick Farina
commit: 1a97fa93304f40cd96c86cdcfeebcf32b1d18646
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Jan 27 18:16:54 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Jan 27 18:18:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a97fa93

sci-libs/scipy: fixing numpy deps

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Rick Farina  gentoo.org>

 sci-libs/scipy/{scipy-1.1.0.ebuild => scipy-1.1.0-r2.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild 
b/sci-libs/scipy/scipy-1.1.0-r2.ebuild
similarity index 94%
rename from sci-libs/scipy/scipy-1.1.0.ebuild
rename to sci-libs/scipy/scipy-1.1.0-r2.ebuild
index a676281fbac..68223502d2c 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0-r2.ebuild
@@ -26,7 +26,8 @@ RESTRICT="!test? ( test )"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
-   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '|| ( dev-python/numpy-python2[${PYTHON_USEDEP}] 
>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] )' 'python2*')
+   $(python_gen_cond_dep '>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]' 
'python3*')
sci-libs/arpack:0=
virtual/cblas
virtual/lapack



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2020-01-26 Thread Benda XU
commit: 809afd4a24533311ced5ecfb2f022b539a3b6dd2
Author: Benda Xu  gentoo  org>
AuthorDate: Mon Jan 27 04:54:55 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon Jan 27 04:59:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809afd4a

sci-libs/scipy: disable parallel build completely.

  After 4 years discussion and debugging, we conclude that Python 3 is
  deeply broken in parallel builds for anything involving compiling of
  C/C++/fortran code.  The problem is universal, regardless how
  dev-python/numpy is built.

  Numpy and scipy upstream cannot do anything about this.  We bite the
  bullet and disable parallel build of scipy completely.

  Thanks to all who have contributed to this heroic marathon
  debugging.  We regret that only a workaround can be provided at this
  moment.

Credit: Andrés Becerra Sandoval, Hendrik v. Raven, younky.yang  yahoo.com
Credit: matoro, Denis Descheneaux, Mathy Vanvoorden, email200202  yahoo.com
Credit: jon R-B, Anton Kochkov, Jonas Stein, edes, David Duchesne
Credit: thulle, Mathy Vanvoorden, Sasha Medvedev, rtgiskard  gmail.com
Credit: Lukasz Ligowski, Zentoo, Jouni Kosonen, Neil, Harris Landgarten
Credit: Markus Oehme, Andreas Proteus
Suggested-By: François Bissey,  Arfrever Frehtes Taifersar Arahesis
Reference: https://github.com/numpy/numpy/issues/13080
Reference: https://github.com/scipy/scipy/issues/7112
Closes: https://bugs.gentoo.org/614464
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>

 sci-libs/scipy/scipy-1.4.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index a9e7e584875..b176683c887 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -108,6 +108,8 @@ python_prepare_all() {
 
 python_compile() {
# FIXME: parallel python building fails, bug #614464
+   export MAKEOPTS=-j1
+
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
${SCIPY_FCONFIG}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/files/, sci-libs/scipy/

2020-01-03 Thread David Seifert
commit: 68aeb905a310ee748d1f26d117d9d0987ecae6a9
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan  3 20:40:38 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan  3 20:40:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68aeb905

sci-libs/scipy: Remove old

Closes: https://github.com/gentoo/gentoo/pull/14188
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/scipy/Manifest|  12 --
 sci-libs/scipy/files/scipy-0.12.0-blitz.patch  |  28 
 .../files/scipy-0.12.0-restore-sys-argv.patch  |  15 ---
 .../files/scipy-0.16.1-glibc-2.22-backport.patch   |  30 -
 sci-libs/scipy/scipy-0.16.1.ebuild | 149 -
 sci-libs/scipy/scipy-0.18.1.ebuild | 147 
 sci-libs/scipy/scipy-0.19.1.ebuild | 143 
 sci-libs/scipy/scipy-1.0.0.ebuild  | 142 
 8 files changed, 666 deletions(-)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 755da305b08..e77eff00229 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,15 +1,3 @@
-DIST scipy-0.16.1-html.zip 33158474 BLAKE2B 
dfeac8456ea328f293a28c379e3723f8a2fa2e5c47fc2771902083fb89764df9041f71c2ee656fc4c9a00017367f5e4726c798d309f8c2c50dd020c0fd93d168
 SHA512 
47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a
-DIST scipy-0.16.1-ref.pdf 33916573 BLAKE2B 
8bb2fbb592168c1233fa0e464cd8ded7ab05f4ab9b27ed54e45a71f1902ea4378ad6099cdbce633364372dfa6c0525f906cff7fab3d38d62f9d8c8b698d96fd9
 SHA512 
eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9
-DIST scipy-0.16.1.tar.gz 12221561 BLAKE2B 
8181330d7e83c75ee3e3b88cdc7736fdedbf0eb410fc237a3aa0d45bc5919d79d2bec8876351dee9c331016371becf6a6a1a0b419e50739e717125334d5512bd
 SHA512 
1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402e9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
-DIST scipy-0.18.1-html.zip 32907714 BLAKE2B 
e1e32d4472f8bb3064e732689cdbe7055a441e7dea38a0fff37458e4530b841db969fdcad92967d9ee2bc37120ed7dae238365d566363ec6b86a188b6cb2a746
 SHA512 
fc61ce9a9dcc7091da29d35a42cc38074b0c4f5ff81d5ca5dea9c2d32e5e3ee1e8463fcb4e18c931c0c0e4f00410f8cd16d0f81c219fb326edc20d2286866e03
-DIST scipy-0.18.1-ref.pdf 14824115 BLAKE2B 
94ecf2332925adba1f40fbf303a5ec6ecddfb5ab30d25f038945e6c2328cee2e5182f4a8214bd49e7f4cc5af2fa5d6e70b7f6248cbc7964ed38c5479914ce17f
 SHA512 
e668420ae3668f459d15cb88765045c89df02f9c73854c8ddce8fe1611973e8c9d40ac49a1db0342282074b1d46b8156bb75430b7df079efd1c3a6ccb4bf2c37
-DIST scipy-0.18.1.tar.gz 13141689 BLAKE2B 
b761c2543e962eb04cc9c9651e6c95612e421393a2b3d519a52fbb3dd0f7583972004632429ddbe9ea007248908c937b26050a0579f45472978b2f3629a27c67
 SHA512 
f2ee21c808141d8002f69e48e7cf006e36982b1a7041323a8f4d803a1de3d191ffcc40227aac351dd876c28843de366ef89e9cf84dc106fadac86a3f40491659
-DIST scipy-0.19.1-html.zip 38201310 BLAKE2B 
28ba5538ecfb1a8a6b7676a2b427a320d3fd6e76f591203d25451e4de8e2534ef3bfaee960322d427774459319da3098c70bf69b176641a75eb64e17a53d5690
 SHA512 
7eecef83a92aa99a726a8839e2cdac1171129ba0efcaf8e36b07d6714fde20cce9ce9f676be6b4835845930c49f740cb11ce0d93012d0b8c990e7061bb3afbcc
-DIST scipy-0.19.1-ref.pdf 17530855 BLAKE2B 
a0b0011ded7ee1f6bf9944b0c6d474581b64debb192277ebf142ebcc297f8e2f52412a4a8bfb7e618984c0c32233e2a6346d9795565276e08f00be5e782da04f
 SHA512 
79718fde0aedb4c9906b37f2d75878719b614268160e645ad69ea797d6baeecaff9153884171906e6b7673b65da997ff4fd245e0f42ab766497ee9c96f4f9fd2
-DIST scipy-0.19.1.tar.gz 14083805 BLAKE2B 
65369ffec2726a8e16da2d6852a71965277b8d4637316a375122e5b6cbf0e05cdcbd3304bcd14ca0b9b6677620a27c0fed6d4924eb8b1726c22ec0ec663feeac
 SHA512 
5c124c44c672dcb53c31f8592fd9f74189f04cb0bade99476a2a6eb4844338e3e9842f27a148b007b7eed25cbfde090a697575a381ebe4ca066abdf54c214203
-DIST scipy-1.0.0-html.zip 47873725 BLAKE2B 
0c6c1070e46e644c9e5700a116e700a0ce8d69c1cfaa0ae63ae34af8844db83a7b61c5d072c54bdc23ef7016440ec6d378a45965778c0e8078113bf1a54bade3
 SHA512 
15d5726ad527bbe3e3e1579d5d2f6031393a2eca8e27adc6f78b16697e9dd67633407a160f461d7a18a8b8bde83201ccf363cdda8f9ca3531b6d6ec1491e0f14
-DIST scipy-1.0.0-ref.pdf 31394378 BLAKE2B 
bc8e590509cfb4bfda9deab40bbc6ebc919e39cb03a5817040ad2e9bbdfd0acc1a1dc194a88ac890a9052b6ddb3bb7b39292d08d925e3d1eb310605ca0589450
 SHA512 
657ef3c643ab61a8452dd85982018eb2210cd1531edd152c9b1c3d8c722f8a45ab1efd03f5bbb3c763a75e70e6d39036a845869ec5135f2aa0445480a074f3e0
-DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 
37cd50c59830c91f0516c72cf11b367670faf5c1fe3fd3cf37bc6f30a4b1f44f7b1d124ff7097c3dcb8c32c3876e166ab1caaa3991a637df5f61bb26b0f52c3f
 SHA512 
7d55c5660ac606933d517171a229b288fd0ea8d9fdd8e30fac3d294545a26b2700c7b100b014a93231c4122dee0f1ddd741c00f5902643a6ccc287cdf581da7a
 DIST 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2019-12-30 Thread Michał Górny
commit: 8f31152464eee14583f1accedee4396e5acfe1c4
Author: David Seifert  gentoo  org>
AuthorDate: Mon Dec 30 00:48:31 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Dec 30 12:58:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f311524

sci-libs/scipy: Remove $(usex python_targets_python3_5)

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>
Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/scipy/scipy-0.18.1.ebuild | 2 +-
 sci-libs/scipy/scipy-0.19.1.ebuild | 1 -
 sci-libs/scipy/scipy-1.0.0.ebuild  | 1 -
 sci-libs/scipy/scipy-1.1.0.ebuild  | 1 -
 sci-libs/scipy/scipy-1.4.1.ebuild  | 1 -
 sci-libs/scipy/scipy-.ebuild   | 2 +-
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sci-libs/scipy/scipy-0.18.1.ebuild 
b/sci-libs/scipy/scipy-0.18.1.ebuild
index 13d5afa657e..730b436320c 100644
--- a/sci-libs/scipy/scipy-0.18.1.ebuild
+++ b/sci-libs/scipy/scipy-0.18.1.ebuild
@@ -109,7 +109,7 @@ python_prepare_all() {
 python_compile() {
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
-   $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+   "-j $(makeopts_jobs)" \
${SCIPY_FCONFIG}
 }
 

diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild 
b/sci-libs/scipy/scipy-0.19.1.ebuild
index a17473acc3d..45225e71258 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -104,7 +104,6 @@ python_prepare_all() {
 
 python_compile() {
# FIXME: parallel python building fails, bug #614464
-   # $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
${SCIPY_FCONFIG}

diff --git a/sci-libs/scipy/scipy-1.0.0.ebuild 
b/sci-libs/scipy/scipy-1.0.0.ebuild
index 830587f79c3..f9c24c564fd 100644
--- a/sci-libs/scipy/scipy-1.0.0.ebuild
+++ b/sci-libs/scipy/scipy-1.0.0.ebuild
@@ -107,7 +107,6 @@ python_prepare_all() {
 
 python_compile() {
# FIXME: parallel python building fails, bug #614464
-   # $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
${SCIPY_FCONFIG}

diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild 
b/sci-libs/scipy/scipy-1.1.0.ebuild
index acbf180275f..26a09951e2a 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -107,7 +107,6 @@ python_prepare_all() {
 
 python_compile() {
# FIXME: parallel python building fails, bug #614464
-   # $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
${SCIPY_FCONFIG}

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
index a655ea5de4a..763237b3a95 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -108,7 +108,6 @@ python_prepare_all() {
 
 python_compile() {
# FIXME: parallel python building fails, bug #614464
-   # $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
${SCIPY_FCONFIG}

diff --git a/sci-libs/scipy/scipy-.ebuild b/sci-libs/scipy/scipy-.ebuild
index 0e528a35be0..7892ce16901 100644
--- a/sci-libs/scipy/scipy-.ebuild
+++ b/sci-libs/scipy/scipy-.ebuild
@@ -93,7 +93,7 @@ python_prepare_all() {
 python_compile() {
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
-   $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+   "-j $(makeopts_jobs)" \
${SCIPY_FCONFIG}
 }
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2019-12-25 Thread Jason Zaman
commit: 13667ba3376f90ab5b236b1f60adf0079734f41d
Author: Jason Zaman  gentoo  org>
AuthorDate: Wed Dec 25 10:36:40 2019 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Thu Dec 26 02:34:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13667ba3

sci-libs/scipy: bump 1.4.1

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Jason Zaman  gentoo.org>

 sci-libs/scipy/Manifest   |   3 +
 sci-libs/scipy/scipy-1.4.1.ebuild | 145 ++
 2 files changed, 148 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 8e51ea760a6..755da305b08 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -13,3 +13,6 @@ DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 
37cd50c59830c91f0516c72cf11b367670faf5c
 DIST scipy-1.1.0-html.zip 49851258 BLAKE2B 
528df7ed8aa8e56662f436f31ee9e1d6d72d6fe962f9f0f6f84b7a2704b53009ce333b2102ec73bb7795110f8a61b18246aab95b1e21055f2b68c0ff2225b7bb
 SHA512 
a03894a22a67c1359ee6206e9e1c9de1f926a7f829f5039f161e78df735708da09b0e51cdad3bf36bfede701d0bc5dc44f8cc0f249b6bfb80c9d8c9fe23aed46
 DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B 
f82807879d5d36d91d74e8983a0f4104bcb4b69cb7787fe5190f73fbbfcb8635a9399686b3c75736d3b0b5dd877b5280ff6fba728520e3b47c13ffc7835f8cd6
 SHA512 
c792064c986dffafa3c5d0741f30715028e655761d099f0fdd472270cf34642b367dfa2178ddceba13043a471e3aeb1db20d65308dbb40c704dab576aaadeb3e
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 
477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404
 SHA512 
72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
+DIST scipy-1.4.1-html.zip 61414053 BLAKE2B 
e1f0c1a7a8941958512dcc3c0f40ef4a590bab0b44b33f842bc6e1c5d103c17f223d8b0a2f4e564f57645d601d4d74005c1ec605be2dd3bf4db19d2ac1f614d1
 SHA512 
9eeae83cd723d63aa1dc7a610ce3118cb68a2336be24cbfeaa8e57b34de413b2efa2fdad0978eb5bdac0ebca6b15f564b9509637efbd87d1007c969ae954e3ae
+DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 
8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2
 SHA512 
76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
+DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B 
e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54
 SHA512 
79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d

diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild 
b/sci-libs/scipy/scipy-1.4.1.ebuild
new file mode 100644
index 000..a655ea5de4a
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+   default
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+   $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+   sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+   $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+   sed -e 's/[ 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2018-06-27 Thread Pacho Ramos
commit: dea904d8d71ac4d899a33e6b7739b97b38a31a0e
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 27 21:04:20 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 27 21:04:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea904d8

sci-libs/scipy: Parallel build fails (#614464)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sci-libs/scipy/scipy-0.19.1.ebuild | 3 ++-
 sci-libs/scipy/scipy-1.0.0.ebuild  | 5 +++--
 sci-libs/scipy/scipy-1.1.0.ebuild  | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild 
b/sci-libs/scipy/scipy-0.19.1.ebuild
index 5e43cbe818c..c12cc341cc7 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -102,9 +102,10 @@ python_prepare_all() {
 }
 
 python_compile() {
+   # FIXME: parallel python building fails, bug #614464
+   # $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
-   $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${SCIPY_FCONFIG}
 }
 

diff --git a/sci-libs/scipy/scipy-1.0.0.ebuild 
b/sci-libs/scipy/scipy-1.0.0.ebuild
index 3ed2ec72b0e..0db065d7043 100644
--- a/sci-libs/scipy/scipy-1.0.0.ebuild
+++ b/sci-libs/scipy/scipy-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -105,9 +105,10 @@ python_prepare_all() {
 }
 
 python_compile() {
+   # FIXME: parallel python building fails, bug #614464
+   # $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
-   $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${SCIPY_FCONFIG}
 }
 

diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild 
b/sci-libs/scipy/scipy-1.1.0.ebuild
index 789041b2c35..0db065d7043 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -105,9 +105,10 @@ python_prepare_all() {
 }
 
 python_compile() {
+   # FIXME: parallel python building fails, bug #614464
+   # $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${EPYTHON} tools/cythonize.py || die
distutils-r1_python_compile \
-   $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
${SCIPY_FCONFIG}
 }
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2018-06-14 Thread Alexey Shvetsov
commit: 30074e24bd0865ab020fd4483e2aa0e8c160d770
Author: Alexey Shvetsov  omrb  pnpi  spb  ru>
AuthorDate: Thu Jun 14 13:04:35 2018 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Thu Jun 14 13:04:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30074e24

sci-libs/scipy: Version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/scipy/Manifest   |   3 +
 sci-libs/scipy/scipy-1.1.0.ebuild | 141 ++
 2 files changed, 144 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 0ad7b416423..8e51ea760a6 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -10,3 +10,6 @@ DIST scipy-0.19.1.tar.gz 14083805 BLAKE2B 
65369ffec2726a8e16da2d6852a71965277b8d
 DIST scipy-1.0.0-html.zip 47873725 BLAKE2B 
0c6c1070e46e644c9e5700a116e700a0ce8d69c1cfaa0ae63ae34af8844db83a7b61c5d072c54bdc23ef7016440ec6d378a45965778c0e8078113bf1a54bade3
 SHA512 
15d5726ad527bbe3e3e1579d5d2f6031393a2eca8e27adc6f78b16697e9dd67633407a160f461d7a18a8b8bde83201ccf363cdda8f9ca3531b6d6ec1491e0f14
 DIST scipy-1.0.0-ref.pdf 31394378 BLAKE2B 
bc8e590509cfb4bfda9deab40bbc6ebc919e39cb03a5817040ad2e9bbdfd0acc1a1dc194a88ac890a9052b6ddb3bb7b39292d08d925e3d1eb310605ca0589450
 SHA512 
657ef3c643ab61a8452dd85982018eb2210cd1531edd152c9b1c3d8c722f8a45ab1efd03f5bbb3c763a75e70e6d39036a845869ec5135f2aa0445480a074f3e0
 DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 
37cd50c59830c91f0516c72cf11b367670faf5c1fe3fd3cf37bc6f30a4b1f44f7b1d124ff7097c3dcb8c32c3876e166ab1caaa3991a637df5f61bb26b0f52c3f
 SHA512 
7d55c5660ac606933d517171a229b288fd0ea8d9fdd8e30fac3d294545a26b2700c7b100b014a93231c4122dee0f1ddd741c00f5902643a6ccc287cdf581da7a
+DIST scipy-1.1.0-html.zip 49851258 BLAKE2B 
528df7ed8aa8e56662f436f31ee9e1d6d72d6fe962f9f0f6f84b7a2704b53009ce333b2102ec73bb7795110f8a61b18246aab95b1e21055f2b68c0ff2225b7bb
 SHA512 
a03894a22a67c1359ee6206e9e1c9de1f926a7f829f5039f161e78df735708da09b0e51cdad3bf36bfede701d0bc5dc44f8cc0f249b6bfb80c9d8c9fe23aed46
+DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B 
f82807879d5d36d91d74e8983a0f4104bcb4b69cb7787fe5190f73fbbfcb8635a9399686b3c75736d3b0b5dd877b5280ff6fba728520e3b47c13ffc7835f8cd6
 SHA512 
c792064c986dffafa3c5d0741f30715028e655761d099f0fdd472270cf34642b367dfa2178ddceba13043a471e3aeb1db20d65308dbb40c704dab576aaadeb3e
+DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 
477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404
 SHA512 
72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973

diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild 
b/sci-libs/scipy/scipy-1.1.0.ebuild
new file mode 100644
index 000..789041b2c35
--- /dev/null
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+   default
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+   $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+   sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+   $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+   sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+   -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2018-05-17 Thread Thomas Deutschmann
commit: fc82d31d9702f10094b84181edb2a6f7b298b19e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu May 17 13:40:48 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu May 17 13:52:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc82d31d

sci-libs/scipy: x86 stable (bug #645152)

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 sci-libs/scipy/scipy-0.19.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild 
b/sci-libs/scipy/scipy-0.19.1.ebuild
index 1ff5ae43daf..5e43cbe818c 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2018-03-30 Thread Sergei Trofimovich
commit: 35dab343dffb1a1f1c731effd2925cfb3363097c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Mar 30 17:19:37 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Mar 30 17:26:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35dab343

sci-libs/scipy: stable 0.19.1 for ppc64, bug #645152

Package-Manager: Portage-2.3.26, Repoman-2.3.7
RepoMan-Options: --include-arches="ppc64"

 sci-libs/scipy/scipy-0.19.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild 
b/sci-libs/scipy/scipy-0.19.1.ebuild
index bebd032ab09..1ff5ae43daf 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2018-03-29 Thread Sergei Trofimovich
commit: 13a5957cbfa73034af859f5bf75aaba5e7b3f943
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Mar 29 06:17:20 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Mar 29 06:17:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a5957c

sci-libs/scipy: stable 0.19.1 for ppc, bug #645152

Package-Manager: Portage-2.3.26, Repoman-2.3.7
RepoMan-Options: --include-arches="ppc"

 sci-libs/scipy/scipy-0.19.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild 
b/sci-libs/scipy/scipy-0.19.1.ebuild
index aabfdda6e4e..bebd032ab09 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2017-11-30 Thread Marek Szuba
commit: 8456a4c6c8b274a12dc99c9a6baf90c2c3ba4daa
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Nov 30 11:52:14 2017 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Nov 30 11:52:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8456a4c6

sci-libs/scipy: bump to 1.0.0

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sci-libs/scipy/Manifest   |   5 +-
 sci-libs/scipy/scipy-1.0.0.ebuild | 141 ++
 2 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 54fdb6fd5ca..ef876ef407c 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,9 +1,12 @@
 DIST scipy-0.16.1-html.zip 33158474 SHA256 
4183a170f10537f343b0bb6d77abb3c8a6abc3ebfb7e36d90713d852f1e3e5c5 SHA512 
47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a
 WHIRLPOOL 
5289e9ebf32be6ea9c75c022913bcf303743efc3ad010a394c186ea9ecf1f0155ce658b6595d264531c46d27b4e7a9d760ab906698cd18e5fae9c123f08494d2
 DIST scipy-0.16.1-ref.pdf 33916573 SHA256 
4fb994f7706142bb519183bbeca665422b68bd7835e074847c81b75e1c3cd755 SHA512 
eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9
 WHIRLPOOL 
b8703c52e42fdd34b54496a755327fca8a6fe03fbc500497e961a13bbb84dee58b29b7158ba44c5bc317c85103bcf4778381640fb8f1f8e719b1d886fa74fb9e
-DIST scipy-0.16.1.tar.gz 12221561 SHA256 
ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260 SHA512 
1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402e9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
 WHIRLPOOL 
3a3924a41cfb407b0fd91e7dfa2d29a8f6ee7694681fdfe58aefab0e1272e6c1e20c814344abc4ab7c7a8de7f5867819cee73ca624d8cbdcb5db456a8025
+DIST scipy-0.16.1.tar.gz 12221561 BLAKE2B 
8181330d7e83c75ee3e3b88cdc7736fdedbf0eb410fc237a3aa0d45bc5919d79d2bec8876351dee9c331016371becf6a6a1a0b419e50739e717125334d5512bd
 SHA512 
1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402e9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
 DIST scipy-0.18.1-html.zip 32907714 SHA256 
b6118abf9af19318b566521c1944d93f0dec57a7e533641348e5338f790e1279 SHA512 
fc61ce9a9dcc7091da29d35a42cc38074b0c4f5ff81d5ca5dea9c2d32e5e3ee1e8463fcb4e18c931c0c0e4f00410f8cd16d0f81c219fb326edc20d2286866e03
 WHIRLPOOL 
52fb21455beae1b75bb1aa24eed7d2227b52fe44bf81345fd56c12316d7c6887eccc10b551f64464da7fc034e453b06095c80c95f7baeae2374e6f256035cc18
 DIST scipy-0.18.1-ref.pdf 14824115 SHA256 
c5bb8baac66c43450cab24d3fec3a4f626d51568ab311f712446b5946fe7a295 SHA512 
e668420ae3668f459d15cb88765045c89df02f9c73854c8ddce8fe1611973e8c9d40ac49a1db0342282074b1d46b8156bb75430b7df079efd1c3a6ccb4bf2c37
 WHIRLPOOL 
bf36c77059dff97402430df0721bbfe59c6e889d9c202e4a86e7f5b2cd2eb9f32115abcfaf47ceb847579bfe870707a6926d69c2c714d0655e60a9a3f7ee4103
 DIST scipy-0.18.1.tar.gz 13141689 SHA256 
8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e SHA512 
f2ee21c808141d8002f69e48e7cf006e36982b1a7041323a8f4d803a1de3d191ffcc40227aac351dd876c28843de366ef89e9cf84dc106fadac86a3f40491659
 WHIRLPOOL 
977729517cfaed931123484160b9f4e7949dd46c4124757c5cbfe8607f2da9ddc3ad260ac4fcd8b382b8a801a86340405eceb3ad5a48d1a3f23dd0faa0941b7e
 DIST scipy-0.19.1-html.zip 38201310 SHA256 
e123b40d3d550ed55df0f8fbe808ff28f6e4343c3773c553afff508819e800ba SHA512 
7eecef83a92aa99a726a8839e2cdac1171129ba0efcaf8e36b07d6714fde20cce9ce9f676be6b4835845930c49f740cb11ce0d93012d0b8c990e7061bb3afbcc
 WHIRLPOOL 
238e77c60b6356bc08f01687e6dc6ff6f07b1fddc6d30c9af78cb7a37957c5ee155708f2ee8a0644ef6aed5a787082fcf17ff35c7d95d2d8afa87100cedbdbb3
 DIST scipy-0.19.1-ref.pdf 17530855 SHA256 
ebe464947f63e4b1160cb53356cfd1ce02311f5ff022f6cfc278abb5c540441f SHA512 
79718fde0aedb4c9906b37f2d75878719b614268160e645ad69ea797d6baeecaff9153884171906e6b7673b65da997ff4fd245e0f42ab766497ee9c96f4f9fd2
 WHIRLPOOL 
7be151e33a06ee7bd110ab217a5afdee9591d8940d752eb672b0e7a22eea5497d5a8e84e7784dc335f1a926aef7ecca9d5e5f6bd5862a0674ba640ea05614daf
 DIST scipy-0.19.1.tar.gz 14083805 SHA256 
a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6 SHA512 
5c124c44c672dcb53c31f8592fd9f74189f04cb0bade99476a2a6eb4844338e3e9842f27a148b007b7eed25cbfde090a697575a381ebe4ca066abdf54c214203
 WHIRLPOOL 
9d12befdb6504a05fd6c7917fc340726e2a498d8cd5c38d4e0abce8e6d16685c1857ff12f111daa4f4ad955e633746520ef706ff8b674c327685e2dd7790107b
+DIST scipy-1.0.0-html.zip 47873725 BLAKE2B 
0c6c1070e46e644c9e5700a116e700a0ce8d69c1cfaa0ae63ae34af8844db83a7b61c5d072c54bdc23ef7016440ec6d378a45965778c0e8078113bf1a54bade3
 SHA512 
15d5726ad527bbe3e3e1579d5d2f6031393a2eca8e27adc6f78b16697e9dd67633407a160f461d7a18a8b8bde83201ccf363cdda8f9ca3531b6d6ec1491e0f14
+DIST scipy-1.0.0-ref.pdf 31394378 BLAKE2B 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2017-07-04 Thread Sebastien Fabbro
commit: 8ebbe455c3f62c7fb9c4d53d4ec4456f0ea1c0b0
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Tue Jul  4 17:42:42 2017 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Tue Jul  4 17:43:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebbe455

sci-libs/scipy: setuptools version needs to be at least 36.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/scipy/scipy-0.19.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild 
b/sci-libs/scipy/scipy-0.19.1.ebuild
index e79deab952a..864285aeeb4 100644
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -33,6 +33,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
dev-lang/swig
>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-36[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? ( app-arch/unzip )
test? ( dev-python/nose[${PYTHON_USEDEP}] )"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2017-06-27 Thread Sebastien Fabbro
commit: 5f01a4c5b0dab2636f782932827913c47f040cff
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Tue Jun 27 05:15:44 2017 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Wed Jun 28 04:00:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f01a4c5

sci-libs/scipy: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/scipy/Manifest|   3 +
 sci-libs/scipy/scipy-0.19.1.ebuild | 141 +
 2 files changed, 144 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index b465974e30e..54fdb6fd5ca 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -4,3 +4,6 @@ DIST scipy-0.16.1.tar.gz 12221561 SHA256 
ecd1efbb1c038accb0516151d1e6679809c6010
 DIST scipy-0.18.1-html.zip 32907714 SHA256 
b6118abf9af19318b566521c1944d93f0dec57a7e533641348e5338f790e1279 SHA512 
fc61ce9a9dcc7091da29d35a42cc38074b0c4f5ff81d5ca5dea9c2d32e5e3ee1e8463fcb4e18c931c0c0e4f00410f8cd16d0f81c219fb326edc20d2286866e03
 WHIRLPOOL 
52fb21455beae1b75bb1aa24eed7d2227b52fe44bf81345fd56c12316d7c6887eccc10b551f64464da7fc034e453b06095c80c95f7baeae2374e6f256035cc18
 DIST scipy-0.18.1-ref.pdf 14824115 SHA256 
c5bb8baac66c43450cab24d3fec3a4f626d51568ab311f712446b5946fe7a295 SHA512 
e668420ae3668f459d15cb88765045c89df02f9c73854c8ddce8fe1611973e8c9d40ac49a1db0342282074b1d46b8156bb75430b7df079efd1c3a6ccb4bf2c37
 WHIRLPOOL 
bf36c77059dff97402430df0721bbfe59c6e889d9c202e4a86e7f5b2cd2eb9f32115abcfaf47ceb847579bfe870707a6926d69c2c714d0655e60a9a3f7ee4103
 DIST scipy-0.18.1.tar.gz 13141689 SHA256 
8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e SHA512 
f2ee21c808141d8002f69e48e7cf006e36982b1a7041323a8f4d803a1de3d191ffcc40227aac351dd876c28843de366ef89e9cf84dc106fadac86a3f40491659
 WHIRLPOOL 
977729517cfaed931123484160b9f4e7949dd46c4124757c5cbfe8607f2da9ddc3ad260ac4fcd8b382b8a801a86340405eceb3ad5a48d1a3f23dd0faa0941b7e
+DIST scipy-0.19.1-html.zip 38201310 SHA256 
e123b40d3d550ed55df0f8fbe808ff28f6e4343c3773c553afff508819e800ba SHA512 
7eecef83a92aa99a726a8839e2cdac1171129ba0efcaf8e36b07d6714fde20cce9ce9f676be6b4835845930c49f740cb11ce0d93012d0b8c990e7061bb3afbcc
 WHIRLPOOL 
238e77c60b6356bc08f01687e6dc6ff6f07b1fddc6d30c9af78cb7a37957c5ee155708f2ee8a0644ef6aed5a787082fcf17ff35c7d95d2d8afa87100cedbdbb3
+DIST scipy-0.19.1-ref.pdf 17530855 SHA256 
ebe464947f63e4b1160cb53356cfd1ce02311f5ff022f6cfc278abb5c540441f SHA512 
79718fde0aedb4c9906b37f2d75878719b614268160e645ad69ea797d6baeecaff9153884171906e6b7673b65da997ff4fd245e0f42ab766497ee9c96f4f9fd2
 WHIRLPOOL 
7be151e33a06ee7bd110ab217a5afdee9591d8940d752eb672b0e7a22eea5497d5a8e84e7784dc335f1a926aef7ecca9d5e5f6bd5862a0674ba640ea05614daf
+DIST scipy-0.19.1.tar.gz 14083805 SHA256 
a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6 SHA512 
5c124c44c672dcb53c31f8592fd9f74189f04cb0bade99476a2a6eb4844338e3e9842f27a148b007b7eed25cbfde090a697575a381ebe4ca066abdf54c214203
 WHIRLPOOL 
9d12befdb6504a05fd6c7917fc340726e2a498d8cd5c38d4e0abce8e6d16685c1857ff12f111daa4f4ad955e633746520ef706ff8b674c327685e2dd7790107b

diff --git a/sci-libs/scipy/scipy-0.19.1.ebuild 
b/sci-libs/scipy/scipy-0.19.1.ebuild
new file mode 100644
index 000..e79deab952a
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.19.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+   default
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2017-05-20 Thread Justin Lecher
commit: be2a641ab5d1afc318990d19ac7cd58c8c6c3c0d
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri May 19 10:14:52 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat May 20 09:50:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2a641a

sci-libs/scipy: Bump to EAPI 6

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/scipy-.ebuild | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/sci-libs/scipy/scipy-.ebuild b/sci-libs/scipy/scipy-.ebuild
index 40b9ba8c70b..b25250bfad3 100644
--- a/sci-libs/scipy/scipy-.ebuild
+++ b/sci-libs/scipy/scipy-.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
 
-inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib 
multiprocessing toolchain-funcs
+inherit fortran-2 distutils-r1 flag-o-matic git-r3 multiprocessing 
toolchain-funcs
 
 DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="https://www.scipy.org/;
@@ -27,7 +27,7 @@ CDEPEND="
sparse? ( sci-libs/umfpack:0= )"
 DEPEND="${CDEPEND}
dev-lang/swig
-   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   >=dev-python/cython-0.23.4[${PYTHON_USEDEP}]
virtual/pkgconfig
test? ( dev-python/nose[${PYTHON_USEDEP}] )
"
@@ -39,11 +39,6 @@ DOCS=( HACKING.rst.txt THANKS.txt )
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.12.0-blitz.patch
-   "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-)
-
 pc_incdir() {
$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
@@ -78,7 +73,7 @@ python_prepare_all() {
append-fflags -fPIC
 
local libdir="${EPREFIX}"/usr/$(get_libdir)
-   cat >> site.cfg <<-EOF
+   cat >> site.cfg <<-EOF || die
[blas]
include_dirs = $(pc_incdir cblas)
library_dirs = $(pc_libdir cblas blas):${libdir}
@@ -88,21 +83,28 @@ python_prepare_all() {
lapack_libs = $(pc_libs lapack)
EOF
 
+   # Drop hashes to force rebuild of cython based .c code
+   rm cythonize.dat || die
+
distutils-r1_python_prepare_all
 }
 
 python_compile() {
${EPYTHON} tools/cythonize.py || die
-   distutils-r1_python_compile -j $(makeopts_jobs) ${SCIPY_FCONFIG}
+   distutils-r1_python_compile \
+   $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+   ${SCIPY_FCONFIG}
 }
 
 python_test() {
# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
distutils_install_for_testing ${SCIPY_FCONFIG}
cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+   einfo "Run test I"
"${PYTHON}" -c \
'import numpy as np; print("relaxed strides checking:", 
np.ones((10,1),order="C").flags.f_contiguous)' \
|| die
+   einfo "Run test II"
# https://github.com/scipy/scipy/issues/5426
"${EPYTHON}" -c \
"import scipy, sys; r = scipy.test('fast', verbose=2, 
raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2017-05-19 Thread Justin Lecher
commit: f6ddfd23701232a42a3ee04482339b0769495716
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat May 13 16:49:50 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri May 19 08:12:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ddfd23

sci-libs/scipy: Drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/Manifest|   7 --
 sci-libs/scipy/scipy-0.15.1.ebuild | 141 ---
 sci-libs/scipy/scipy-0.16.0.ebuild | 143 
 sci-libs/scipy/scipy-0.17.0.ebuild | 147 -
 4 files changed, 438 deletions(-)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 74ff66727c3..b465974e30e 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,13 +1,6 @@
-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
-DIST scipy-0.16.0.tar.gz 18137295 SHA256 
92592f40097098f3fdbe7f5855d535b29bb16719c2bb59c728bce5e7a28790e0 SHA512 
943f21a2798db124b7e1fb9257064b725702cc6656a90ae10dda285c36166c378304c7d44a571b5ab4ef6819e995ea42e947417e16b2a665dd6db4a460adbd89
 WHIRLPOOL 
ba99d1ea46522814e9181c8991cede8b8a8f4a00b39d3fffc5fa570a52d4ef57044e9af4bb37ea24e733ec6af226e2787a4e88360c53d7bd67a505446725c62f
 DIST scipy-0.16.1-html.zip 33158474 SHA256 
4183a170f10537f343b0bb6d77abb3c8a6abc3ebfb7e36d90713d852f1e3e5c5 SHA512 
47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a
 WHIRLPOOL 
5289e9ebf32be6ea9c75c022913bcf303743efc3ad010a394c186ea9ecf1f0155ce658b6595d264531c46d27b4e7a9d760ab906698cd18e5fae9c123f08494d2
 DIST scipy-0.16.1-ref.pdf 33916573 SHA256 
4fb994f7706142bb519183bbeca665422b68bd7835e074847c81b75e1c3cd755 SHA512 
eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9
 WHIRLPOOL 
b8703c52e42fdd34b54496a755327fca8a6fe03fbc500497e961a13bbb84dee58b29b7158ba44c5bc317c85103bcf4778381640fb8f1f8e719b1d886fa74fb9e
 DIST scipy-0.16.1.tar.gz 12221561 SHA256 
ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260 SHA512 
1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402e9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
 WHIRLPOOL 
3a3924a41cfb407b0fd91e7dfa2d29a8f6ee7694681fdfe58aefab0e1272e6c1e20c814344abc4ab7c7a8de7f5867819cee73ca624d8cbdcb5db456a8025
-DIST scipy-0.17.0-html.zip 27600230 SHA256 
f7e4459d9797d7e83231926a15f667c9337fffa4a3cd6ec90c00c2290e4e0656 SHA512 
30cb76490bb9b539f27bb874d86619e639322fd35c367a5f74057c510e4751a994052fef14916c166bde52c0599388587a50e8967a3d7aa52ada8f1500d8437e
 WHIRLPOOL 
1edf0a97f87fc0f8d1467583a0e834bba86d2535b2f52ef5a3d97fc44016cf9ddb620953a51efe0b865ea029e3cdba147da4708c81e7daba5ce0811f5c5fe721
-DIST scipy-0.17.0-ref.pdf 12206837 SHA256 
67e4e1ff7b2ba5d92dee9fca71c332f686008356c24562e0608edad9c5ad9096 SHA512 
49c7cdb153fb37985becbe13d9f491812bdcc8b98a4ebd71da9ca9519819161010615ec359d10494fc44164e5b961415e5d9d8b361f97b404ec4c6f1d9af2a50
 WHIRLPOOL 
86052b2e2f0a0e88e60e283f2f3cd551a95bda24a7839d71633e5b17da0ae4c025cdcc89a173da45e29728a754488243ac109d63d5ae68039f2f1d3d447a84bc
-DIST scipy-0.17.0.tar.gz 12397929 SHA256 
f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089 SHA512 
de6409d75a3ff3cf1e5391d3b09126f0bc7e1a40a15f9bee244195638fe2f8481fca032896d8534623e6122ff59aaf669664e27ff89cf1b094a5ce7312f220b7
 WHIRLPOOL 
9ebbb6bcdbf107882690998b83ac304889e077e7b866a31c1cd8c615785d5377964d9e4d75ac4589ad7aed7f392e5a59f892b55be5d12da12eb08811f6aaef10
 DIST scipy-0.18.1-html.zip 32907714 SHA256 
b6118abf9af19318b566521c1944d93f0dec57a7e533641348e5338f790e1279 SHA512 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2017-03-19 Thread David Seifert
commit: 1bfbb2fbe5f743bae7d83aa5e5849bf42efa25c7
Author: David Seifert  gentoo  org>
AuthorDate: Sun Mar 19 12:44:15 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Mar 19 12:45:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfbb2fb

sci-libs/scipy: Do not glob on DISTDIR

Bug: https://bugs.gentoo.org/show_bug.cgi?id=612920
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-libs/scipy/scipy-0.15.1.ebuild | 4 ++--
 sci-libs/scipy/scipy-0.16.0.ebuild | 4 ++--
 sci-libs/scipy/scipy-0.16.1.ebuild | 2 +-
 sci-libs/scipy/scipy-0.17.0.ebuild | 2 +-
 sci-libs/scipy/scipy-0.18.1.ebuild | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sci-libs/scipy/scipy-0.15.1.ebuild 
b/sci-libs/scipy/scipy-0.15.1.ebuild
index 21b523cf8c5..e228f7d3d4d 100644
--- a/sci-libs/scipy/scipy-0.15.1.ebuild
+++ b/sci-libs/scipy/scipy-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -123,7 +123,7 @@ sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail 
with ${EPYTHON}"
 
 python_install_all() {
if use doc; then
-   dodoc "${DISTDIR}"/${PN}*pdf
+   dodoc "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf
docinto html
dodoc -r "${WORKDIR}"/html/.
fi

diff --git a/sci-libs/scipy/scipy-0.16.0.ebuild 
b/sci-libs/scipy/scipy-0.16.0.ebuild
index 5cc5d81af80..e404280c580 100644
--- a/sci-libs/scipy/scipy-0.16.0.ebuild
+++ b/sci-libs/scipy/scipy-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -125,7 +125,7 @@ python_test() {
 
 python_install_all() {
if use doc; then
-   dodoc "${DISTDIR}"/${PN}*pdf
+   dodoc "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf
docinto html
dodoc -r "${WORKDIR}"/html/.
fi

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index 2b2cbdd32e2..dd5908fb231 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -130,7 +130,7 @@ python_test() {
 
 python_install_all() {
if use doc; then
-   dodoc "${DISTDIR}"/${PN}*pdf
+   dodoc "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf
docinto html
dodoc -r "${WORKDIR}"/html/.
fi

diff --git a/sci-libs/scipy/scipy-0.17.0.ebuild 
b/sci-libs/scipy/scipy-0.17.0.ebuild
index 43d3e39d637..ac2f5ad71e9 100644
--- a/sci-libs/scipy/scipy-0.17.0.ebuild
+++ b/sci-libs/scipy/scipy-0.17.0.ebuild
@@ -131,7 +131,7 @@ python_test() {
 
 python_install_all() {
use doc && \
-   local DOCS=( "${DISTDIR}"/${PN}*pdf ) \
+   local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
local HTML_DOCS=( "${WORKDIR}"/html/. )
distutils-r1_python_install_all
 }

diff --git a/sci-libs/scipy/scipy-0.18.1.ebuild 
b/sci-libs/scipy/scipy-0.18.1.ebuild
index 44a6f8669f1..c1d9ea57af2 100644
--- a/sci-libs/scipy/scipy-0.18.1.ebuild
+++ b/sci-libs/scipy/scipy-0.18.1.ebuild
@@ -130,7 +130,7 @@ python_test() {
 
 python_install_all() {
use doc && \
-   local DOCS=( "${DISTDIR}"/${PN}*pdf ) \
+   local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
local HTML_DOCS=( "${WORKDIR}"/html/. )
distutils-r1_python_install_all
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2017-03-10 Thread Zac Medico
commit: 0320df4f6695aa4ee61a19c0d364bfa074b01dc5
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Mar 11 01:55:29 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Mar 11 01:58:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0320df4f

sci-libs/scipy: Add python3_6 to PYTHON_COMPAT

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sci-libs/scipy/scipy-0.16.1.ebuild | 4 ++--
 sci-libs/scipy/scipy-0.17.0.ebuild | 4 ++--
 sci-libs/scipy/scipy-0.18.1.ebuild | 4 ++--
 sci-libs/scipy/scipy-.ebuild   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index 68fba94d183..2b2cbdd32e2 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}

diff --git a/sci-libs/scipy/scipy-0.17.0.ebuild 
b/sci-libs/scipy/scipy-0.17.0.ebuild
index c2e70138023..43d3e39d637 100644
--- a/sci-libs/scipy/scipy-0.17.0.ebuild
+++ b/sci-libs/scipy/scipy-0.17.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}

diff --git a/sci-libs/scipy/scipy-0.18.1.ebuild 
b/sci-libs/scipy/scipy-0.18.1.ebuild
index a8bad00c2fd..44a6f8669f1 100644
--- a/sci-libs/scipy/scipy-0.18.1.ebuild
+++ b/sci-libs/scipy/scipy-0.18.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}

diff --git a/sci-libs/scipy/scipy-.ebuild b/sci-libs/scipy/scipy-.ebuild
index 0ad0a434b8b..40b9ba8c70b 100644
--- a/sci-libs/scipy/scipy-.ebuild
+++ b/sci-libs/scipy/scipy-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2016-10-08 Thread David Seifert
commit: 5d36e49753e6a6b13250384226f3f6c93f9a0d0d
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct  8 11:52:21 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct  8 12:12:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d36e497

sci-libs/scipy: Version bump to 0.18.1

Package-Manager: portage-2.3.1

 sci-libs/scipy/Manifest|   3 +
 sci-libs/scipy/scipy-0.18.1.ebuild | 147 +
 2 files changed, 150 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 615f27d..74ff667 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -8,3 +8,6 @@ DIST scipy-0.16.1.tar.gz 12221561 SHA256 
ecd1efbb1c038accb0516151d1e6679809c6010
 DIST scipy-0.17.0-html.zip 27600230 SHA256 
f7e4459d9797d7e83231926a15f667c9337fffa4a3cd6ec90c00c2290e4e0656 SHA512 
30cb76490bb9b539f27bb874d86619e639322fd35c367a5f74057c510e4751a994052fef14916c166bde52c0599388587a50e8967a3d7aa52ada8f1500d8437e
 WHIRLPOOL 
1edf0a97f87fc0f8d1467583a0e834bba86d2535b2f52ef5a3d97fc44016cf9ddb620953a51efe0b865ea029e3cdba147da4708c81e7daba5ce0811f5c5fe721
 DIST scipy-0.17.0-ref.pdf 12206837 SHA256 
67e4e1ff7b2ba5d92dee9fca71c332f686008356c24562e0608edad9c5ad9096 SHA512 
49c7cdb153fb37985becbe13d9f491812bdcc8b98a4ebd71da9ca9519819161010615ec359d10494fc44164e5b961415e5d9d8b361f97b404ec4c6f1d9af2a50
 WHIRLPOOL 
86052b2e2f0a0e88e60e283f2f3cd551a95bda24a7839d71633e5b17da0ae4c025cdcc89a173da45e29728a754488243ac109d63d5ae68039f2f1d3d447a84bc
 DIST scipy-0.17.0.tar.gz 12397929 SHA256 
f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089 SHA512 
de6409d75a3ff3cf1e5391d3b09126f0bc7e1a40a15f9bee244195638fe2f8481fca032896d8534623e6122ff59aaf669664e27ff89cf1b094a5ce7312f220b7
 WHIRLPOOL 
9ebbb6bcdbf107882690998b83ac304889e077e7b866a31c1cd8c615785d5377964d9e4d75ac4589ad7aed7f392e5a59f892b55be5d12da12eb08811f6aaef10
+DIST scipy-0.18.1-html.zip 32907714 SHA256 
b6118abf9af19318b566521c1944d93f0dec57a7e533641348e5338f790e1279 SHA512 
fc61ce9a9dcc7091da29d35a42cc38074b0c4f5ff81d5ca5dea9c2d32e5e3ee1e8463fcb4e18c931c0c0e4f00410f8cd16d0f81c219fb326edc20d2286866e03
 WHIRLPOOL 
52fb21455beae1b75bb1aa24eed7d2227b52fe44bf81345fd56c12316d7c6887eccc10b551f64464da7fc034e453b06095c80c95f7baeae2374e6f256035cc18
+DIST scipy-0.18.1-ref.pdf 14824115 SHA256 
c5bb8baac66c43450cab24d3fec3a4f626d51568ab311f712446b5946fe7a295 SHA512 
e668420ae3668f459d15cb88765045c89df02f9c73854c8ddce8fe1611973e8c9d40ac49a1db0342282074b1d46b8156bb75430b7df079efd1c3a6ccb4bf2c37
 WHIRLPOOL 
bf36c77059dff97402430df0721bbfe59c6e889d9c202e4a86e7f5b2cd2eb9f32115abcfaf47ceb847579bfe870707a6926d69c2c714d0655e60a9a3f7ee4103
+DIST scipy-0.18.1.tar.gz 13141689 SHA256 
8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e SHA512 
f2ee21c808141d8002f69e48e7cf006e36982b1a7041323a8f4d803a1de3d191ffcc40227aac351dd876c28843de366ef89e9cf84dc106fadac86a3f40491659
 WHIRLPOOL 
977729517cfaed931123484160b9f4e7949dd46c4124757c5cbfe8607f2da9ddc3ad260ac4fcd8b382b8a801a86340405eceb3ad5a48d1a3f23dd0faa0941b7e

diff --git a/sci-libs/scipy/scipy-0.18.1.ebuild 
b/sci-libs/scipy/scipy-0.18.1.ebuild
new file mode 100644
index ..6a86dca
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.18.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.12.0-blitz.patch
+   "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+)
+
+src_unpack() {
+   default
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2016-03-19 Thread Agostino Sarubbo
commit: 86c502dcf6d622c2a7c58c670453f1eef26832d4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar 16 11:49:32 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar 16 11:51:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c502dc

sci-libs/scipy: ppc stable wrt bug #572912

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/scipy/scipy-0.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index f61a0c1..9b6e7b6 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2016-02-14 Thread Agostino Sarubbo
commit: a920ba8ef0a82bcb47d841e99cafd7c953debfea
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb 14 10:10:04 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb 14 10:11:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a920ba8e

sci-libs/scipy: x86 stable wrt bug #572912

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/scipy/scipy-0.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index ba26692..f61a0c1 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2016-01-29 Thread Justin Lecher
commit: 6628308541c73537f87e1c3cdb21fb85edaa27fa
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Jan 29 09:08:25 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Jan 29 09:09:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66283085

sci-libs/scipy: Build sequential if python3.5 is involved

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573148

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/scipy-0.17.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.17.0.ebuild 
b/sci-libs/scipy/scipy-0.17.0.ebuild
index 5f5776b..0982223 100644
--- a/sci-libs/scipy/scipy-0.17.0.ebuild
+++ b/sci-libs/scipy/scipy-0.17.0.ebuild
@@ -109,7 +109,9 @@ python_prepare_all() {
 
 python_compile() {
${EPYTHON} tools/cythonize.py || die
-   distutils-r1_python_compile -j $(makeopts_jobs) ${SCIPY_FCONFIG}
+   distutils-r1_python_compile \
+   $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+   ${SCIPY_FCONFIG}
 }
 
 python_test() {



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2016-01-26 Thread Agostino Sarubbo
commit: 0236381abeca392bed3f9aeb4c60aab3741c3eea
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan 26 16:41:52 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan 26 16:41:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0236381a

sci-libs/scipy: amd64 stable wrt bug #572912

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/scipy/scipy-0.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index 289f462..ba26692 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 
 CDEPEND="
>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2016-01-25 Thread Justin Lecher
commit: 001ce4c537798947e7fd57552274c43b6bc4d4b3
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jan 25 19:40:46 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jan 25 19:45:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001ce4c5

sci-libs/scipy: Version Bump

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/Manifest|   3 +
 sci-libs/scipy/scipy-0.17.0.ebuild | 146 +
 2 files changed, 149 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 0b3e529..615f27d 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -5,3 +5,6 @@ DIST scipy-0.16.0.tar.gz 18137295 SHA256 
92592f40097098f3fdbe7f5855d535b29bb1671
 DIST scipy-0.16.1-html.zip 33158474 SHA256 
4183a170f10537f343b0bb6d77abb3c8a6abc3ebfb7e36d90713d852f1e3e5c5 SHA512 
47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a
 WHIRLPOOL 
5289e9ebf32be6ea9c75c022913bcf303743efc3ad010a394c186ea9ecf1f0155ce658b6595d264531c46d27b4e7a9d760ab906698cd18e5fae9c123f08494d2
 DIST scipy-0.16.1-ref.pdf 33916573 SHA256 
4fb994f7706142bb519183bbeca665422b68bd7835e074847c81b75e1c3cd755 SHA512 
eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9
 WHIRLPOOL 
b8703c52e42fdd34b54496a755327fca8a6fe03fbc500497e961a13bbb84dee58b29b7158ba44c5bc317c85103bcf4778381640fb8f1f8e719b1d886fa74fb9e
 DIST scipy-0.16.1.tar.gz 12221561 SHA256 
ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260 SHA512 
1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402e9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
 WHIRLPOOL 
3a3924a41cfb407b0fd91e7dfa2d29a8f6ee7694681fdfe58aefab0e1272e6c1e20c814344abc4ab7c7a8de7f5867819cee73ca624d8cbdcb5db456a8025
+DIST scipy-0.17.0-html.zip 27600230 SHA256 
f7e4459d9797d7e83231926a15f667c9337fffa4a3cd6ec90c00c2290e4e0656 SHA512 
30cb76490bb9b539f27bb874d86619e639322fd35c367a5f74057c510e4751a994052fef14916c166bde52c0599388587a50e8967a3d7aa52ada8f1500d8437e
 WHIRLPOOL 
1edf0a97f87fc0f8d1467583a0e834bba86d2535b2f52ef5a3d97fc44016cf9ddb620953a51efe0b865ea029e3cdba147da4708c81e7daba5ce0811f5c5fe721
+DIST scipy-0.17.0-ref.pdf 12206837 SHA256 
67e4e1ff7b2ba5d92dee9fca71c332f686008356c24562e0608edad9c5ad9096 SHA512 
49c7cdb153fb37985becbe13d9f491812bdcc8b98a4ebd71da9ca9519819161010615ec359d10494fc44164e5b961415e5d9d8b361f97b404ec4c6f1d9af2a50
 WHIRLPOOL 
86052b2e2f0a0e88e60e283f2f3cd551a95bda24a7839d71633e5b17da0ae4c025cdcc89a173da45e29728a754488243ac109d63d5ae68039f2f1d3d447a84bc
+DIST scipy-0.17.0.tar.gz 12397929 SHA256 
f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089 SHA512 
de6409d75a3ff3cf1e5391d3b09126f0bc7e1a40a15f9bee244195638fe2f8481fca032896d8534623e6122ff59aaf669664e27ff89cf1b094a5ce7312f220b7
 WHIRLPOOL 
9ebbb6bcdbf107882690998b83ac304889e077e7b866a31c1cd8c615785d5377964d9e4d75ac4589ad7aed7f392e5a59f892b55be5d12da12eb08811f6aaef10

diff --git a/sci-libs/scipy/scipy-0.17.0.ebuild 
b/sci-libs/scipy/scipy-0.17.0.ebuild
new file mode 100644
index 000..5f5776b
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.17.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit eutils fortran-2 distutils-r1 flag-o-matic multilib multiprocessing 
toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? ( dev-python/nose[${PYTHON_USEDEP}] )
+   "
+
+RDEPEND="${CDEPEND}
+   dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.12.0-blitz.patch
+   "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+)
+src_unpack() {
+   unpack ${P}.tar.gz
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+  

[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2016-01-25 Thread Justin Lecher
commit: 1f81a793c50b740fd615b1be044d8dc569742684
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jan 25 19:44:44 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jan 25 19:45:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f81a793

sci-libs/scipy: Propargate changes to live ebuild

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/scipy-.ebuild | 32 ++--
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/sci-libs/scipy/scipy-.ebuild b/sci-libs/scipy/scipy-.ebuild
index 70f560d..a128691 100644
--- a/sci-libs/scipy/scipy-.ebuild
+++ b/sci-libs/scipy/scipy-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
 
-inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib 
toolchain-funcs
+inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib 
multiprocessing toolchain-funcs
 
 DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="https://www.scipy.org/;
@@ -21,7 +21,7 @@ KEYWORDS=""
 IUSE="sparse test"
 
 CDEPEND="
-   >=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]
+   >=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
sci-libs/arpack:0=
virtual/cblas
virtual/lapack
@@ -40,6 +40,11 @@ DOCS=( HACKING.rst.txt THANKS.txt )
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.12.0-blitz.patch
+   "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+)
+
 pc_incdir() {
$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
@@ -84,16 +89,12 @@ python_prepare_all() {
lapack_libs = $(pc_libs lapack)
EOF
 
-   local PATCHES=(
-   "${FILESDIR}"/${PN}-0.12.0-blitz.patch
-   "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-   )
distutils-r1_python_prepare_all
 }
 
 python_compile() {
${EPYTHON} tools/cythonize.py || die
-   distutils-r1_python_compile ${SCIPY_FCONFIG}
+   distutils-r1_python_compile -j $(makeopts_jobs) ${SCIPY_FCONFIG}
 }
 
 python_test() {
@@ -103,18 +104,13 @@ python_test() {
"${PYTHON}" -c \
'import numpy as np; print("relaxed strides checking:", 
np.ones((10,1),order="C").flags.f_contiguous)' \
|| die
+   # https://github.com/scipy/scipy/issues/5426
"${EPYTHON}" -c \
-   "import scipy, sys; r = scipy.test('fast',verbose=2); 
sys.exit(0 if r.wasSuccessful() else 1)" \
+   "import scipy, sys; r = scipy.test('fast', verbose=2, 
raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-   if use doc; then
-   dodoc "${DISTDIR}"/${PN}*pdf
-   docinto html
-   dodoc -r "${WORKDIR}"/html/.
-   fi
-   distutils-r1_python_install_all
+#  "${EPYTHON}" -c \
+#  "import scipy, sys; r = scipy.test('fast',verbose=2); 
sys.exit(0 if r.wasSuccessful() else 1)" \
+#  || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2015-11-11 Thread Justin Lecher
commit: 46f159b30e36166c1db4dc3b0320be91b4329d99
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Nov 11 17:20:50 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Nov 11 17:27:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f159b3

sci-libs/scipy: Depend on threading support in python

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/scipy-0.15.1.ebuild | 1 +
 sci-libs/scipy/scipy-0.16.0.ebuild | 1 +
 sci-libs/scipy/scipy-0.16.1.ebuild | 1 +
 sci-libs/scipy/scipy-.ebuild   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/sci-libs/scipy/scipy-0.15.1.ebuild 
b/sci-libs/scipy/scipy-0.15.1.ebuild
index f2da4ab..58bfed5 100644
--- a/sci-libs/scipy/scipy-0.15.1.ebuild
+++ b/sci-libs/scipy/scipy-0.15.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=0.15.1
 

diff --git a/sci-libs/scipy/scipy-0.16.0.ebuild 
b/sci-libs/scipy/scipy-0.16.0.ebuild
index 2546eb4..862c1b8 100644
--- a/sci-libs/scipy/scipy-0.16.0.ebuild
+++ b/sci-libs/scipy/scipy-0.16.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=0.15.1
 

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index 9780b43..289f462 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
 

diff --git a/sci-libs/scipy/scipy-.ebuild b/sci-libs/scipy/scipy-.ebuild
index 283cf57..70f560d 100644
--- a/sci-libs/scipy/scipy-.ebuild
+++ b/sci-libs/scipy/scipy-.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2015-10-31 Thread Justin Lecher
commit: 81a9e5bc3fae689a5d0e3ae28c31791b546b2682
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Oct 31 10:20:09 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Oct 31 10:25:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a9e5bc

sci-libs/scipy: Correct tests to not fail on warning

Github: scipy/scipy#5426

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/scipy-0.16.1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index de2289b..07d9730 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -119,9 +119,13 @@ python_test() {
"${PYTHON}" -c \
'import numpy as np; print("relaxed strides checking:", 
np.ones((10,1),order="C").flags.f_contiguous)' \
|| die
+   # https://github.com/scipy/scipy/issues/5426
"${EPYTHON}" -c \
-   "import scipy, sys; r = scipy.test('fast',verbose=2); 
sys.exit(0 if r.wasSuccessful() else 1)" \
+   "import scipy, sys; r = scipy.test('fast', verbose=2, 
raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
|| die "Tests fail with ${EPYTHON}"
+#  "${EPYTHON}" -c \
+#  "import scipy, sys; r = scipy.test('fast',verbose=2); 
sys.exit(0 if r.wasSuccessful() else 1)" \
+#  || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2015-10-30 Thread Justin Lecher
commit: f303d544c6909f32abe417cf93e560a179d7eb50
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Oct 30 10:19:18 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Oct 30 12:03:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f303d544

sci-libs/scipy: Revert addition of non existing patch

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/scipy-0.16.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index 7e74f6e..de2289b 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -103,7 +103,6 @@ python_prepare_all() {
"${FILESDIR}"/${PN}-0.12.0-blitz.patch
"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
"${FILESDIR}"/${P}-glibc-2.22-backport.patch
-   "${FILESDIR}"/${P}-test-fix-backport.patch
)
distutils-r1_python_prepare_all
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2015-10-29 Thread Justin Lecher
commit: 1722770334dd66d6d560dea77681814e86324b4a
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Oct 29 08:06:58 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Oct 29 08:20:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17227703

sci-libs/scipy: Add live ebuild for testing

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/scipy-0.16.1.ebuild |  1 +
 .../{scipy-0.16.1.ebuild => scipy-.ebuild} | 25 --
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index de2289b..7e74f6e 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -103,6 +103,7 @@ python_prepare_all() {
"${FILESDIR}"/${PN}-0.12.0-blitz.patch
"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
"${FILESDIR}"/${P}-glibc-2.22-backport.patch
+   "${FILESDIR}"/${P}-test-fix-backport.patch
)
distutils-r1_python_prepare_all
 }

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-.ebuild
similarity index 82%
copy from sci-libs/scipy/scipy-0.16.1.ebuild
copy to sci-libs/scipy/scipy-.ebuild
index de2289b..43f0f3e 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-.ebuild
@@ -8,21 +8,16 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 DOC_PV=${PV}
 
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
+inherit eutils fortran-2 distutils-r1 flag-o-matic git-r3 multilib 
toolchain-funcs
 
 DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="https://www.scipy.org/;
-SRC_URI="
-   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-   doc? (
-   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
-   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
-   )"
+EGIT_REPO_URI="https://github.com/scipy/scipy.git;
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS=""
+IUSE="sparse test"
 
 CDEPEND="
>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]
@@ -34,7 +29,6 @@ DEPEND="${CDEPEND}
dev-lang/swig
>=dev-python/cython-0.22[${PYTHON_USEDEP}]
virtual/pkgconfig
-   doc? ( app-arch/unzip )
test? ( dev-python/nose[${PYTHON_USEDEP}] )
"
 
@@ -45,13 +39,6 @@ DOCS=( HACKING.rst.txt THANKS.txt )
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
-src_unpack() {
-   unpack ${P}.tar.gz
-   if use doc; then
-   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-   fi
-}
-
 pc_incdir() {
$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
@@ -96,13 +83,9 @@ python_prepare_all() {
lapack_libs = $(pc_libs lapack)
EOF
 
-   # Drop hashes to force rebuild of cython based .c code
-   rm cythonize.dat || die
-
local PATCHES=(
"${FILESDIR}"/${PN}-0.12.0-blitz.patch
"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-   "${FILESDIR}"/${P}-glibc-2.22-backport.patch
)
distutils-r1_python_prepare_all
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/files/, sci-libs/scipy/

2015-10-26 Thread Justin Lecher
commit: a65ec6d62c8bc1c85685e0c1dd0eda12134b177f
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Oct 26 08:16:59 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Oct 26 08:17:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65ec6d6

sci-libs/scipy: Backport fix for glibc-2.22

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 .../files/scipy-0.16.1-glibc-2.22-backport.patch   | 30 ++
 sci-libs/scipy/scipy-0.16.1.ebuild |  1 +
 2 files changed, 31 insertions(+)

diff --git a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch 
b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
new file mode 100644
index 000..791d67f
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
@@ -0,0 +1,30 @@
+From 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers 
+Date: Sat, 24 Oct 2015 18:17:04 +0200
+Subject: [PATCH] TST: fix issue with a ctypes test for integrate on Fedora. 
+ Closes gh-5370
+
+---
+ scipy/integrate/tests/test_quadpack.py | 9 -
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/scipy/integrate/tests/test_quadpack.py 
b/scipy/integrate/tests/test_quadpack.py
+index c3a417c..f384c77 100644
+--- a/scipy/integrate/tests/test_quadpack.py
 b/scipy/integrate/tests/test_quadpack.py
+@@ -42,7 +42,14 @@ def setUp(self):
+ file = 'libm.dylib'
+ else:
+ file = 'libm.so'
+-self.lib = ctypes.CDLL(file)
++
++try:
++self.lib = ctypes.CDLL(file)
++except OSError:
++# This test doesn't work on some Linux platforms (Fedora for
++# example) that put an ld script in libm.so - see gh-5370
++self.skipTest("Ctypes can't import libm.so")
++
+ restype = ctypes.c_double
+ argtypes = (ctypes.c_double,)
+ for name in ['sin', 'cos', 'tan']:

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
index 33610d6..de2289b 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -102,6 +102,7 @@ python_prepare_all() {
local PATCHES=(
"${FILESDIR}"/${PN}-0.12.0-blitz.patch
"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+   "${FILESDIR}"/${P}-glibc-2.22-backport.patch
)
distutils-r1_python_prepare_all
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scipy/

2015-10-25 Thread Justin Lecher
commit: f7fa28854faef51e8d66fdf1c51395752a285640
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Oct 25 18:09:55 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Oct 25 18:10:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7fa2885

sci-libs/scipy: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/scipy/Manifest|   3 +
 sci-libs/scipy/scipy-0.16.1.ebuild | 143 +
 2 files changed, 146 insertions(+)

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 53817b2..0b3e529 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -2,3 +2,6 @@ DIST scipy-0.15.1-html.zip 24956050 SHA256 
c27d3656ffed1b988890cf192c692f646b00d
 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
 DIST scipy-0.16.0.tar.gz 18137295 SHA256 
92592f40097098f3fdbe7f5855d535b29bb16719c2bb59c728bce5e7a28790e0 SHA512 
943f21a2798db124b7e1fb9257064b725702cc6656a90ae10dda285c36166c378304c7d44a571b5ab4ef6819e995ea42e947417e16b2a665dd6db4a460adbd89
 WHIRLPOOL 
ba99d1ea46522814e9181c8991cede8b8a8f4a00b39d3fffc5fa570a52d4ef57044e9af4bb37ea24e733ec6af226e2787a4e88360c53d7bd67a505446725c62f
+DIST scipy-0.16.1-html.zip 33158474 SHA256 
4183a170f10537f343b0bb6d77abb3c8a6abc3ebfb7e36d90713d852f1e3e5c5 SHA512 
47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a
 WHIRLPOOL 
5289e9ebf32be6ea9c75c022913bcf303743efc3ad010a394c186ea9ecf1f0155ce658b6595d264531c46d27b4e7a9d760ab906698cd18e5fae9c123f08494d2
+DIST scipy-0.16.1-ref.pdf 33916573 SHA256 
4fb994f7706142bb519183bbeca665422b68bd7835e074847c81b75e1c3cd755 SHA512 
eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9
 WHIRLPOOL 
b8703c52e42fdd34b54496a755327fca8a6fe03fbc500497e961a13bbb84dee58b29b7158ba44c5bc317c85103bcf4778381640fb8f1f8e719b1d886fa74fb9e
+DIST scipy-0.16.1.tar.gz 12221561 SHA256 
ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260 SHA512 
1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402e9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
 WHIRLPOOL 
3a3924a41cfb407b0fd91e7dfa2d29a8f6ee7694681fdfe58aefab0e1272e6c1e20c814344abc4ab7c7a8de7f5867819cee73ca624d8cbdcb5db456a8025

diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild 
b/sci-libs/scipy/scipy-0.16.1.ebuild
new file mode 100644
index 000..33610d6
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+DOC_PV=${PV}
+
+inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/;
+SRC_URI="
+   mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+   doc? (
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip 
-> ${PN}-${DOC_PV}-html.zip
+   https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf 
-> ${PN}-${DOC_PV}-ref.pdf
+   )"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+
+CDEPEND="
+   >=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]
+   sci-libs/arpack:0=
+   virtual/cblas
+   virtual/lapack
+   sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+   dev-lang/swig
+   >=dev-python/cython-0.22[${PYTHON_USEDEP}]
+   virtual/pkgconfig
+   doc? ( app-arch/unzip )
+   test? ( dev-python/nose[${PYTHON_USEDEP}] )
+   "
+
+RDEPEND="${CDEPEND}
+   virtual/python-imaging[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+   unpack ${P}.tar.gz
+   if use doc; then
+   unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+   fi
+}
+
+pc_incdir() {
+   $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+   sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}