diff options
49 files changed, 822 insertions, 93 deletions
diff --git a/dev-python/arrayfire-python/Manifest b/dev-python/arrayfire-python/Manifest index a749efd2b..372c81759 100644 --- a/dev-python/arrayfire-python/Manifest +++ b/dev-python/arrayfire-python/Manifest @@ -1,3 +1,4 @@ DIST arrayfire-3.1.20151111.tar.gz 35015 SHA256 6992ac07645dbafbfda0c73a2c3eb94ba03d6a941593d94da42126d6310f0633 SHA512 7a3e359eaf61e7d8234451671941f37f613a77ea4d1d22ac7dc6cd9a0b40a2ca098eb03b8d0778537c5012aca6cb5bc986a056b3cdf15e7d9f23417bf3c6a60d WHIRLPOOL 1c1ba68e54e285b80c5c09328872f27a2e9cb8d002c13883ef4e66c94ebbc18a12bf5fe683215922af5c9d5ac09f2957010a1ef2145fded1e838a632077658c5 DIST arrayfire-3.2.20151214.tar.gz 39104 SHA256 9bd8a8bae1bcf62a003af582b23ff48615a658aec131f13534d0cd53d81bfd2c SHA512 c43934abf5e7d5927e45c13ace08e579f038fd593aed128916208b47d82813af1e9f9b8ef98a375ed6d27762c10734ca60e48a6e24c188a3f593a341db90e85d WHIRLPOOL bd9f8086e4ef597f400f094f2c3a2b137a9dc642d4b31e7a34e286de9a9447fbcd7df0acbaf69027d8a24590f0250b2a6b78d59572cfb4afaa0e71616080ac5a DIST arrayfire-3.2.20151224.tar.gz 39158 SHA256 446a8a1e74f2271f0f8cafcc4d144a1cd58d01de50b6f90cc0c2ef48d044434d SHA512 bd3bdab84835c1e112e4d7d159f76d02a0291bc1a82928918202abd524b296b47589dec7d432419006c0348e0741d07e7852d1ad943ae2640b78be3c057f94ed WHIRLPOOL c88e019ed288a05c78de7cd44f590b751c71ebecf957eed7c71d697c3fa026816f4731190de942c73b113c4f98d8f0de8274df619e97ac4c0f8da12b9ad73013 +DIST arrayfire-python-3.3.20160516.tar.gz 58569 SHA256 466308a64a3adf148b874a241c330f98b0d375c629cc44e078cff9b81a5792e4 SHA512 38861963156eea67eb39315c68c58580f928bfa0eb19a54435d45a6e71b31569e15cf3217427a95e9e24d6a0e61ef6394857e0587e3dbd621dbc4e1409dddc09 WHIRLPOOL 2f3fc65b5514b548f948e24ecfa7a5c97db8d48ad3a7d75a99de264baed06eb1d1a3fefef9ad8874c837c01a246deb8ac7bea4c38be87304232a4db11df54ae7 diff --git a/dev-python/arrayfire-python/arrayfire-python-3.3.20160516.ebuild b/dev-python/arrayfire-python/arrayfire-python-3.3.20160516.ebuild new file mode 100644 index 000000000..4b84ce894 --- /dev/null +++ b/dev-python/arrayfire-python/arrayfire-python-3.3.20160516.ebuild @@ -0,0 +1,21 @@ +# 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} ) + +inherit distutils-r1 + +DESCRIPTION="Python bindings for ArrayFire" +HOMEPAGE="http://www.arrayfire.com" +SRC_URI="https://github.com/arrayfire/arrayfire-python/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=sci-libs/arrayfire-3.3.2 + " +DEPEND="${RDEPEND}" diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest new file mode 100644 index 000000000..8ba52629a --- /dev/null +++ b/dev-python/entrypoints/Manifest @@ -0,0 +1 @@ +DIST entrypoints-0.2.1.tar.gz 11126 SHA256 0d6b6798446c2e5e5dd6691e79356c29e82234bdb67995233f57413a11f2ded4 SHA512 67a24fc53ae8bdac6bda163d2c8057b158979d55ccdbcdb8709966573bf0a999728e04eb92a05fbc2c0d532593de0ec6518bcfed1d5bcf875b00bbd5c48494c7 WHIRLPOOL f673fb42bad930bb1907692013df469d64b9afb77c3e0acca250fb0b14fe17ec3962cb60de2f0760ede40c8f039690851424b816e047669916ff1d73389daaf7 diff --git a/dev-python/entrypoints/entrypoints-0.2.1.ebuild b/dev-python/entrypoints/entrypoints-0.2.1.ebuild new file mode 100644 index 000000000..1c9158849 --- /dev/null +++ b/dev-python/entrypoints/entrypoints-0.2.1.ebuild @@ -0,0 +1,60 @@ +# 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} ) + +inherit distutils-r1 + +DESCRIPTION="Discover and load entry points from installed packages" +HOMEPAGE="https://github.com/takluyver/entrypoints" +SRC_URI="https://github.com//takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +DEPEND=" + $(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7) + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + virtual/python-pathlib[${PYTHON_USEDEP}] + ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + " + +PATCHES=( + "${FILESDIR}/${P}"-setup.py.patch + "${FILESDIR}/${P}"-init.py.patch +) + +python_prepare_all() { + + # Prevent un-needed download during build + if use doc; then + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/conf.py || die + fi + + distutils-r1_python_prepare_all + + mv "${WORKDIR}/${P}"/entrypoints.py "${WORKDIR}/${P}/${PN}/" || die +} + +python_compile_all() { + use doc && emake -C doc html +} + +python_install_all() { + use doc && HTML_DOCS=( doc/_build/html/. ) + distutils-r1_python_install_all + } + +python_test() { + distutils_install_for_testing + cd "${TEST_DIR}"/lib || die + cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die + py.test || die +} diff --git a/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch new file mode 100644 index 000000000..40d5d8273 --- /dev/null +++ b/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch @@ -0,0 +1,8 @@ +__init__.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>. + +Patch by Marius Brehler <marbrbre@linux.sungazer.de>. +--- /dev/null ++++ b/entrypoints/__init__.py +@@ -0,0 +1 @@ ++from .entrypoints import * +\ No newline at end of file diff --git a/dev-python/entrypoints/files/entrypoints-0.2.1-setup.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.1-setup.py.patch new file mode 100644 index 000000000..987868547 --- /dev/null +++ b/dev-python/entrypoints/files/entrypoints-0.2.1-setup.py.patch @@ -0,0 +1,20 @@ +setup.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>. + +Patch by Marius Brehler <marbrbre@linux.sungazer.de>. +--- /dev/null ++++ b/setup.py +@@ -0,0 +1,13 @@ ++from distutils.core import setup ++ ++setup(name='entrypoints', ++ version='0.2.1', ++ description='Discover and load entry points from installed packages.', ++ author='Thomas Kluyver', ++ author_email='thomas@kluyver.me.uk', ++ url='https://github.com/takluyver/entrypoints', ++ packages=['entrypoints'], ++ classifiers=[ ++ 'License :: OSI Approved :: MIT License' ++ ] ++) +\ No newline at end of file diff --git a/dev-python/entrypoints/metadata.xml b/dev-python/entrypoints/metadata.xml new file mode 100644 index 000000000..acbfe4f76 --- /dev/null +++ b/dev-python/entrypoints/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>marbre@linux.sungazer.de</email> + <name>Marius Brehler</name> + </maintainer> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <longdescription> + Entry points are a way for Python packages to advertise objects with + some common interface. The most common examples are console_scripts + entry points, which define shell commands by identifying a Python + function to run. + </longdescription> + <upstream> + <remote-id type="github">takluyver/testpath</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/ipykernel/ipykernel-9999.ebuild b/dev-python/ipykernel/ipykernel-9999.ebuild index 42dd93661..751715039 100644 --- a/dev-python/ipykernel/ipykernel-9999.ebuild +++ b/dev-python/ipykernel/ipykernel-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) PYTHON_REQ_USE="threads(+)" diff --git a/dev-python/ipyparallel/ipyparallel-9999.ebuild b/dev-python/ipyparallel/ipyparallel-9999.ebuild index df49c48fa..d3627fb79 100644 --- a/dev-python/ipyparallel/ipyparallel-9999.ebuild +++ b/dev-python/ipyparallel/ipyparallel-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) PYTHON_REQ_USE="threads(+)" diff --git a/dev-python/ipython_genutils/ipython_genutils-9999.ebuild b/dev-python/ipython_genutils/ipython_genutils-9999.ebuild index 8297073f5..a70362be5 100644 --- a/dev-python/ipython_genutils/ipython_genutils-9999.ebuild +++ b/dev-python/ipython_genutils/ipython_genutils-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest index 4905000a4..86b37ed1d 100644 --- a/dev-python/ipywidgets/Manifest +++ b/dev-python/ipywidgets/Manifest @@ -1 +1,2 @@ DIST ipywidgets-4.1.1.tar.gz 321646 SHA256 ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028 SHA512 53b18ae432f72d3305333e92f488f62bb36f83d37fab59e4d103fb77a7ee266d03b96e6de4ffcc2a0f67d6fd892ed1d984c0b188d6cbd527ff3e950e885a5fe4 WHIRLPOOL e1ccb54416bd48fa451cd84f818595dcbe907a3bda79935d884b6f1f226167559cc24f1390d35f8b9a1e3a9af07da5c755c05e93729e27573d030d7ba2def3c3 +DIST ipywidgets-5.1.3.tar.gz 2467318 SHA256 316f9d90121901dc7b1cbba67175f9d628a5e2fce076d0c45f54331a2c9ada87 SHA512 0deaf38fc579f710e9fedbf4141f4936c64f4d018e96988af6940f25f568fcd33c2e421dff091d8c7821186ce2947048639c01793a932881bcb83d7bd544de5e WHIRLPOOL 9ab4d7cfed63d03a289ebf38b53271faf07c4340292200dfd5d30d3b009ac50b29e077fb66c7a4b0dcb5042f3a8e73be65b7c76556b1d959a9ee497a5cd3761e diff --git a/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild b/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild index 1535d5c9e..40e183391 100644 --- a/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild +++ b/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) PYTHON_REQ_USE="threads(+)" diff --git a/dev-python/ipywidgets/ipywidgets-5.1.3.ebuild b/dev-python/ipywidgets/ipywidgets-5.1.3.ebuild new file mode 100644 index 000000000..f59b98c1b --- /dev/null +++ b/dev-python/ipywidgets/ipywidgets-5.1.3.ebuild @@ -0,0 +1,36 @@ +# 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(+)" + +inherit distutils-r1 + +DESCRIPTION="IPython HTML widgets for Jupyter" +HOMEPAGE="http://ipython.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-python/traitlets-4.2.0[${PYTHON_USEDEP}] + >=dev-python/ipykernel-4.2.2[${PYTHON_USEDEP}] + >=dev-python/widgetsnbextension-1.2.2[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) + dev-python/nose[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + ) + " + +python_test() { + nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die +} diff --git a/dev-python/ipywidgets/ipywidgets-9999.ebuild b/dev-python/ipywidgets/ipywidgets-9999.ebuild index 5f4ac89e6..ddda94564 100644 --- a/dev-python/ipywidgets/ipywidgets-9999.ebuild +++ b/dev-python/ipywidgets/ipywidgets-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) PYTHON_REQ_USE="threads(+)" diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest index 95afa1943..a188e4493 100644 --- a/dev-python/metakernel/Manifest +++ b/dev-python/metakernel/Manifest @@ -1,2 +1,2 @@ -DIST metakernel-0.11.8.tar.gz 89676 SHA256 cbef70afc48c98f7a40aec04d1be96da9c74c0d9e4b151846725e01af34658ea SHA512 10fbfd41fef9c4491ab0544c9c4a57bd95460e85040f36d16fd5db8afea76e0e76e05e9b07f2412de2df4d77affe3541e044858b63370aedf00956cddbb57c78 WHIRLPOOL c0b6fdeb80d3e9d9c43955fc3f6d4aa2762b8b13b6e0089708763b0869fa36c259caf9614d9d12b7a4540ec2a369ace35f7ac002df6ed040e79eeb0c9a52cc7b DIST metakernel-0.12.2.tar.gz 90147 SHA256 69fe416fb3f99d9ba3719aed30608d4eb6b352e7af9273a3a7450d4daf91ba66 SHA512 fafbe0638cf21f4d0532f014b4a3602c095b1928597de89fd418d2a5c33fe4496998da39bf288a861464894e35b964fa93fc83cdc6c71b993eca52cbc57d0c47 WHIRLPOOL 72f50c6ee21b06c92418555bdc211361fd7a2aac91d68525a8bd85487a05a9fa544a8b7ba1962de76df630fdd7751723917048ab776b17dd3f4ba9b4b4e1fd08 +DIST metakernel-0.12.6.tar.gz 90203 SHA256 8de57c4419f125c8de6aa74cb09f346220d1e595ba09e20070f2640798d88d98 SHA512 1d1f2ad59879b2f7c78696b26a68cbdbc2612c5052138b72e26b8ec14f58a1455d9d1614dbe6957d9d7ecd965f91f6e20ecc939b2293cd682f87f6d5d2e21373 WHIRLPOOL de799209efa5fe4e01fad93ea58f67f4ea26f19e81db3a63213c3c1c42ee14cb1dad66865a229ff08d3b8e40cf13a1ed0c754aa7a1c3eb7f44b628e6cf075c79 diff --git a/dev-python/metakernel/metakernel-0.11.8.ebuild b/dev-python/metakernel/metakernel-0.12.6.ebuild index 5fa9d1b5f..5fa9d1b5f 100644 --- a/dev-python/metakernel/metakernel-0.11.8.ebuild +++ b/dev-python/metakernel/metakernel-0.12.6.ebuild diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest new file mode 100644 index 000000000..fc32af57b --- /dev/null +++ b/dev-python/nbconvert/Manifest @@ -0,0 +1 @@ +DIST nbconvert-4.2.0.tar.gz 428726 SHA256 55946d7522741294fcdd50799bd1777d16673ce721fecca0610cdb86749863c6 SHA512 441d32e5bd63cb7d0b9a70b814ec6ea647a04542601461cb8b008f4f9ab894f5729687093400703b222435100384378653fbbb38427431d9da62992ef778906a WHIRLPOOL 024ef6b9a70a9248431c71092de7ae993fad1144110669c0d538d13646cd991b5389f4550c269c55c541d96526541b884d5dec8632048a9365eb1986fe34d85a diff --git a/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch b/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch deleted file mode 100644 index 130a4afc0..000000000 --- a/dev-python/nbconvert/files/nbconvert-4.0.0-docs-Makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ -nbconvert is not yet installed at time of doc generation. - -Patch by Marius Brehler ---- docs/Makefile -+++ docs/Makefile -@@ -61,8 +61,8 @@ source/config_options.rst: - @echo "Created docs for config options" - - ipynb2rst: -- jupyter nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source -- jupyter nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source -+ ../scripts/jupyter-nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source -+ ../scripts/jupyter-nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source - @echo "Converted notebooks to rst" - - dirhtml: diff --git a/dev-python/nbconvert/nbconvert-4.2.0.ebuild b/dev-python/nbconvert/nbconvert-4.2.0.ebuild new file mode 100644 index 000000000..2f2bdc955 --- /dev/null +++ b/dev-python/nbconvert/nbconvert-4.2.0.ebuild @@ -0,0 +1,73 @@ +# 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} ) + +inherit distutils-r1 + +DESCRIPTION="Converting Jupyter Notebooks" +HOMEPAGE="http://jupyter.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND=" + dev-python/jupyter_core[${PYTHON_USEDEP}] + dev-python/nbformat[${PYTHON_USEDEP}] + dev-python/mistune[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/traitlets[${PYTHON_USEDEP}] + dev-python/entrypoints[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + doc? ( + dev-python/ipython[${PYTHON_USEDEP}] + dev-python/jupyter_client[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + app-text/pandoc + ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/ipykernel[${PYTHON_USEDEP}] + ) + " + +python_prepare_all() { + # Prevent un-needed download during build + if use doc; then + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die + fi + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + distutils_install_for_testing + cd "${TEST_DIR}"/lib || die + nosetests --with-coverage --cover-package=nbconvert nbconvert || die +} + +python_install_all() { + use doc && HTML_DOCS=( docs/build/html/. ) + distutils-r1_python_install_all +} + +pkg_postinst() { + if ! has_version app-text/pandoc ; then + einfo "Pandoc is required for converting to formats other than Python," + einfo "HTML, and Markdown. If you need this functionality, install" + einfo "app-text/pandoc." + fi +} diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-9999.ebuild index 7c757e76f..294d3f077 100644 --- a/dev-python/nbconvert/nbconvert-9999.ebuild +++ b/dev-python/nbconvert/nbconvert-9999.ebuild @@ -1,25 +1,21 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) inherit distutils-r1 git-r3 -MY_PN="nbconvert" - DESCRIPTION="Converting Jupyter Notebooks" HOMEPAGE="http://jupyter.org" -EGIT_REPO_URI="https://github.com/jupyter/${MY_PN}.git git://github.com/jupyter/${MY_PN}.git" +EGIT_REPO_URI="https://github.com/jupyter/${PN}.git git://github.com/jupyter/${PN}.git" LICENSE="BSD" SLOT="0" IUSE="doc test" -PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch ) - RDEPEND=" dev-python/jupyter_core[${PYTHON_USEDEP}] dev-python/nbformat[${PYTHON_USEDEP}] @@ -27,6 +23,7 @@ RDEPEND=" dev-python/jinja[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/traitlets[${PYTHON_USEDEP}] + dev-python/entrypoints[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} doc? ( diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest index 896c9f68e..8279b777c 100644 --- a/dev-python/notebook/Manifest +++ b/dev-python/notebook/Manifest @@ -1 +1,2 @@ DIST notebook-4.0.6.tar.gz 6705277 SHA256 f62e7a6afbc00bab3615b927595d27b1874cff3218bddcbab62f97f6dae567c3 SHA512 9ce9ca21adcb967725aeb7a18543ace8aca4e88497d3d2fd708a603511e8ef4a932b39337d134d684df03b273bbc442958a37ced8cd499cb7b97a1c29758eeb0 WHIRLPOOL 764afabfa220d37e048a359952bd9cc4de0b791de782ed7cf2a22e8c0e9719b39630fd5c1c7acbf163715924662805f92b406bf6198600f2c4a35d239a12df11 +DIST notebook-4.2.0.tar.gz 10090035 SHA256 e10c4916c77b48394796b5b1440d61d7b210f9941194048fe20ef88948016d84 SHA512 a6e88fc07b5085e9a330585ace7a4d80cd45f292efea24f75604ab3140dfb60913fe832a3ad98787c472e1f9255bdfbf50024ee0b414780808560e4d54dc84b0 WHIRLPOOL 016c7e31bcf08ca13ecbd129331a675d22256156ede12a1d69120e5dacf2b6d6bdab94ab325899636e4338bb95884ab4fe2db04c07a34b09eec452ea70e5696f diff --git a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch b/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch new file mode 100644 index 000000000..a4c29048b --- /dev/null +++ b/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch @@ -0,0 +1,42 @@ +Disable bundled mathjax. + +Patch by Marius Brehler +--- a/setupbase.py ++++ b/setupbase.py +@@ -152,36 +152,6 @@ def find_package_data(): + if f.endswith(('.js', '.css')): + static_data.append(pjoin(parent, f)) + +- # Trim mathjax +- mj = lambda *path: pjoin(components, 'MathJax', *path) +- static_data.extend([ +- mj('MathJax.js'), +- mj('config', 'TeX-AMS_HTML-full.js'), +- mj('config', 'Safe.js'), +- ]) +- +- trees = [] +- mj_out = mj('jax', 'output') +- +- if os.path.exists(mj_out): +- for output in os.listdir(mj_out): +- path = pjoin(mj_out, output) +- static_data.append(pjoin(path, '*.js')) +- autoload = pjoin(path, 'autoload') +- if os.path.isdir(autoload): +- trees.append(autoload) +- +- for tree in trees + [ +- mj('localization'), # limit to en? +- mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'), +- mj('extensions'), +- mj('jax', 'input', 'TeX'), +- mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'), +- mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'), +- ]: +- for parent, dirs, files in os.walk(tree): +- for f in files: +- static_data.append(pjoin(parent, f)) + + os.chdir(os.path.join('tests',)) + js_tests = glob('*.js') + glob('*/*.js') diff --git a/dev-python/notebook/notebook-4.2.0.ebuild b/dev-python/notebook/notebook-4.2.0.ebuild new file mode 100644 index 000000000..5aeeac7f5 --- /dev/null +++ b/dev-python/notebook/notebook-4.2.0.ebuild @@ -0,0 +1,94 @@ +# 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(+)" + +inherit distutils-r1 + +DESCRIPTION="Jupyter Interactive Notebook" +HOMEPAGE="http://jupyter.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RDEPEND=" + >=dev-libs/mathjax-2.4 + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/terminado-0.3.3[${PYTHON_USEDEP}] + >=www-servers/tornado-4.0[${PYTHON_USEDEP}] + dev-python/ipython_genutils[${PYTHON_USEDEP}] + dev-python/traitlets[${PYTHON_USEDEP}] + dev-python/jupyter_core[${PYTHON_USEDEP}] + dev-python/jupyter_client[${PYTHON_USEDEP}] + dev-python/nbformat[${PYTHON_USEDEP}] + >=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}] + dev-python/ipykernel[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) + >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + ) + doc? ( + app-text/pandoc + >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1[${PYTHON_USEDEP}] + ) + " + +python_prepare_all() { + eapply "${FILESDIR}/${P}"-setupbase.py.patch + + sed \ + -e "/import setup/s:$:\nimport setuptools:g" \ + -i setup.py || die + + # disable bundled mathjax + sed -i 's/^.*MathJax.*$//' bower.json || die + + # Prevent un-needed download during build + if use doc; then + sed \ + -e "/^ 'sphinx.ext.intersphinx',/d" \ + -i docs/source/conf.py || die + fi + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + nosetests \ + --verbosity=3 \ + notebook || die +} + +python_install() { + distutils-r1_python_install + + ln -sf \ + "${EPREFIX}/usr/share/mathjax" \ + "${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die +} + +python_install_all() { + use doc && HTML_DOCS=( docs/build/html/. ) + distutils-r1_python_install_all +} + +pkg_preinst() { + # remove old mathjax folder if present + rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax +} diff --git a/dev-python/pickleshare/pickleshare-9999.ebuild b/dev-python/pickleshare/pickleshare-9999.ebuild index 1ae333c36..f0ebb1a37 100644 --- a/dev-python/pickleshare/pickleshare-9999.ebuild +++ b/dev-python/pickleshare/pickleshare-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) diff --git a/dev-python/traitlets/traitlets-9999.ebuild b/dev-python/traitlets/traitlets-9999.ebuild index 7c59f5638..d57af8ca6 100644 --- a/dev-python/traitlets/traitlets-9999.ebuild +++ b/dev-python/traitlets/traitlets-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest new file mode 100644 index 000000000..717a28faa --- /dev/null +++ b/dev-python/widgetsnbextension/Manifest @@ -0,0 +1 @@ +DIST widgetsnbextension-1.2.2.tar.gz 721558 SHA256 688a02c08c2708e1a12f70434d7942850a2006998fe5ad3adb357e85fa2daaa9 SHA512 40f0939bb61ca39360873ec7f85ef035b7f033be65ca7d2d0b4219efd343d886c24f53b0e30d00e1b82da55e47c552ec7a7e23a62511c993f679e080e9b18ddf WHIRLPOOL c13a10198f174548a88f0d8b2955ae5045f544d0aab4f521ffb78de82cef224dd1bbe51000a588fd4fd2fcf9c2fefb60c150661fcd7689381e6b8f564ead3355 diff --git a/dev-python/widgetsnbextension/metadata.xml b/dev-python/widgetsnbextension/metadata.xml new file mode 100644 index 000000000..9f0544f5e --- /dev/null +++ b/dev-python/widgetsnbextension/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <longdescription> + Interactive HTML widgets for Jupyter notebooks. + </longdescription> + <upstream> + <remote-id type="pypi">widgetsnbextension</remote-id> + <remote-id type="github">ipython/ipywidgets</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/widgetsnbextension/widgetsnbextension-1.2.2.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-1.2.2.ebuild new file mode 100644 index 000000000..bb459b5b9 --- /dev/null +++ b/dev-python/widgetsnbextension/widgetsnbextension-1.2.2.ebuild @@ -0,0 +1,24 @@ +# 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(+)" + +inherit distutils-r1 + +DESCRIPTION="IPython HTML widgets for Jupyter" +HOMEPAGE="http://ipython.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-python/notebook-4.2.0[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND}" diff --git a/dev-util/emscripten-fastcomp/Manifest b/dev-util/emscripten-fastcomp/Manifest index 4d8e9cac6..350ec0e80 100644 --- a/dev-util/emscripten-fastcomp/Manifest +++ b/dev-util/emscripten-fastcomp/Manifest @@ -1,4 +1,6 @@ DIST emscripten-fastcomp-1.34.11.tar.gz 20193336 SHA256 476b9b3bb6e88cf31c66a6618b1174a7b770b0c02703f8ddc37ba350c63f2f2e SHA512 53b2f91ea0c923f582300e6e73f1c9f9c830b74db165a1e01a660e0110da2229029d3283a9b38aa6a55658c492ce8e632e233ae0e3a154842fd41fcd68eebb47 WHIRLPOOL ebd3e6c833c65b0d365fd11bd668cc5d61656ae357d6ba62bd0f4eda772589241e4ad90351f343edda5659c2d957784c28f118bb502ea86e3f7549b87216cfd5 DIST emscripten-fastcomp-1.35.2.tar.gz 21566912 SHA256 3bbc7990138381b0cbdac39f83afee76fa143efe81dba4939c1f514dccc307a3 SHA512 589844960a43f9ba70f1e073751bb9eea5b31f954fe798138e00a5ca0100472d6e0f32f08d4e04f2dc9f0c9bb422d36e7fcdb0a4981b876807d04ff4424c6b93 WHIRLPOOL a08adbed097ff2a8f2115ebcd768258a99266734432c1742c8499b53736546733b214ca0e5c00a51048d0f979cbf83017954ee52ca1348717343ceb5dbeeb818 +DIST emscripten-fastcomp-1.36.4.tar.gz 24187515 SHA256 77652f758271a61edc42631a00d1458042e5a3ec94f8544cc76a0df3532a9957 SHA512 2a6c0503f3a6a8defc8f0c60d45cf516d1f10cc8a61f6b50f4dada5565456944267d44654b657bab399bfdfe5f1f257d4fd807a0ec260e9fd4100c12beec3239 WHIRLPOOL d93c37d8ed91307db41a1e7245d547a4b8493a576999e27355dce69847988b999e502cceefe2ab1e1fcf0c15d7433d663c1b5b0bd6f0e81f6ecb56dc0e3b642e DIST emscripten-fastcomp-clang-1.34.11.tar.gz 12055966 SHA256 4a453a90212eb8ae9ab90ea055f7072642aca4b5343ff9c33ff28d3f17759241 SHA512 2e69cc41d8ca1a632c36406a5ab42e316a09befbd5390f05ab9852b50fa38b22b719bf41e100e14c63d11d9a4848ac3f6cae4371dfb69f63a93cadbff178aca6 WHIRLPOOL 7f9bda2449bda31b030c1f582f7fde7390873fd5a2a1fb3904de883b990802c2b617e90b5d41dfae1936e7992e60f64dcd05e8647c7f05676c180c1832418ba4 DIST emscripten-fastcomp-clang-1.35.2.tar.gz 12505548 SHA256 5f7090fe66b9462e172cb7a889d9044aa301ffc946072293dd2b269973f358ce SHA512 1dd57ebd4c87251b99a9dd03c7f0d34762e39717523c50338262d1d95e5a9fd826a8cc2e9a46f0389510bd372da59a8163b2995007e81e5a6a6bcdd66e993b4b WHIRLPOOL dca22b5d38eb517a2e39b69bc2d6c3b1e966f3e6b7d5a4c05fe9fa28e917cee0fbd6dcdda116e73e1cb1a54b747a9d7d74549cc48f37187c48cfd7ac025da973 +DIST emscripten-fastcomp-clang-1.36.4.tar.gz 13140527 SHA256 dac149b0053d6231873531489a2a29472ddc270064b1724719b02b3aa0f9c643 SHA512 061a53b44a44b6cee1ff33a88a3df490337824278b3fd8f1a2024ac0ce62ca54b05c4c7b80b2b2276c320fdabba826f30c87aef717fa038729022e8b137fa16d WHIRLPOOL f0976be8a739c039e4a1409b4e0fdcd24a0f3114d42516ff13112b338af02672780dda3cc4f8701f1d3a55742907f0a8c092428cab5336d54fd4fbd47f366c96 diff --git a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.34.11.ebuild b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.34.11.ebuild index 94698801d..254de499b 100644 --- a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.34.11.ebuild +++ b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.34.11.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) diff --git a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.35.2.ebuild b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.35.2.ebuild index 94698801d..254de499b 100644 --- a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.35.2.ebuild +++ b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.35.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) diff --git a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.36.4.ebuild b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.36.4.ebuild new file mode 100644 index 000000000..0987403d3 --- /dev/null +++ b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.36.4.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils python-single-r1 + +DESCRIPTION="Emscripten LLVM backend - Fastcomp is the default compiler core for Emscripten" +HOMEPAGE="http://emscripten.org/" +SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/kripken/${PN}-clang/archive/${PV}.tar.gz -> ${PN}-clang-${PV}.tar.gz" +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="UoI-NCSA" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + net-libs/nodejs" +RDEPEND="${DEPEND} + >=virtual/jre-1.5" + +src_prepare() { + eapply "${FILESDIR}/${PV}/CMakeLists.txt.patch" + cd "${S}/../${PN}-clang-${PV}" || \ + die "Could not change to directory '${S}/../${PN}-clang-${PV}'" + eapply "${FILESDIR}/${PV}/Version.cpp.patch" + cd "${S}" || die "Could not change to directory '${S}'" + eapply_user +} + +src_configure() { + # create symlink to tools/clang + ln -s "${WORKDIR}/${PN}-clang-${PV}/" "${WORKDIR}/${P}/tools/clang" \ + || die "Could not create symlink to tools/clang" + local mycmakeargs=( + # avoid clashes with sys-devel/llvm + -DCMAKE_INSTALL_PREFIX="/usr/share/${P}" + -DLLVM_TARGETS_TO_BUILD="X86;JSBackend" + -DLLVM_INCLUDE_EXAMPLES=OFF + -DLLVM_INCLUDE_TESTS=OFF + -DCLANG_INCLUDE_EXAMPLES=OFF + -DCLANG_INCLUDE_TESTS=OFF + ) + cmake-utils_src_configure +} diff --git a/dev-util/emscripten-fastcomp/files/1.36.4/CMakeLists.txt.patch b/dev-util/emscripten-fastcomp/files/1.36.4/CMakeLists.txt.patch new file mode 100644 index 000000000..d053132a3 --- /dev/null +++ b/dev-util/emscripten-fastcomp/files/1.36.4/CMakeLists.txt.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt.orig 2016-05-12 13:26:02.739443914 +0200 ++++ b/CMakeLists.txt 2016-05-12 13:26:26.448733236 +0200 +@@ -175,7 +175,7 @@ + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) + + if (CMAKE_BUILD_TYPE AND +- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") ++ NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|GENTOO)$") + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") + endif() diff --git a/dev-util/emscripten-fastcomp/files/1.36.4/Version.cpp.patch b/dev-util/emscripten-fastcomp/files/1.36.4/Version.cpp.patch new file mode 100644 index 000000000..291a1ea6d --- /dev/null +++ b/dev-util/emscripten-fastcomp/files/1.36.4/Version.cpp.patch @@ -0,0 +1,14 @@ +--- a/lib/Basic/Version.cpp 2016-03-17 23:31:35.160129074 +0100 ++++ b/lib/Basic/Version.cpp 2016-03-17 23:32:07.722127712 +0100 +@@ -135,9 +135,9 @@ + + // XXX EMSCRIPTEN: show our versions + OS << " (emscripten " +-#include "../../../../emscripten-version.txt" ++#include "../../emscripten-version.txt" + " : " +-#include "../../../../tools/clang/emscripten-version.txt" ++#include "../../emscripten-version.txt" + ")"; + + return OS.str(); diff --git a/dev-util/emscripten/Manifest b/dev-util/emscripten/Manifest index 43faa69bf..bd7e7b664 100644 --- a/dev-util/emscripten/Manifest +++ b/dev-util/emscripten/Manifest @@ -1,2 +1,3 @@ DIST emscripten-1.34.11.tar.gz 31637704 SHA256 4b2790279372ea016dbe64eda95cfde3f2a695e369c5f7cd9a62e2f69991ceb7 SHA512 8ecd3972b6ea3ccf27a8ab2532716910cf1d0425e3708a3a4b9808182c2662591b6389cbf27bc98a2b96ecb8948fc1e0bc3204cb3c88bb349f29c0ba55758088 WHIRLPOOL 266782cdbc44c3ccb036ea8f02dafc2d7fe3f5d1ea1aa5fe8d2deff30c73b08a95dd1d22251df9d4f666277ea73da5bc88ade3b5ce1531b7158b112be05e3b2e DIST emscripten-1.35.2.tar.gz 31758712 SHA256 56feaa3037ec72e2d5299b0a92d7e3b9e1da164db32338c1fe02fe3ca68d8adb SHA512 a7391424a8a0845062360c0ccecda30030e32cb6732009b83a781baef0f7cfd6890fe1ad95531380221b728d707cb315157f2717597e1ca74aedc5e8a73e64e6 WHIRLPOOL 092f8d98d2571b18422a2fde48802520b74739be9ad9402ff317176a3260f72695cee5e84eef9644e9659bc503c9d8b75b5a510f67a71f4b78545fc5c45db4b3 +DIST emscripten-1.36.4.tar.gz 31955402 SHA256 bb4b224467829bc14e26ec7f5603e36312e2edb8a4a33267dde67c6f0e33e260 SHA512 3e68b557ac941f63fcb8dd01bf87d0f656fa3f7494172175de2a66352b1161e080a0c8c952930e1a65e56fb40797e2b5efa9008f7374db07373cda67530dd96b WHIRLPOOL 2d7c1a710b0782844b3e4593e43b02c4ad81449423289efaa4179b08661f6a97828d6aa3f03cdeb7d5a4f7739199306cb24c2a56056c8474ccee53fa6a43deba diff --git a/dev-util/emscripten/emscripten-1.34.11.ebuild b/dev-util/emscripten/emscripten-1.34.11.ebuild index 967b66c34..8bcc33da7 100644 --- a/dev-util/emscripten/emscripten-1.34.11.ebuild +++ b/dev-util/emscripten/emscripten-1.34.11.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) @@ -34,6 +34,7 @@ prepare_file() { src_prepare() { prepare_file "99emscripten" prepare_file "emscripten.config" + eapply_user } src_test() { diff --git a/dev-util/emscripten/emscripten-1.35.2.ebuild b/dev-util/emscripten/emscripten-1.35.2.ebuild index 967b66c34..8bcc33da7 100644 --- a/dev-util/emscripten/emscripten-1.35.2.ebuild +++ b/dev-util/emscripten/emscripten-1.35.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) @@ -34,6 +34,7 @@ prepare_file() { src_prepare() { prepare_file "99emscripten" prepare_file "emscripten.config" + eapply_user } src_test() { diff --git a/dev-util/emscripten/emscripten-1.36.4.ebuild b/dev-util/emscripten/emscripten-1.36.4.ebuild new file mode 100644 index 000000000..1235a1a88 --- /dev/null +++ b/dev-util/emscripten/emscripten-1.36.4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-single-r1 + +DESCRIPTION="LLVM-to-JavaScript Compiler" +HOMEPAGE="http://emscripten.org/" +SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="UoI-NCSA" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + ~dev-util/emscripten-fastcomp-${PV} + net-libs/nodejs" +RDEPEND="${DEPEND}" + +DEST="/usr/share/" +TEST="${WORKDIR}/test/" + +prepare_file() { + cp "${FILESDIR}/${1}" "${S}/" || die "could not copy '${1}'" + sed -i "s/\${PV}/${PV}/g" "${S}/${1}" || \ + die "could not adjust path for '${1}'" +} + +src_prepare() { + prepare_file "99emscripten" + prepare_file "emscripten.config" + eapply "${FILESDIR}/${PV}/emcc.patch" + eapply "${FILESDIR}/${PV}/emcmake.patch" + eapply_user +} + +src_test() { + mkdir "${TEST}" || die "Could not create test directory!" + cp "${FILESDIR}/hello_world.cpp" "${TEST}" || die "Could not copy example file" + cp "${S}/emscripten.config" "${TEST}" || die "Could not copy config file" + sed -i -e "/^EMSCRIPTEN_ROOT/s|/usr/share/|${S}|" \ + "${TEST}/emscripten.config" || die "Could not adjust path for testing" + export EM_CONFIG="${TEST}/emscripten.config" || die "Could not export variable" + ../"${P}/emcc" "${TEST}/hello_world.cpp" -o "${TEST}/hello_world.js" || \ + die "Error during executing emcc!" + test -f "${TEST}/hello_world.js" || die "Could not find '${TEST}/hello_world.js'" + OUT=$(/usr/bin/node "${TEST}/hello_world.js") || \ + die "Could not execute /usr/bin/node" + EXP=$(echo -e -n 'Hello World!\n') || die "Could not create expected string" + if [ "${OUT}" != "${EXP}" ]; then + die "Expected '${EXP}' but got '${OUT}'!" + fi + rm -r "${TEST}" || die "Could not clean-up '${TEST}'" +} + +src_install() { + dodir ${DEST}/${P} + cp -R "${S}/" "${D}/${DEST}" || die "Could not install files" + dosym ../share/${P}/emcc /usr/bin/emcc + dosym ../share/${P}/emcmake /usr/bin/emcmake + doenvd 99emscripten + ewarn "If you consider using emscripten in an active shell,"\ + "please execute 'source /etc/profile'" +} + +pkg_postinst() { + elog "Running emscripten initialization, may take a few seconds..." + export EM_CONFIG="${DEST}/${P}/emscripten.config" || die "Could not export variable" + /usr/bin/emcc -v || die "Could not run emcc initialization" +} diff --git a/dev-util/emscripten/files/1.36.4/emcc.patch b/dev-util/emscripten/files/1.36.4/emcc.patch new file mode 100644 index 000000000..49bf9fd0b --- /dev/null +++ b/dev-util/emscripten/files/1.36.4/emcc.patch @@ -0,0 +1,16 @@ +--- a/emcc.orig 2016-05-13 02:59:24.977645718 +0200 ++++ b/emcc 2016-05-13 03:00:22.778643301 +0200 +@@ -4,6 +4,7 @@ + + + import sys ++import os + + + +@@ -14,4 +15,4 @@ + else: + import os, subprocess + if __name__ == '__main__': +- sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcc.py')] + sys.argv[1:])) ++ sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcc.py')] + sys.argv[1:])) diff --git a/dev-util/emscripten/files/1.36.4/emcmake.patch b/dev-util/emscripten/files/1.36.4/emcmake.patch new file mode 100644 index 000000000..02ce70321 --- /dev/null +++ b/dev-util/emscripten/files/1.36.4/emcmake.patch @@ -0,0 +1,16 @@ +--- a/emcmake.orig 2016-05-13 02:59:31.244645456 +0200 ++++ b/emcmake 2016-05-13 03:03:54.995634425 +0200 +@@ -4,6 +4,7 @@ + + + import sys ++import os + + + +@@ -14,4 +15,4 @@ + else: + import os, subprocess + if __name__ == '__main__': +- sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcmake.py')] + sys.argv[1:])) ++ sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcmake.py')] + sys.argv[1:])) diff --git a/sci-biology/full_lengther_next/Manifest b/sci-biology/full_lengther_next/Manifest index 22a49e195..b054058b4 100644 --- a/sci-biology/full_lengther_next/Manifest +++ b/sci-biology/full_lengther_next/Manifest @@ -1 +1 @@ -DIST full_lengther_next-0.6.1.gem 2039296 SHA256 32d49c0618fee6edeea87aa474e3991df179e4895c03af2dd5b53ccfb105a338 SHA512 6fecd0b1c1ebbbe7c55ccd1b7b97fae4cf8621fcf72e90fecceaaab25a91fa3ead4ac89cbf7eb4189ab2ffb6e401e3b291917a5d46987ea46323976bb506f940 WHIRLPOOL 5d98d88c0b2cdae18e7cfc71d033474102da8470b933337d50647f95104e68f39e139d8503520239f9efedbeeb2ca628e3319f060d608a97289f01e16e52bddb +DIST full_lengther_next-0.6.2.gem 2039296 SHA256 28f7700e8c2ada7ccd5034290d6dd4f1e69c3751949bdad1b18996deb606dcda SHA512 19b2608137cb8129da08cbd064d2667290f8d0693f8471dcb3a7ab194de1d02b940b58c16abda8cfba5bf9e803b948f8da21c3a82c5e1b73c30346cbeb12191f WHIRLPOOL 94b7ebe3a3da752e1822fefb99d011e6d247f2d04ba2fb505c192a950f0d4f46bdefa0c81f3231627b6a4297bf16606b714c44f12e519be01c6d5486eba02074 diff --git a/sci-biology/full_lengther_next/full_lengther_next-0.6.1.ebuild b/sci-biology/full_lengther_next/full_lengther_next-0.6.2.ebuild index 4348fcf64..4348fcf64 100644 --- a/sci-biology/full_lengther_next/full_lengther_next-0.6.1.ebuild +++ b/sci-biology/full_lengther_next/full_lengther_next-0.6.2.ebuild diff --git a/sci-biology/mothur/mothur-1.36.1.ebuild b/sci-biology/mothur/mothur-1.36.1.ebuild index c82f7fc14..71afd3a08 100644 --- a/sci-biology/mothur/mothur-1.36.1.ebuild +++ b/sci-biology/mothur/mothur-1.36.1.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$ @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86" CDEPEND="dev-libs/boost" RDEPEND=" + readline? ( sys-libs/readline:= ) sci-biology/uchime mpi? ( virtual/mpi )" DEPEND="${RDEPEND} @@ -27,7 +28,8 @@ pkg_setup() { use mpi && export CXX=mpicxx || export CXX=$(tc-getCXX) use amd64 && append-cppflags -DBIT_VERSION use readline && export USEREADLINE=yes || export USEREADLINE=no - # use boost && export USEBOOST=yes || export USEBOOST=no + # there is not USE=boost + export USEBOOST=yes use zlib && export USECOMPRESSION=yes || export USECOMPRESSION=no } @@ -43,4 +45,5 @@ src_compile() { src_install() { dobin ${PN} + dodoc README.md } diff --git a/sci-libs/arrayfire/Manifest b/sci-libs/arrayfire/Manifest index e08ec1887..59dbac2b7 100644 --- a/sci-libs/arrayfire/Manifest +++ b/sci-libs/arrayfire/Manifest @@ -1,3 +1,4 @@ DIST arrayfire-3.1.3.tar.bz2 23740458 SHA256 72cf094fec4366d2ee4d87a064a8beece9b1460a0340d739291208f8a001093f SHA512 500fd7652494fed5891f0c8bc31ca3ab87cc0c8587f13793621bb5f8c348c3dddccfc1805b99360251c87998765e0c3221e55c49fa4ac2eb3a1c06c1aeb680ee WHIRLPOOL 384d94bdeb5c993559df9524d63e55ef757898c2d7ef370feaaf2733ffe8d3a9543f1c7bcda67d14622a29adf4e6b7bc2dcacde4471291a07bc6e8f79c9e5ea1 DIST arrayfire-3.2.2.tar.bz2 30359885 SHA256 7bcc13ff29bdfb647813ee0e9830ce8387217953427abe0d9904de671e600831 SHA512 ff897eb24d85d83bf844a7507181f2091ac7d902260b9f4b4b2d4aea898c3e818a4694eb57dfff67aaeeabc6180b5e6e1e295eab5ccdab639e280fa62b5e0945 WHIRLPOOL 427a0f97e8934990f63e38d312792706c16fc6a7d6473e05ed49bfa0a71892ed0114df3f295ccaaa9632a03241ac20eefa1cee7e929bfbb2445f8e0cf50f3e98 +DIST arrayfire-3.3.2.tar.bz2 34100522 SHA256 354d4cf2811718d4e73170f0116b2ac4518402f2a627c9169ba107a89abda158 SHA512 0f7101af887d52eea537c8cbe41e26676f3acb26d2af903e2e6152433ecceb5349633b5f6e8a677854839fbc5ff5a64e88d31d85e80c4c55cab9836ccba579fb WHIRLPOOL b7f0044039b15fc399837883b391026e8040494fb2934736a62cec68269446305bddc480f73070d8a2dcde0b36209413841a1d0b33ad71f13074e324bbb90434 DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049 diff --git a/sci-libs/arrayfire/arrayfire-3.1.3-r1.ebuild b/sci-libs/arrayfire/arrayfire-3.1.3-r1.ebuild index 3b3591b34..12f6fcfd0 100644 --- a/sci-libs/arrayfire/arrayfire-3.1.3-r1.ebuild +++ b/sci-libs/arrayfire/arrayfire-3.1.3-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit cmake-utils multilib @@ -85,18 +85,18 @@ src_configure() { fi local mycmakeargs=( - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - $(cmake-utils_use_build opencl OPENCL) - $(cmake-utils_use_build examples EXAMPLES) - $(cmake-utils_use_build test TEST) - $(cmake-utils_use_build graphics GRAPHICS) - $(cmake-utils_use_build nonfree NONFREE) - -DUSE_SYSTEM_BOOST_COMPUTE=ON - -DUSE_SYSTEM_CLBLAS=ON - -DUSE_SYSTEM_CLFFT=ON - -DUSE_SYSTEM_FORGE=ON - -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire + -DBUILD_CPU="$(usex cpu)" + -DBUILD_CUDA="$(usex cuda)" + -DBUILD_OPENCL="$(usex opencl)" + -DBUILD_EXAMPLES="$(usex examples)" + -DBUILD_TEST="$(usex test)" + -DBUILD_GRAPHICS="$(usex graphics)" + -DBUILD_NONFREE="$(usex nonfree)" + -DUSE_SYSTEM_BOOST_COMPUTE=ON + -DUSE_SYSTEM_CLBLAS=ON + -DUSE_SYSTEM_CLFFT=ON + -DUSE_SYSTEM_FORGE=ON + -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire ) cmake-utils_src_configure } diff --git a/sci-libs/arrayfire/arrayfire-3.2.2.ebuild b/sci-libs/arrayfire/arrayfire-3.2.2.ebuild index b92c6623f..aa766c93c 100644 --- a/sci-libs/arrayfire/arrayfire-3.2.2.ebuild +++ b/sci-libs/arrayfire/arrayfire-3.2.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit cmake-utils multilib @@ -85,19 +85,19 @@ src_configure() { fi local mycmakeargs=( - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - $(cmake-utils_use_build opencl OPENCL) - $(cmake-utils_use_build examples EXAMPLES) - $(cmake-utils_use_build test TEST) - $(cmake-utils_use_build graphics GRAPHICS) - $(cmake-utils_use_build nonfree NONFREE) - $(cmake-utils_use_build unified UNIFIED) - -DUSE_SYSTEM_BOOST_COMPUTE=ON - -DUSE_SYSTEM_CLBLAS=ON - -DUSE_SYSTEM_CLFFT=ON - -DUSE_SYSTEM_FORGE=ON - -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire + -DBUILD_CPU="$(usex cpu)" + -DBUILD_CUDA="$(usex cuda)" + -DBUILD_OPENCL="$(usex opencl)" + -DBUILD_EXAMPLES="$(usex examples)" + -DBUILD_TEST="$(usex test)" + -DBUILD_GRAPHICS="$(usex graphics)" + -DBUILD_NONFREE="$(usex nonfree)" + -DBUILD_UNIFIED="$(usex unified)" + -DUSE_SYSTEM_BOOST_COMPUTE=ON + -DUSE_SYSTEM_CLBLAS=ON + -DUSE_SYSTEM_CLFFT=ON + -DUSE_SYSTEM_FORGE=ON + -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire ) cmake-utils_src_configure } diff --git a/sci-libs/arrayfire/arrayfire-3.3.2.ebuild b/sci-libs/arrayfire/arrayfire-3.3.2.ebuild new file mode 100644 index 000000000..78c0ecc58 --- /dev/null +++ b/sci-libs/arrayfire/arrayfire-3.3.2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils multilib + +GTEST_PV="1.7.0" + +DESCRIPTION="A general purpose GPU library" +HOMEPAGE="http://www.arrayfire.com/" +SRC_URI="http://arrayfire.com/arrayfire_source/${PN}-full-${PV}.tar.bz2 -> ${P}.tar.bz2 +test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip )" +KEYWORDS="~amd64" + +LICENSE="BSD + nonfree? ( OpenSIFT )" +SLOT="0" +IUSE="+examples +cpu cuda nonfree opencl test unified graphics" + +RDEPEND=" + >=sys-devel/gcc-4.7:* + media-libs/freeimage + cuda? ( + >=dev-util/nvidia-cuda-toolkit-7.5.18-r1 + dev-libs/boost + ) + cpu? ( + virtual/blas + virtual/cblas + virtual/lapacke + sci-libs/fftw:3.0 + ) + opencl? ( + virtual/blas + virtual/cblas + virtual/lapacke + dev-libs/boost + dev-libs/boost-compute + >=sci-libs/clblas-2.4 + >=sci-libs/clfft-2.6.1 + ) + graphics? ( + media-libs/glew + >=media-libs/glfw-3.1.1 + =sci-visualization/forge-3.2.2 + )" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}-full-${PV}" +BUILD_DIR="${S}/build" +CMAKE_BUILD_TYPE=Release + +PATCHES=("${FILESDIR}/${P}-FindLAPACKE.patch") + +# We need write acccess /dev/nvidiactl, /dev/nvidia0 and /dev/nvidia-uvm and the portage +# user is (usually) not in the video group +RESTRICT="userpriv" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then + die "Compilation with gcc older than 4.7 is not supported." + fi + fi +} + +src_unpack() { + default + + if ! use nonfree; then + find "${WORKDIR}" -name "*_nonfree*" -delete || die + fi + + if use test; then + mkdir -p "${BUILD_DIR}"/third_party/src/ || die + mv "${WORKDIR}"/gtest-"${GTEST_PV}" "${BUILD_DIR}"/third_party/src/googletest || die + fi +} + +src_configure() { + if use cuda; then + addwrite /dev/nvidiactl + addwrite /dev/nvidia0 + addwrite /dev/nvidia-uvm + fi + + local mycmakeargs=( + -DBUILD_CPU="$(usex cpu)" + -DBUILD_CUDA="$(usex cuda)" + -DBUILD_OPENCL="$(usex opencl)" + -DBUILD_EXAMPLES="$(usex examples)" + -DBUILD_TEST="$(usex test)" + -DBUILD_GRAPHICS="$(usex graphics)" + -DBUILD_NONFREE="$(usex nonfree)" + -DBUILD_UNIFIED="$(usex unified)" + -DUSE_SYSTEM_BOOST_COMPUTE=ON + -DUSE_SYSTEM_CLBLAS=ON + -DUSE_SYSTEM_CLFFT=ON + -DUSE_SYSTEM_FORGE=ON + -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + dobin "${BUILD_DIR}/bin2cpp" +} diff --git a/sci-libs/arrayfire/arrayfire-9999.ebuild b/sci-libs/arrayfire/arrayfire-9999.ebuild index a4b1d90d1..b0494ea35 100644 --- a/sci-libs/arrayfire/arrayfire-9999.ebuild +++ b/sci-libs/arrayfire/arrayfire-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit cmake-utils git-r3 multilib @@ -44,7 +44,7 @@ RDEPEND=" graphics? ( media-libs/glew >=media-libs/glfw-3.1.1 - >=sci-visualization/forge-3.1 + =sci-visualization/forge-3.2.2 )" DEPEND="${RDEPEND}" @@ -86,19 +86,19 @@ src_configure() { fi local mycmakeargs=( - $(cmake-utils_use_build cpu CPU) - $(cmake-utils_use_build cuda CUDA) - $(cmake-utils_use_build opencl OPENCL) - $(cmake-utils_use_build examples EXAMPLES) - $(cmake-utils_use_build test TEST) - $(cmake-utils_use_build graphics GRAPHICS) - $(cmake-utils_use_build nonfree NONFREE) - $(cmake-utils_use_build unified UNIFIED) - -DUSE_SYSTEM_BOOST_COMPUTE=ON - -DUSE_SYSTEM_CLBLAS=ON - -DUSE_SYSTEM_CLFFT=ON - -DUSE_SYSTEM_FORGE=ON - -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire + -DBUILD_CPU="$(usex cpu)" + -DBUILD_CUDA="$(usex cuda)" + -DBUILD_OPENCL="$(usex opencl)" + -DBUILD_EXAMPLES="$(usex examples)" + -DBUILD_TEST="$(usex test)" + -DBUILD_GRAPHICS="$(usex graphics)" + -DBUILD_NONFREE="$(usex nonfree)" + -DBUILD_UNIFIED="$(usex unified)" + -DUSE_SYSTEM_BOOST_COMPUTE=ON + -DUSE_SYSTEM_CLBLAS=ON + -DUSE_SYSTEM_CLFFT=ON + -DUSE_SYSTEM_FORGE=ON + -DAF_INSTALL_CMAKE_DIR=/usr/$(get_libdir)/cmake/ArrayFire ) cmake-utils_src_configure } diff --git a/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch b/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch new file mode 100644 index 000000000..ab9b2f5e9 --- /dev/null +++ b/sci-libs/arrayfire/files/arrayfire-3.3.2-FindLAPACKE.patch @@ -0,0 +1,28 @@ +https://github.com/arrayfire/arrayfire/issues/1419 + + +From 2691d99693d6185d4f322a7776b1ced0e76877d2 Mon Sep 17 00:00:00 2001 +From: Shehzan Mohammed <shehzan@arrayfire.com> +Date: Wed, 18 May 2016 10:18:34 -0400 +Subject: [PATCH] BUGFIX Correctly handle lapacke found by package config + +--- + CMakeModules/FindLAPACKE.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeModules/FindLAPACKE.cmake b/CMakeModules/FindLAPACKE.cmake +index 5ecf7be..2ebd8dd 100644 +--- a/CMakeModules/FindLAPACKE.cmake ++++ b/CMakeModules/FindLAPACKE.cmake +@@ -143,7 +143,7 @@ ELSE(PC_LAPACKE_FOUND) + ENDIF(LAPACKE_ROOT_DIR) + ENDIF(PC_LAPACKE_FOUND) + +-IF(LAPACKE_LIB AND LAPACK_LIB) ++IF(PC_LAPACKE_FOUND OR (LAPACKE_LIB AND LAPACK_LIB)) + SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIB}) + ENDIF() + IF(LAPACKE_INCLUDES) +-- +2.7.3 + |