Version bump

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

3 files changed, 148 insertions, 17 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index e551b8d5cf1a..52eae31cc5a8 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.101 2013/10/23 17:40:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.102 2013/10/28 22:42:53 bicatali Exp $
+
+*scipy-0.13.0 (28 Oct 2013)
+
+  28 Oct 2013; Sébastien Fabbro <bicatali@gentoo.org> +scipy-0.13.0.ebuild:
+  Version bump
 
   23 Oct 2013; Agostino Sarubbo <ago@gentoo.org> scipy-0.12.1.ebuild:
   Stable for ppc64, wrt bug #488048
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 1f56b656cb8f..8e79ee96d0c0 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX scipy-0.12.0-blitz.patch 731 SHA256 4f487a746aa62a39cdab9381dd4191cef0ccb912ed2e22065a7de02b85c8a269 SHA512 a788d08d34e13b02a0ec8127fd7918786cd26376ef5160f4acde585c6c1ac018a39652d9174b5e31173aa5c4e0c2f63101549de70806ea7ac56731abe3cb929c WHIRLPOOL ec00c2778e5e31a5d0ec4bc8099b4579e4eaa34a335653155da3c47e3c69fb3a8ff67b816cbeb769b81826c27ca687fc9fc22db11b91ddfadb6268c98890b302
 AUX scipy-0.12.0-cephes-missing-include.patch 394 SHA256 0263ba4e9f13c7be0e7160ae73ce98ea37f698ea7e06c3fc090bc4ff7732bc66 SHA512 a4f9adf9b29743b6ca7f42de0695af23ddf7791330a4a58a2f47cd5599af1361aee3b141a016ea1a81a3bc5b8bfcaa3f0478370a09acd37bcd8e519765701510 WHIRLPOOL 59651015bf540ad2218dd65764d68fb5f2b907116245e3e83d14084579314af6c58c34be3f74300166c2450e00833fa4ae6d6de057392d3e947a979555add1bc
@@ -13,28 +13,22 @@ DIST scipy-0.12.0.tar.gz 9095801 SHA256 b967e802dafe2db043cfbdf0043e1312f9ce9c13
 DIST scipy-0.12.1-html.zip 15578583 SHA256 07c773c6056e5fc0cb65d7048995d0ff056f48f1e482d610865361870ee07998 SHA512 71308ff306ee5556822a279e8dd21efd6c9174fbb5c100acf9e34308cf828789cd257aac5a447a6dbfa8b464447753ea49d6e5819555fbf8db73b3e51fddc2cb WHIRLPOOL 124b12ace1a297789b4f544a28539da964bc756aae72572b2926c9df81b2bd492fdcc4b39bb8b9d83305d21834c7e225a576225a8a94a316707c517583fa9dca
 DIST scipy-0.12.1-ref.pdf 11193207 SHA256 4a8298fba9c6d62aeb392ee6588ac45cb266ed6cffb59573f6c19d7779bfc18b SHA512 cad60983c74a447a0e3ba898b81bdea3101dbad7603f1ca8030e3ff9f431eeb8c7b2dd207a45af616ef596e85c0c1846944057ecc11482fe9b389869ee49b137 WHIRLPOOL af600c6cb5c59306b2f5a84df421465a97cae9138f0cf024a0748c80bd516d8fe6a2db135fd56d66eab25f36c99acb3c0825d50b7d376e0ed3d9bd0c4c282943
 DIST scipy-0.12.1.tar.gz 9012911 SHA256 15122afe6cb377b010982f9bc46cf41b12af703fd34088aa3971a80276b00e76 SHA512 13dba0b2ff9b69a109403110aaaca892362935262e3999992de96b081eae036fe5dbb3ca209d84ade948377c6ccb4137777c36f76121f8745855dc1d08b86e97 WHIRLPOOL 71467b86b992b14b4bc6c354ac4b4ec138951ab0d17b28c07ac605a81852f4f55bdfe35553ffdecd9611ef0daf2c35012424e28db9c9ff8e2cf6eb3fe0d2583a
+DIST scipy-0.13.0-html.zip 18283054 SHA256 3010783ebdc18988440cd0047f061bbfcac98677782cd10e8b4f09e20bbbc23d SHA512 082cb1e0915f6095f80522a76fed4e106ed82889df613c1bcada9a4faded8917fd7e686448f585a5bee5478280ae21f6adf9bd4add125b9082f93eb93e61feef WHIRLPOOL 48b5e2ee9274f324969c413986110a87422b5f3667b617884dd01c660cdabeb05c5e17ca33e861b2fa2cc5caf89e1233aba9f2855386fe211255c5ceee437ac7
+DIST scipy-0.13.0-ref.pdf 14748179 SHA256 52caa5fd7e74f2e5a78f26296d2150808eee9e153ca3cee62d05892bbd1bac8c SHA512 9e2d40b154c73e9ad3405038e2c71e01650b9a05781355d499b09d647ae6a73d65d542c36b60a87ac530f9b7509bf1c023624952c2f4f2b2f9fb56394456ec91 WHIRLPOOL 5071c593b999db1a57057731e995153fead4155f04b69b770fd1b2203cc5eb13f6f9395a179c4a06e1d8fc5dfa559f51c494f52a27d524b2794d9683e487e273
+DIST scipy-0.13.0.tar.gz 10093476 SHA256 e7fe93ffc4b55d8357238406b1b9e47a4f932474238e2bfdb552423bcd45dc5e SHA512 5bd8f032560dba4796942c8cbbd341c449aae10c3de6023c62bf754bb48d84ba821dbbc24bfe371781e8a06958c104baf670bf167597ec5d4fd5fd2eeadc54b5 WHIRLPOOL 39df9a0c03962f0b5c16efe38d8900c523e45426e228951a5d84fbf7b742cd37c8775f628e6973da572b3b7e088aecba1f7277dbf1fd6e3b72f78a8ad6599a06
 DIST scipy-0.9-html.zip 8516420 SHA256 6f3148881502ca2cd2964fef7baf9bfec6fe2329ec3f1832e1e6d864aed0f889
 DIST scipy-0.9-ref.pdf 5299022 SHA256 ed2641c180eef2f842536a611982fbd91c33c95a7e7e3c279d7ae6f10071be47
 DIST scipy-0.9.0.tar.gz 6084552 SHA256 913089de94721be864e0a57fdab52603f3150250a2e0ce4ed6928ca1125f6b23 SHA512 2c9be17d4f9daea23dab7449282f522641a7bfc0bdb0005631f2a89da44681c4b4e98bdff8b76ee451c1ee36cf3dd2eaf45f670cfaff86c10d49bf5478ac3c43 WHIRLPOOL 0b58a0e0bc03f4759e5bbc3b24b36c6b53092a92c595ca65a79bf307332564b3204fc1d6244bb0a970bdb63f0092591b846cc14e8b4b6c73d9b09ffeb16815b4
 EBUILD scipy-0.12.0.ebuild 3770 SHA256 990abfc2c8afa97a5659cdee52686dff3f372a16ceae76da157a82b02617feb8 SHA512 7ea50b2ef80756d0c134e1a75b643f04a78d2e27df3bc203081912491e8e6e646b8daae923c58e41af0991c67e9340124ea3a3cffd117972e20b7caafd1c3163 WHIRLPOOL 4d85c58fa219dc26c1d27d057e381d9a417f47e2d1b0a8730b3eed8957a0a671330444235cad6d186b7b7c93a3029ed41cf0431c4d3c8b6075b19a0c50719497
 EBUILD scipy-0.12.1.ebuild 3795 SHA256 4ca1182b989960834dd24f53c924cd193d7197547d16c7d787727c0146ccb2cf SHA512 4530e94cb46e9794e8d97d1787d1dfaa8ebaf1ea6f8a01e53881e9cdcb839a05bcab606e3fb7f279b75db3fab497a8ec7c9f793353a8c36424176d98418248a6 WHIRLPOOL 4005661a97c4d5a8d40800b0392c3f6c2cfdb17fff4545719b6dc356c20f6c827813122f022187ce022f9caa284031d152cfe0f1fd4c4b53eb0b26ebbd68e128
+EBUILD scipy-0.13.0.ebuild 3619 SHA256 f934647eceef2c326878d31bdf9289ca86726ed1ced5f29568df1935ba6a37f1 SHA512 370aa07dba0e61fe23dc57a33cb460058cfa1708a5d2e21dc7bb41cdfa7bb987e71281ab16dca0e056e1192cf6e69653e689eb5aa87231bbe105544ff69c2f93 WHIRLPOOL 300028a9c33c9010650dfd12437ec9b5e0ccb44b5404b20b2ec897ea4d15dceabf4d2ff89678c90ba567847581d4c03ea12524193ccbff63bc1c3a83421a77ce
 EBUILD scipy-0.9.0-r1.ebuild 4357 SHA256 2a99c317ada2d130e77171d26c3f88654faf68204730f723a89605e87a447f01 SHA512 734a38d0a586d930a9ca196e6cca571022d7af286bb710d29347d5125b9a718fced44d2c2fb1aa968e4b44c228f0b1fb58694e585157edeab0408136c66950cb WHIRLPOOL c4a35e0a8b14c723270a769d0b53fc3fc7a9c875af4b3a08c3276c8da31ec04fac6da64877caee5256f500368a0e9baa77684ee30afb7da2b47753ade0ea4628
-MISC ChangeLog 18863 SHA256 3d9e288bc70b0219e37bb864fa65f73d91570ea7d60dfbc030edbd980d994d17 SHA512 444b0c7c419bc141378472b07fd847ee84d8e7806c0ac7ae08775c964da9e842ba49e4063efe49fd50e71c838f945043fec07d656c994d41033aac485afe55db WHIRLPOOL 5d604d9ed54e198851538484b47fcdfb71a9185a13ac20f67d2c664c6c52e16a3e4c084277ac21123fdda14d450f1d2649d0badd68ec6b5802084199e75a57af
+MISC ChangeLog 18990 SHA256 e8daf77f305e762910783ae13faaacf0067c8a3a28b42f3610f73bd83bda75e9 SHA512 ce335422ca2804529c8d395685b91f8561af88efebbcdc31a2bf32ea27f859200905c94eb496a70a03ca7f06d629cc7b315c0fda3a60b16bca8f28f611aa5580 WHIRLPOOL a57b0766ea75899d2e535911bf73d35592166c30a18e16a126c1a70164ba184e86d01c3a6dd6edf13f67f6adc998ea3cfa2dea41141a1f04a0be053acefeaf34
 MISC metadata.xml 778 SHA256 c585563656be41d539826dbd6ac5f633a0704b73a39b3603b50ce6092d767e73 SHA512 da239d303a88f7bc4356a27965aed91befd379ee142c529ab5177276eb86ac7976b527a2b1397584754f1cec1c6743c98b9af4a540e6cc503607ac3cf529de06 WHIRLPOOL e04375da88108229b3386ae79ba452705a4d4fcdbff9f38c491a4436846c9037d8c68bd8d5524d5435e351a557bd604211477a28da5661c9cce804fe27a34b2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSaAkVAAoJELp701BxlEWfyCEP/irJGf5l8SgCW9Dc2QFxOag3
-1S8ZsoZ477MmR6WnQSybjR5HvCGvjdhhoyTExxLM5EIKyh6OlZTdSzVWRossBsZ/
-Xtv2iBcdBk0XFKNEVDLneqKnMLBoeJT/HBTYGvim2GhvJ0V/7K/tqcsXpjV0Zd62
-GA5oCkmoYBgn+wsjEa1lQbFZStWoxGO4s8MNUkGiX4G/V+VHtRBGLgj0Oo3Tdx9D
-obs/1+14t4iuqqpC22ytChy/QvayupXYcjv3rZbcsYw/FD3XUYjqr/6LdQNG0tmA
-XQNB6VeO8ttbwiybo6DMRUJaQ6zvt++cTs38QhFx133F+MBBYVCT2EGCwBtpRVO9
-TdKU5qILHl57KreeWyb/POix2qWciPkTRi1G0QPpHJE5VBB9088usMI4wY3HfAbb
-QPlIBPLrPaa3/4ZPDm1/Fval3wVz8B1LW6tLkY7vpLrGzBytympGtPuI0XBdcB22
-vp5QBSBhYNQlxYll/nwcqECGzT7+9u5fNsoBuw9X5xmV56o35tr/Bi2KyF+Ut0UR
-UbSvJdQOoP97JiVyB/V5VqjPYEpoUffAjGXMAM3oRV0BGlxdys6+TyHGwlycZfB/
-t+BjSa4KAyHF11W//nrrR3a9jfVFPZv9/ralmaHldxwhDLUehuI/J1nAp3i+/2P0
-13/TqPtENk6Q14EKLfaO
-=KGNd
+iEYEAREIAAYFAlJu6HQACgkQ1ycZbhPLE2CG+ACcCr05xxeDQtVLTS/wtSt0fh30
+2M0An3mlhM2CVkzF/o9iL6sL/9LsZ4f1
+=YIuA
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.13.0.ebuild b/sci-libs/scipy/scipy-0.13.0.ebuild
new file mode 100644
index 000000000000..f7d4ec7ded1f
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.13.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.13.0.ebuild,v 1.1 2013/10/28 22:42:53 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+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://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${P}/${PN}-html.zip -> ${P}-html.zip
+		http://docs.scipy.org/doc/${P}/${PN}-ref.pdf -> ${P}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc sparse test"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+CDEPEND="
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	dev-python/cython[${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}"/${P}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -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/[ ]*$//'
+}
+
+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
+
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
+		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
+		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
+	)
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	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"
+	"${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
+		dohtml -r "${WORKDIR}"/html/.
+		dodoc "${DISTDIR}"/${P}*pdf
+	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"
+}