From 965db00430bd58c85f6a727a1bda6ea483cb142e Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 3 Mar 2015 15:19:00 +0000 Subject: [PATCH] Version Bump Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- sci-libs/scipy/ChangeLog | 8 +- sci-libs/scipy/Manifest | 38 ++++---- sci-libs/scipy/scipy-0.15.0.ebuild | 8 +- sci-libs/scipy/scipy-0.15.1.ebuild | 141 +++++++++++++++++++++++++++++ 4 files changed, 174 insertions(+), 21 deletions(-) create mode 100644 sci-libs/scipy/scipy-0.15.1.ebuild diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog index bf4738390e31..d0638dfd118f 100644 --- a/sci-libs/scipy/ChangeLog +++ b/sci-libs/scipy/ChangeLog @@ -1,6 +1,12 @@ # 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.121 2015/02/19 08:58:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.122 2015/03/03 15:18:59 jlec Exp $ + +*scipy-0.15.1 (03 Mar 2015) + + 03 Mar 2015; Justin Lecher +scipy-0.15.1.ebuild, + scipy-0.15.0.ebuild: + Version Bump 19 Feb 2015; Justin Lecher -scipy-0.12.1.ebuild, -scipy-0.13.2.ebuild, -scipy-0.13.3.ebuild, -scipy-0.14.0.ebuild: diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest index 04d60c972cf5..93741db22c0d 100644 --- a/sci-libs/scipy/Manifest +++ b/sci-libs/scipy/Manifest @@ -9,27 +9,33 @@ AUX scipy-0.14.0-lsqr-backport.patch 3764 SHA256 e5db9922b84a51452afebd22d6783ee 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.14.0.tar.gz 10212944 SHA256 4b41a3e6bf178df1c7f0ef3bfeabf1f56610329aca5dbd7b6d64da8ac9af6b14 SHA512 ad1278740c1dc44c5e1b15335d61c4552b66c0439325ed6eeebc5872a1c0ba3fce1dd8509116b318d01e2d41da2ee49ec168da330a7fafd22511138b29f7235d WHIRLPOOL b15322cef988bbc910794f3b34ee8741edd227f223da4384b3a6471b7a37c1cb3efbacb3f6dde7b6e9929c93e683de5f5898a43d26fadaa2317c433cb3bbec72 +DIST scipy-0.15.0-html.zip 24922467 SHA256 6b7e898ed909d9c3078ccfdf8fcb83cda01979d811d7cac7683f0473a268d3a7 SHA512 bdfe7624ba6a997a7e1f97cbbe860798a135c7d2c603260a1887992a6f64801b1fb505d461a1e101fa3d7d85366380ccf730185609ee10296e957b5407300963 WHIRLPOOL 83f1ea2790319627c7bb8c94e64a6e387505a7d2d3985024b75b0ced09f8bd55ed6995a8fba5342252aec9aa0e2e23aacd65e93fc6ec54c387801a1f98d7097d +DIST scipy-0.15.0-ref.pdf 18304330 SHA256 baf6475a65abe8da5691b92bcd667c02558951f14cf2985ee29b027a37435605 SHA512 ce32702fe733699db93e00acdcd4adbce7f3ea47bab7538dc11a52fca2df615d3c677f96e2d2043f1808b0724a5d877b250cbf9fa3eb76ea7efcae543f3ca552 WHIRLPOOL 6db972c996d2a166d9ef6585cee2aecb5d977b4b35d301f10b038e01a62abd175a205d591f4347b57f0028961cfe709404eb74499fd88e9baa8bba9b5bbe5929 DIST scipy-0.15.0.tar.gz 11398495 SHA256 0c74e31e08acc8bf9b6ceb9bced73df2ae0cc76003e0366350bc7b26292bf8b1 SHA512 ca5a9af177d598ca4328a5de9d029858e8e10bc160f88f715bfe351a5747b6c86f9351b9f51a2d8e33f40fc93930c93e2baddec89cd2f4830811bb2f5a04b55a WHIRLPOOL aeea567bf05d1c217e4ce558780f591be9422f0b1df592ac28f1012907bbb3432f4c85fd987944ea89bb334e22a21209f1a6bd54f9a09b215ce79a0f896df47d +DIST scipy-0.15.1-html.zip 24956050 SHA256 c27d3656ffed1b988890cf192c692f646b00d02a0716122dcf447eff5f186cf2 SHA512 ec8c25d1a8da23a6794315a97177bf3bc1fbac331d562eb2ae6300575eafe040f3ff8d5a884dfe79d7e623313b7b474c095ddb090ce07007cba8fe9bf0fbab27 WHIRLPOOL f4a0a55c209ab3806cf97af74d2948c3f4461d3bdccb36ab1a219a1bcba11c95e1c90f216b36680d161ad24966cbda22356340195f0c13ce23bcafc60a72a279 +DIST scipy-0.15.1-ref.pdf 18313446 SHA256 d96046ddbc91383fb37e3ae2bbdc6945e0c2fc70fa230e0bcda0789e6025ca7e SHA512 9ca6a656e454058273f5153d84acbca42f4ea9b99d0dbfde4a019cbb3ef7e87c4068660bc787506ca749024d45efaea7254614486d56b114c762fc8a69c3b496 WHIRLPOOL b907a6011671b0e0919d48b3e4587fd09cad3f2b463a302e1c9be22facec5f2d599b1eb9497a0cf1e3a0125b3beda0b1e00e7ca2cd40453c49a2df368b9c794e +DIST scipy-0.15.1.tar.gz 11401878 SHA256 a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a SHA512 fff4412d850c431a1b4e6ee3b17958ee5ab3beb81e6cb8a8e7d56d368751eaa8781d7c3e69d932dc002d718fddc66a72098acfe74cfe29ec80b24e6736317275 WHIRLPOOL 31f2f6ca33be1945bedf41f84cf62831c9b22f4d7079d2b0b7b21706b17eb4ab5f3a948be645bcb86a35f3a714e4f277bd66261d02d20d8aeb5077b2095c952f EBUILD scipy-0.14.0-r1.ebuild 3975 SHA256 6ca3a4e3dcb128b3d89825e0614916b1b63b406facafbeeac1b89e17288137a8 SHA512 8a10bfda4cd44a9b992aeb9d5f910e4141125b9d5496ee54a00a3f204f48e23cd79526d375db3ddbbb6849ddd95b1c61e5f65432252ad6bb0ad240067f41dba2 WHIRLPOOL ae94eac8ec5de0e248378a0cf9ab3fa7d82652083c88fb1e09f6f4f4a3f391789522a60619e673bb38de70a0437baf6584ab9f75563e5927d72615240c376ead -EBUILD scipy-0.15.0.ebuild 3876 SHA256 93ed82c455829921bdcc0aa5ab44b277c30c7cf7a69e50570257c3c614a0c83a SHA512 44240295459c33a85308be6fe0407a624444f11091323ed8ecaa9a723cefcc05987fdf3dbe8b4ef2fc3def1fdcda5402b0d3f77bff90af8d6011d98f3e39ac86 WHIRLPOOL ea79626d5cf1f59a853bebea1822eb9f1d79384fde35aa51466b69fa235f47693329dd7da06afc28a27bd53cca525d792e1a3e28778ea93a68678b044ee0656f -MISC ChangeLog 21892 SHA256 4d0b22926878e64765f2cfb5daa2f6e705cacc0aae9565649d9a32997504867a SHA512 56ea16a9c03489483aee2ff545b2cc87a18866559afebd473a7e67c72a23b13418a2c0443692e6bfb02fe3fe25b8dafe969e64fd95d45326870d319a34a67c2f WHIRLPOOL 6adc030a59eb11f8eeed448c172a494424d07ffddebf52236705aa1984fb471d13fc9fadc00e0f5f5dc2493da71bde001929a4da02cd0da07d8ef7b8878f2849 +EBUILD scipy-0.15.0.ebuild 3888 SHA256 a7ff5593b74412f546f8a75f7d01b2b7c10a95be8757c1b6c2ec0cbdb5ec5488 SHA512 781b3288f5bcf847bcd48ef73f904ac832c6388f35a9be3811a5bbd3027421e4abcb08a79b8fd251481506c870f0d8d12a8b8e9dffe9c1569b5a3997bd2a53aa WHIRLPOOL 03bf867a3eaa436e2c75c09d20ffe1c2d6dd32eb28f9726af0cafeac45dc6abb22c97e4167619b9524f2d7ff04f168e03a41d4eddf97d22950273d88670098ae +EBUILD scipy-0.15.1.ebuild 3888 SHA256 084bc743af5a7130523060cd098c28d2d40e0a3da13bb7919e1708a4783df269 SHA512 b682e149b94e63bcb9d67a89ae8af48c75c7298be87e65495f4a35da7bdf1c29e78f031cb8a45fb400db99509e57e36539993031e157382381306895f7ead389 WHIRLPOOL 2d57568fd377302b72380a0baad380d9dfe70dfaac30563733ea6a6f5e29baf63fbfc02e15f85612b6eae66f3d5f5b504132e7faa31b34f5562f314ed45609a9 +MISC ChangeLog 22029 SHA256 2f489cc5f59bec370fbaa1631907ce2c53533dd09dd6e428f73024c235201439 SHA512 08b3e66cce88c86fc1fa5d95b348d1e528c04635f0d079f4837e1444d13a2001d4bb0f0cf5a03a21c57cd6b3c66d92e4ce0847ca43fd0c1a50a6df38fe2ef8ee WHIRLPOOL e4abbf71782de221b484be63b3c925523c35ad2c2b842b8378ef570909f84ea42e2b36c9ffa3647e4f46e61757f80312b180256f0cd9457a94f50011cf18940d MISC metadata.xml 778 SHA256 c585563656be41d539826dbd6ac5f633a0704b73a39b3603b50ce6092d767e73 SHA512 da239d303a88f7bc4356a27965aed91befd379ee142c529ab5177276eb86ac7976b527a2b1397584754f1cec1c6743c98b9af4a540e6cc503607ac3cf529de06 WHIRLPOOL e04375da88108229b3386ae79ba452705a4d4fcdbff9f38c491a4436846c9037d8c68bd8d5524d5435e351a557bd604211477a28da5661c9cce804fe27a34b2a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJU5aWbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJU9dDkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlKMQAI86+3IonAg0y/HDiQ3TINb6 -shVVAOlb5NXZ20/3b0vV7v56GS0v8rDIJP5FC/MhDkCy9mlqOyXYQluP1I3+/YOX -g9Ylim+SDdi1EZbyc/VX8056cmvKrckyxsulXhuHTFzl0wIACy3gM2/mpIt04hvA -eEMHnPyVwXGRoYXiZD7AuttrfQvdRprNtiZnlkR4opqyitKfFEmDo32KqZeeHVR7 -K/w4//hUqQMgm9tBiW076urxDEcurtLiCPBoxJ2xyzWIuyNGKgYMiPHdgxU+UJBF -yT9ALDoeXL0gUvxxhtXXKE26WU26+AsaF2h883K6zLC+YiiE12Inqm7cSuErB+0L -4hyJAWpRPWmPITR415/CtGM4zBpCk+vUN+EawUHvQr4m+TcuFilmDtut0+af/o8y -XnoFUwvfZRkoRUliwhL87cslS1Udq1Xxrm/aT1eZ140tSM6v/KV3785aFEBkZENl -MqFAJuOsKV/YiQU6NXwv03q375VZ3R1MeqNRYqT64Tcb1gFwhqMlVXuF7Hv2PuSI -/N4H+LS4udsy27+j2gLBb8IcAyP5h6kAu4Da45GiTCRCm7u3p81hpqCcgTh8YDL1 -GVlpRwSmCoywr5qQ5LLASa867xbYAeE/ZMMmOhjcS/x1XL7SZJjQjZT0iSbkeXvH -cyD+V+6ioxZ8KxkXyIIR -=bntc +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirWScP/2ZtBZ9jeWumAZ85NJrDZDkK +3zCTft8pVqqKha3xkVg28qEb9RWgIe4WxnYabGgWKR5gKS9AQEKSxfLYi9Pf4UgF +3Zrovhus10h7FEtrDjZYmFyGBOtwckIeA1KdVMDWzXQFvqwmsQc3rvaHsscJvxQ5 +F/cu1LB5cj1UC+q9rlKbg3DELV8q+Blc+vUnTlBfBVLFd7pjP1uKvz5OxJJLzinD +K/xBWyKHG6fnpr7GugsoFSjYVc3KKrMPpQ5TjMu99Gq9VFdXuKKQZcLvjkBEZxjf +z0cQ990lSHENtehoWaQ96OVTWC3nAJCU58LLPYjt7jm+Cu+TDAIO2w20wainNTQK +52FGVBRPoYeqLkVGCT76HwkboVeNCz9nHMqMC394BlSN8vD+Jab1oqL+jvCPSc9r +3IbFgdA0DxJWfBzKg23eTAHoB8yucp+f3dIcz7uZJDc7vbWto5uFAvWh/Tf9uSU1 +rTOgXGlgOuO8P/McPGb4espe7QCuBqY6DxeSb2hxhdK4c8aH5KzbN4/RVlbWgt01 +gltvGkgNkeXUet+8Rk6QenQ8hQytdFTuvnZU9niajciYLypv9y5NXLGwXAOM6G0Y +CSRrP8s8LRMYuO40pLM/ooc8xJW8Tj1iwBnzmrWECtlHRile7TmVN3J7ra/AoTsu +VdVfwUfK1tgVupy10zl4 +=Lz9a -----END PGP SIGNATURE----- diff --git a/sci-libs/scipy/scipy-0.15.0.ebuild b/sci-libs/scipy/scipy-0.15.0.ebuild index 37dbbb7a6675..f60d6738d870 100644 --- a/sci-libs/scipy/scipy-0.15.0.ebuild +++ b/sci-libs/scipy/scipy-0.15.0.ebuild @@ -1,12 +1,12 @@ # 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.15.0.ebuild,v 1.1 2015/02/19 08:25:29 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.15.0.ebuild,v 1.2 2015/03/03 15:18:59 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 python3_{3,4} ) -DOC_PV=0.13.0 +DOC_PV=0.15.0 inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs @@ -15,8 +15,8 @@ HOMEPAGE="http://www.scipy.org/" SRC_URI=" mirror://sourceforge/${PN}/${P}.tar.gz doc? ( - http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html.zip -> ${PN}-${DOC_PV}-html.zip - http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref.pdf -> ${PN}-${DOC_PV}-ref.pdf + 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" diff --git a/sci-libs/scipy/scipy-0.15.1.ebuild b/sci-libs/scipy/scipy-0.15.1.ebuild new file mode 100644 index 000000000000..e7e9e2b9379c --- /dev/null +++ b/sci-libs/scipy/scipy-0.15.1.ebuild @@ -0,0 +1,141 @@ +# 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.15.1.ebuild,v 1.1 2015/03/03 15:18:59 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://sourceforge/${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[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.19.1[${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" + "${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" +} -- 2.26.2