Version Bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

3 files changed, 166 insertions, 16 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index e752b69a1792..a9671bf6812b 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.130 2015/06/23 06:21:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.131 2015/07/29 09:54:50 jlec Exp $
+
+*scipy-0.16.0 (29 Jul 2015)
+
+  29 Jul 2015; Justin Lecher <jlec@gentoo.org> +scipy-0.16.0.ebuild:
+  Version Bump
 
   23 Jun 2015; Justin Lecher <jlec@gentoo.org>
   -files/scipy-0.12.0-cephes-missing-include.patch,
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 7be8dccefc3a..3bc17936d64b 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -6,25 +6,27 @@ AUX scipy-0.12.0-restore-sys-argv.patch 483 SHA256 c00daf7d49c042972d2c59bf645c2
 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
 EBUILD scipy-0.15.1.ebuild 3887 SHA256 f5433b5b0bfffebd0ad990b37951dd4ab8869c3523fc6f6d3b7b77e65437adb2 SHA512 8f07b5172dd5b6acd17ca6244cbd83d7a55195831d1a081fa519434f5b172af8d6819079107cbcd7fc3db6d49ba11313df345059f5f8b49b309702dbafb90aa8 WHIRLPOOL 4f95e57b38c3b1eaf2f4f59f6720c103fadc99a028d2ff1dccd15e4caac4aee808461de54dc5b8ffcc8111e4817869e5ded4a243b4c1427223ac70b35bad072d
-MISC ChangeLog 22999 SHA256 f0106701319d602d2b73fe06303fec82f18016171e88fc26a3d1d3379f0129b5 SHA512 f16c6e9be36419ff8b7ed5d67f396cf55a497b8a42d5d7c8f85fff495dcfa9d02d2ff6278145c34c043c19b400cab1fb8d8ac757df4fb93caa4617d5bc4b38ea WHIRLPOOL a0df272137d650fe4351b96943f07d2b25b7876a4ece85f15b965bc3e325856440533c2443dba12a0b6b39161d6c866f59ecd921440f0bcc2e0205b7927c2651
+EBUILD scipy-0.16.0.ebuild 4040 SHA256 9af8d5d2301cf26291746dd84a8c1175568a138f8fdc53e553528e4af6a741af SHA512 5ee504ba440f32976325fd5b16ba3cd2c38188c076614938ab33387d7ea2226dd1bed773537dc5ae9f959dd9867fc743eaae96f0b434b1ad853438ee140caece WHIRLPOOL 4b7375a54881180986fca9642ac11f3a0f227ba25fae60a35715c4186c7c9dc439dfcfb33eb6d79329e841d53b6eb2966ed56ceb40030d2e31a5fafd374729ac
+MISC ChangeLog 23113 SHA256 7905af4d8bc5a9bbb189f25c765ab2073c1b82ce0b2f3a2a69b15e353d9a0dc8 SHA512 0a561932192fa37a7e4ff3ca1e1e3b43292d1949553ad6cf88eade9d2165beb827ba4d2d8b04bbb3c977fd6003d2130268adb7cfe4d994c98cc47d83bd4893bb WHIRLPOOL b96d6f0a7b00f3e8c13715e0adb2f37a83b556e22c8e7ce7b1dd00ca03a46af74497261549e718f2900b5a21a6e0ac36575ba6598f44bb856e33a8eeb60fcdcf
 MISC metadata.xml 830 SHA256 5df444cebcfa9cf7b27e22f15f8ab7ec772a3f23ed8197da4e3f9f5fac2ecdc2 SHA512 5a4a62650eac8f5b43756c4c149e3c53440dc611b4f485903c8722878e0fdfe5b58da7c7ae587bca772a8392e880d512391813c6dd4176f59e403cea414515cb WHIRLPOOL 8c521f144d90d04b71e8efbd5c6551f25383d7fc08e61223a85ea97e607a5b784d3fffa24d5b1595f964fe7d37ae7835895ef0a20293f823a2583bb268d13ca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJViPrZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVuKLrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDOwP/2vHc7yfBPSSC8zRg+r6igPO
-zIYVj5SebLpMZi8MqeFSJTEdQCuKO9pp1uL5L0GTZ1cMYMzhUE616TVGFoIqIcq+
-C0f3qmH9s05/kEvx/ToizZr1mAJljjfpsqw17jGniOA0EgS4WwNtNcgyUnt7owa7
-UoH7vlhlKPl1703j+r5q2eJFkFS4jiWf/x0rEwznVo9DB/wcJdzOWUt9/Lp8WZva
-xngXdNH9PeDJGie98joBctI/GHEwVg0kpzl7EILt4Px5k0SsyZRqtb5PF+g+r365
-x9aWWSb1NJLL0jcL2U9nnMwT2lRPo1UBrQCq/Rg6yVsNCP8GwHQXwjWcSOjjbSGo
-e0/EoBpS27f3Tw+VHMxihEzMx5oOe7L9luCvSISxRWZyccP6khk5UisacayvJIP5
-lCJ1YAx016RcDxStwo3v7Y5c5pi1JeUnHW14CuGapQWvxmGmi6fUqTBSBPgaQmre
-fI39NpuLsy0QEcY0/se1VcpfQdwJ1UQsC879VH1ALomjYCFG3euxONjXGerN8cwi
-bT3eII9fQQfQfdrxxsRCSdrum0Z8EWdF6GbxKxGjUWC6nU+iaMIR4XZ817RhkMPG
-wBnMDC3fYhB+2U926OEa2GXslDWf7aeMM6kTydKwJQTj5/UJtIq5WMB/m/OoNMXJ
-OrSOYcNork3nDgTacEXF
-=Mj2I
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJCkQAJFFusW9gjpCIP9KRZR51308
+i5SISsksM3Rivg+UmKD8S0PywFEIMi0WTyrGw8G7gwhwlJKBWga1FKw5D68Ok9Nj
+/JRFbqmNmf6Nk8X3lG04Rca5PXFy8Abx09Ycmao5DkNxzcF/fPmlBbc1Az2rETcm
+/xhDbu7DYO4BT55vZ/EPlUNOqr7/by/UvTPaFrA9ZfyduB0c1c1m2dw2L7TIQqWJ
+35fHxkoe7hb/rDoBFhl6gK3CSSr99G+UkTXz1WZ8/zxDPW0irEhC0d35NLh01F10
+KMiGclcMxmGMXWJi71oc5kf5rUYy1D4PIIpx/MYiAA8lyJdooSriDz3j4lJZQ+pN
+eHIxbrYQq7MooqRVtfON35FG4jt/Z0CbJabrbmUNe36we46RnS+PG6JlsA4wMK7j
+gQvEMViIw70dpNZmhQXJm3ARmunGLGAt+VyBh++MC1QRJMKJWTXLFDgV6y5NYW7X
+rI6akQJACN0d3ut+u7oWKi1uy6ddBv179YK+6W9cS8HPPena0/MBIDn6Vz+J2dCV
+bZvEa1PCXxXRAIN6fbf+YkQOnmgNr7WwjRD0oyYzJoSXpKKIWc03HCAaJJVnitUW
+ke1E6R0blLJibc/lf9tROUf0QueyW2X/A374Yj1f3zuB/+YPhxPPVvdf6/0V4bcg
+e17SQKvv49BUNi/5RdAU
+=CVCR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.16.0.ebuild b/sci-libs/scipy/scipy-0.16.0.ebuild
new file mode 100644
index 000000000000..5268e509c70a
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.16.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.16.0.ebuild,v 1.1 2015/07/29 09:54:50 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+DOC_PV=0.15.1
+
+inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="http://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		http://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|^:||'
+}
+
+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
+		[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
+
+	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}
+}
+
+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(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
+}
+
+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"
+}