sci-libs/scipy: Version Bump

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

4 files changed, 176 insertions, 11 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index f54a58b58fe3..271e2b5b715e 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.97 2013/09/10 02:43:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.98 2013/10/13 17:54:35 jlec Exp $
+
+*scipy-0.12.1 (13 Oct 2013)
+
+  13 Oct 2013; Justin Lecher <jlec@gentoo.org> +scipy-0.12.1.ebuild,
+  metadata.xml:
+  Version Bump
 
   10 Sep 2013; Patrick Lauer <patrick@gentoo.org> scipy-0.12.0.ebuild:
   Whitespace
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index bb2ce1dd69bc..f0929731f981 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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
 AUX scipy-0.12.0-gerqf.patch 731 SHA256 1f3c2723f1094cb6834349f26d40d060ed4e09c722eea876e160fc9ce2b3ced2 SHA512 007bf3d85364c824c03532a07c2678e48c90858d82fa7248cb5139a6f74b853bc4a27e6932638a14bb61e72abbbfd95265e10502c4fd2eb363758f3132722a10 WHIRLPOOL c2d7de949048dcc76e1bf72f2165226b7a741212ef0c6cfc3709ddd91f11fd274ecfcdf62dd47fb11d824d73b41c57d468414b3ef9e8169f7841688f67bcf6af
@@ -7,10 +10,31 @@ AUX scipy-0.9.0-superlu.patch 1526 SHA256 10b58353b0cdd6a8a6713ca7186cdb37c33c0a
 DIST scipy-0.12.0-html.zip 10831664 SHA256 d7a1dba159d13781a31bf88bcca3aec802ad7d0817c585140e05221722e17689 SHA512 dba923b632a063a1e437b77fc4b034df4b9d0936c17a48136857db14719de2ca88336500b663b781b443521cb71fd6bc3e7ff51779ed80ae2b34b7e655cba7ed WHIRLPOOL b25324c06b23e32797701485491696835d1b2878e025cd5f2cc38e3a998fb6bf62980c449f8fcf035035aa899754daf2e0985e872d918a1c7cc7ae2188a9c9b8
 DIST scipy-0.12.0-ref.pdf 7382958 SHA256 04587215578188396723cea2eb7387460fd957706eec61ea1b67326822fdcb68 SHA512 520a75aed2e4b87296e864fde3387ea35978e96af86c3c3f92c0509db7ee0f8253c3c75f3e8de273e534aa400ff3dcca051fc8c83f9406af941da422f88fed70 WHIRLPOOL eae4c8b9fbffcd277b077175eaf9a1e136ec02cbec16c6d389735be5cbbc4300765bd9ce34427932dc1f9b58a0b16971235d89b60c02313d8902a82079bb9317
 DIST scipy-0.12.0.tar.gz 9095801 SHA256 b967e802dafe2db043cfbdf0043e1312f9ce9c1386863e1c801a08ddfccf9de6 SHA512 80c8e137c3ccba86575d4263e144ba2c4684b94b5cd620e200f094c92d4e118ea6a631d27bdb259b0869771dfaeeae68c0fdd37fdd740b9027ee185026e921d4 WHIRLPOOL f5266327a53fac5b40456a2f4884ed5caaf11e2b9340bf29c8108d12bf80c5604a594774c3daf55b375c4a823a823eb31957f8641e622e9177291400c2b2bc29
+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.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 3799 SHA256 f19f517f5bf350e4f898e0011abf8bc75b0b2da80c2224f79224b42b16aeef98 SHA512 6bdde3db870ecfe87b9b700a8d65e9bf8f0a472206accc9e7900224b74d3d5f2d52bae8dfc5962df3ca7833e4cf6425fa070578f6287be8d1f6d78cf66d6facf WHIRLPOOL b4f56aca2cf9cc933c16313cc4edca4487fa2196d38fe3e9854a97d69f6af43fb3bee66897b7acd78f73b64bc66753244a5dd25eb1340ffcc4e3cec1eb69e1e9
 EBUILD scipy-0.9.0-r1.ebuild 4357 SHA256 2a99c317ada2d130e77171d26c3f88654faf68204730f723a89605e87a447f01 SHA512 734a38d0a586d930a9ca196e6cca571022d7af286bb710d29347d5125b9a718fced44d2c2fb1aa968e4b44c228f0b1fb58694e585157edeab0408136c66950cb WHIRLPOOL c4a35e0a8b14c723270a769d0b53fc3fc7a9c875af4b3a08c3276c8da31ec04fac6da64877caee5256f500368a0e9baa77684ee30afb7da2b47753ade0ea4628
-MISC ChangeLog 18417 SHA256 629ac3cbc69876045376b70b226d7c02c19f2f506990edb16b49155d18b2edfc SHA512 3dbaf6bf56bfd93b7e84ad2fdd3ec0d33f1cad2d91e0ef76ab15c6548e8923d1230425d74fb13da951d630ad78697a529ff21d5c7f1a848322240a55e9fc40b1 WHIRLPOOL 0ea28a032772239e0e69470a0a96adbbec0cb59b913d6c3c13ed95c07054f1667dedfb88f9e68f6ed643c8131671d97bf219e6b3d5bf32e80035230d8b02ef49
-MISC metadata.xml 762 SHA256 b7a3a5110f5a2446485192ef06b28ce3d67c607b8badf892e764855f74677e59 SHA512 78f48ed6f5cb05e33c96f16ca583a4a6f80b1684e40e355e16ebc3457eaf03b79f7c4893792a0669168edb6e6de1a255e480266adc0e42c797ed5aec8b7c04dd WHIRLPOOL d9277e0e18ced1233e4d724799307eab3f02dfe7c14d80b375727e2dccd22b660b296653c90dadf671da72ff95c627c5ffc2baf5ba062542de44803c2a7c3ea7
+MISC ChangeLog 18544 SHA256 f8adc2753b2496972ae8a8ac7fdc895561babbf23d43b39b41f1307467e4e172 SHA512 50682d0543d054038777918a60b3e876e1885d028ecb97d4cc2a9ff17b43f275de05b77919dd5d4db972e199efae904c537e8f7a6315fab9bf129160a9a848e7 WHIRLPOOL b6b8f6a28f6f86416bf9381f4101a217ee8f73625f6dc55fdbf718de17febb8f79efb53008cd84c8955f0e4a8b94467040059f3c1b8f5d3608251eb64bba0207
+MISC metadata.xml 778 SHA256 c585563656be41d539826dbd6ac5f633a0704b73a39b3603b50ce6092d767e73 SHA512 da239d303a88f7bc4356a27965aed91befd379ee142c529ab5177276eb86ac7976b527a2b1397584754f1cec1c6743c98b9af4a540e6cc503607ac3cf529de06 WHIRLPOOL e04375da88108229b3386ae79ba452705a4d4fcdbff9f38c491a4436846c9037d8c68bd8d5524d5435e351a557bd604211477a28da5661c9cce804fe27a34b2a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCgAGBQJSWt5bAAoJELnU8jG9FVir9w0P/ikzB/bfxw49Lzn+AQVfxuhS
+YiPprnwu2/RwihJxgP/9C/pU3HEyTUAdRPJ255/hxZUXAAj/hEtplCGriFl9/jPY
+ry5n/f5abTVIBtFDR+jPRtfvrySANoQrCNLMeXU+JAtJIK+TnrOEW+wl9TzfiLrw
+MtNou9i/nWdiKZLehIBx3lGf7ClMDp7DexEBeOKbBmdy8AGSIf1tV7N3Yzlx1y3U
+PnzCW/7cO2aKo/H80fATb2+hrm3Pk799RKKfknMdzggEw/FfzA7tvt1TB5uvgg8u
+d8TDJTaKxBe4yUGSqtx4uoKmlOKP3UgvwF25Pcw7MadBRjeYEGcoCsu9VvTG8/FV
+/+FdhQJNALd4eLDarWlqkprIdU+OlEFEhXAbcbRZ74dBCxXf6j3M2bZX4RHM74FO
+wAO6XANBc2S4sQuQqtOl9ofbc9Wo1lfrbC0RaNZ+CEkdqJwuY1VrsECv00nrvROb
+2HRXAvhyxyKmBgb62nUEfrGPzBA2oduN3O+ZsWjDpU2pldhPzgWT0gdqoGzD3Zai
+okZ7/Tz63NEY80NugNwPqntLloG13h3AlWVb6UDNsBUkfGy4YDNqrrpOO01CY0JW
+XmnYFBtWU9jwvm+TbH6LAJ9DMnC0REM9rd0Wc8xV2enDfzdyDE2MAPcWHHpax1Ul
+fmOHSTXDrhyd5erKxtzI
+=udU6
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index 4ee19593821e..350066e901ec 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   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.
@@ -10,10 +10,10 @@
   integration, special functions, signal and image processing, genetic
   algorithms, ODE solvers, and others.
 </longdescription>
-<use>
-  <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
-</use>
-<upstream>
-  <remote-id type="pypi">scipy</remote-id>
-</upstream>
+  <use>
+    <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">scipy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scipy/scipy-0.12.1.ebuild b/sci-libs/scipy/scipy-0.12.1.ebuild
new file mode 100644
index 000000000000..c9709a9ae293
--- /dev/null
+++ b/sci-libs/scipy/scipy-0.12.1.ebuild
@@ -0,0 +1,135 @@
+# 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.12.1.ebuild,v 1.1 2013/10/13 17:54:35 jlec 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/${PN}/${PN}-html.zip -> ${P}-html.zip
+		http://docs.scipy.org/doc/${PN}/${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 README.txt THANKS.txt LATEST.txt TOCHANGE.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-gerqf.patch
+		"${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() {
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
+	# nasty hack to remove weave tests because it is not python3 compat
+	[[ ${TEST_DIR} =~ python3 ]] && rm -r "${TEST_DIR}"/lib/scipy/weave
+#r = scipy.test('full', verbose=10)
+	"${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"
+}