[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2020-09-21 Thread Aisha Tammy 
commit: 71dec575da742097d317d96b8b000cc74a3f6e4f
Author: Aisha Tammy  aisha  cc>
AuthorDate: Mon Sep 21 23:08:59 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Mon Sep 21 23:09:08 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=71dec575

dev-python/notebook: drop package

present in ::gentoo

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>

 dev-python/notebook/metadata.xml  | 15 -
 dev-python/notebook/notebook-4.0.6.ebuild | 91 ---
 dev-python/notebook/notebook-.ebuild  | 90 --
 3 files changed, 196 deletions(-)

diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
deleted file mode 100644
index 9b08c7c0f..0
--- a/dev-python/notebook/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   s...@gentoo.org
-   Gentoo Science Project
-   
-   
-The Jupyter HTML notebook is a web-based notebook environment
-for interactive computing.
-
-   
-   notebook
-   
-

diff --git a/dev-python/notebook/notebook-4.0.6.ebuild 
b/dev-python/notebook/notebook-4.0.6.ebuild
deleted file mode 100644
index c704eaf44..0
--- a/dev-python/notebook/notebook-4.0.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{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"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-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[${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() {
-   sed \
-   -e "/import setup/s:$:\nimport setuptools:g" \
-   -i setup.py || die
-
-   # disable bundled mathjax
-   sed -i 's/^.*MathJax.*$//' bower.json || die
-   sed -i 's/mj(/#mj(/' setupbase.py || 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 --with-coverage --cover-package=notebook notebook || die
-
-   "${PYTHON}" -m notebook.jstest base || die
-   "${PYTHON}" -m notebook.jstest notebook || die
-   "${PYTHON}" -m notebook.jstest services || die
-   "${PYTHON}" -m notebook.jstest tree || 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/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
deleted file mode 100644
index e54ee851c..0
--- a/dev-python/notebook/notebook-.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="http://jupyter.org";
-EGIT_REPO_URI="https://github.com/jupyter/${PN}.git 
git://github.com/jupyter/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-RDEPEND="
-   >=dev-libs/mathjax-2.4
-   dev-python/jinja[${PYTHON_USEDEP}]
-   >=dev-python/term

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2017-01-03 Thread Marius Brehler 
commit: ad2a26a8ab7a47151418605eaf284f41be63ab1e
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Jan  3 10:28:33 2017 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Jan  3 10:28:33 2017 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ad2a26a8

dev-python/notebook: Drop python3_3

Package-Manager: portage-2.3.0

 dev-python/notebook/notebook-4.0.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/notebook/notebook-4.0.6.ebuild 
b/dev-python/notebook/notebook-4.0.6.ebuild
index d53ade7..4bda11b 100644
--- a/dev-python/notebook/notebook-4.0.6.ebuild
+++ b/dev-python/notebook/notebook-4.0.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2016-05-23 Thread Marius Brehler 
commit: 9af95e214164469414fd79c70bbefdfa1644
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Mon May 23 07:06:02 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Mon May 23 07:06:02 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9af95e21

dev-python/notebook: Bump to EAPI=6, drop python3_4 support

Package-Manager: portage-2.2.28

 dev-python/notebook/notebook-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 2dc12a4..a316a4d 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -1,10 +1,10 @@
-# 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_COMPAT=( python2_7 python3_{4,5} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 git-r3
@@ -26,7 +26,7 @@ RDEPEND="
dev-python/jupyter_core[${PYTHON_USEDEP}]
dev-python/jupyter_client[${PYTHON_USEDEP}]
dev-python/nbformat[${PYTHON_USEDEP}]
-   dev-python/nbconvert[${PYTHON_USEDEP}]
+   >=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
dev-python/ipykernel[${PYTHON_USEDEP}]
"
 DEPEND="${RDEPEND}

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/files/, dev-python/notebook/

2016-05-23 Thread Marius Brehler 
commit: 4ff5395603e0f6233ef591d4e14bb987615482c0
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Fri May 20 06:43:03 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri May 20 06:43:03 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4ff53956

dev-python/notebook: Moved to tree

Package-Manager: portage-2.2.28

 .../files/notebook-4.2.0-setupbase.py.patch| 42 --
 dev-python/notebook/notebook-4.2.0.ebuild  | 94 --
 2 files changed, 136 deletions(-)

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
deleted file mode 100644
index a4c2904..000
--- a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index 5aeeac7..000
--- a/dev-python/notebook/notebook-4.2.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/files/

2016-05-18 Thread Marius Brehler 
commit: 05b93f7a558e3441c23741b47d56807f2c281683
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Wed May 18 07:03:28 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Wed May 18 07:03:28 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=05b93f7a

dev-python/notebook: Make patch -p1 using git --diff

Package-Manager: portage-2.2.28

 dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 949c445..a4c2904 100644
--- a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
+++ b/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
@@ -1,8 +1,8 @@
 Disable bundled mathjax.
 
 Patch by Marius Brehler
 ${WORKDIR}/setupbase.py2016-04-15 21:15:35.0 +0200
-+++ ${WORKDIR}/setupbase.py2016-05-17 14:54:04.998783993 +0200
+--- 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))

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/, dev-python/notebook/files/

2016-05-17 Thread Marius Brehler 
commit: dbb43424cf13adf94071f7a76a81b7b83adb5a6e
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue May 17 12:59:42 2016 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue May 17 12:59:42 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=dbb43424

dev-python/notebook: Version bump

Package-Manager: portage-2.2.28

 .../files/notebook-4.2.0-setupbase.py.patch| 42 ++
 dev-python/notebook/notebook-4.2.0.ebuild  | 94 ++
 2 files changed, 136 insertions(+)

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 000..949c445
--- /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
+--- ${WORKDIR}/setupbase.py2016-04-15 21:15:35.0 +0200
 ${WORKDIR}/setupbase.py2016-05-17 14:54:04.998783993 +0200
+@@ -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 000..5aeeac7
--- /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/Math

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/files/, dev-python/notebook/

2015-11-28 Thread Marius Brehler 
commit: 374b2ddcb384c9a37adfe96c26278e5f59256542
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Sat Nov 28 17:52:16 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sat Nov 28 17:52:16 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=374b2ddc

dev-python/notebook: Drop old

Package-Manager: portage-2.2.20.1
RepoMan-Options: --force

 dev-python/notebook/ChangeLog  |  8 ++
 ...k-4.0.4-Don-t-redirect-from-edit-to-files.patch | 55 -
 ...nly-redirect-to-editor-for-text-documents.patch | 38 -
 .../notebook-4.0.4-set-mime-type-on-files.patch| 35 
 ...et-model-mimetype-even-when-content-False.patch | 64 ---
 dev-python/notebook/notebook-4.0.4-r3.ebuild   | 93 --
 6 files changed, 8 insertions(+), 285 deletions(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index be49522..876f16f 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  28 Nov 2015; Marius Brehler 
+  -files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch,
+  -files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch,
+  -files/notebook-4.0.4-set-mime-type-on-files.patch,
+  -files/notebook-4.0.4-set-model-mimetype-even-when-content-False.patch,
+  -notebook-4.0.4-r3.ebuild:
+  dev-python/notebook: Drop old
+
 *notebook-4.0.6 (16 Oct 2015)
 
   16 Oct 2015; Marius Brehler  
+notebook-4.0.6.ebuild,

diff --git 
a/dev-python/notebook/files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch
 
b/dev-python/notebook/files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch
deleted file mode 100644
index 76d0e61..000
--- 
a/dev-python/notebook/files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Upstream patch to fix
-"Maliciously crafted text files in IPython/Jupyter editor".
-
-http://seclists.org/oss-sec/2015/q3/558
-https://bugs.gentoo.org/show_bug.cgi?id=560708
-
-
-From 23162fd2895ad7445fdbe095b8fc8633d95ec6e6 Mon Sep 17 00:00:00 2001
-From: Min RK 
-Date: Mon, 20 Jul 2015 12:11:23 -0700
-Subject: [PATCH 4/4] Don't redirect from /edit/ to /files/
-
-show failure to decode, instead

- notebook/static/edit/js/editor.js | 15 +++
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/notebook/static/edit/js/editor.js 
b/notebook/static/edit/js/editor.js
-index ddbc2de..421fa57 100644
 a/notebook/static/edit/js/editor.js
-+++ b/notebook/static/edit/js/editor.js
-@@ -90,19 +90,10 @@ function($,
- }).catch(
- function(error) {
- that.events.trigger("file_load_failed.Editor", error);
--if (((error.xhr||{}).responseJSON||{}).reason === 'bad 
format') {
--window.location = utils.url_path_join(
--that.base_url,
--'files',
--that.file_path
--);
--} else {
--console.warn('Error while loading: the error was:')
--console.warn(error)
--}
-+console.warn('Error loading: ', error);
- cm.setValue("Error! " + error.message +
- "\nSaving disabled.\nSee Console for more 
details.");
--cm.setOption('readOnly','nocursor')
-+cm.setOption('readOnly','nocursor');
- that.save_enabled = false;
- }
- );
-@@ -186,7 +177,7 @@ function($,
- Editor.prototype._clean_state = function(){
- var clean = this.codemirror.isClean(this.generation);
- if (clean === this.clean){
--return
-+return;
- } else {
- this.clean = clean;
- }
--- 
-2.4.6
-

diff --git 
a/dev-python/notebook/files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch
 
b/dev-python/notebook/files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch
deleted file mode 100644
index 899cd31..000
--- 
a/dev-python/notebook/files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream patch to fix
-"Maliciously crafted text files in IPython/Jupyter editor".
-
-http://seclists.org/oss-sec/2015/q3/558
-https://bugs.gentoo.org/show_bug.cgi?id=560708
-
-
-From 4f0b3b8c10811d460efc67cf61e9f4df83d2a0a7 Mon Sep 17 00:00:00 2001
-From: Min RK 
-Date: Mon, 20 Jul 2015 12:11:04 -0700
-Subject: [PATCH 3/4] only redirect to editor for text documents
-
-treat unidentified mime-types as text

- notebook/static/tree/js/notebooklist.js | 7 +++
- 1 file changed, 7 insertions(+)
-
-diff --git a/notebook/static/tree/js/notebooklist.js 
b/notebook/static/tree/js/notebooklist.js
-index 6308d7f..0b71f42 100644
 a/notebook/sta

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-11-11 Thread Justin Lecher 
commit: f9697d2db7be2c3f61b821e972b86c97f57e5832
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Nov 11 17:10:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Nov 11 17:10:19 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f9697d2d

dev-python/notebook: Depend on threading support in python

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/notebook/notebook-4.0.4-r3.ebuild | 1 +
 dev-python/notebook/notebook-4.0.6.ebuild| 1 +
 dev-python/notebook/notebook-.ebuild | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-python/notebook/notebook-4.0.4-r3.ebuild 
b/dev-python/notebook/notebook-4.0.4-r3.ebuild
index 2c00bf7..45820ba 100644
--- a/dev-python/notebook/notebook-4.0.4-r3.ebuild
+++ b/dev-python/notebook/notebook-4.0.4-r3.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 

diff --git a/dev-python/notebook/notebook-4.0.6.ebuild 
b/dev-python/notebook/notebook-4.0.6.ebuild
index 242587a..d53ade7 100644
--- a/dev-python/notebook/notebook-4.0.6.ebuild
+++ b/dev-python/notebook/notebook-4.0.6.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index cac1dd7..2dc12a4 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 git-r3

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-10-21 Thread Justin Lecher 
commit: 7dd502d881de20ae85bbfdeddeeb8f63917095a0
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Oct 21 09:53:05 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Oct 21 09:53:05 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7dd502d8

dev-python/notebook: Add python3.5 support

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/notebook/notebook-4.0.6.ebuild | 3 ++-
 dev-python/notebook/notebook-.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-python/notebook/notebook-4.0.6.ebuild 
b/dev-python/notebook/notebook-4.0.6.ebuild
index 80fa9fc..242587a 100644
--- a/dev-python/notebook/notebook-4.0.6.ebuild
+++ b/dev-python/notebook/notebook-4.0.6.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index d5ab6df..cac1dd7 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 git-r3

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-10-16 Thread Marius Brehler 
commit: 3839b6acc8f7487ff0c465671e726b049c1c0286
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Fri Oct 16 14:36:59 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Oct 16 14:36:59 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3839b6ac

dev-python/notebook: Version bump to 4.0.6, drop 4.0.5

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog   | 6 ++
 .../notebook/{notebook-4.0.5.ebuild => notebook-4.0.6.ebuild}   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index f5c44fd..be49522 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*notebook-4.0.6 (16 Oct 2015)
+
+  16 Oct 2015; Marius Brehler  
+notebook-4.0.6.ebuild,
+  -notebook-4.0.5.ebuild:
+  dev-python/notebook: Version bump to 4.0.6, drop 4.0.5
+
   02 Oct 2015; Marius Brehler  notebook-4.0.5.ebuild:
   dev-python/notebook: Fix SRC_URI
 

diff --git a/dev-python/notebook/notebook-4.0.5.ebuild 
b/dev-python/notebook/notebook-4.0.6.ebuild
similarity index 97%
rename from dev-python/notebook/notebook-4.0.5.ebuild
rename to dev-python/notebook/notebook-4.0.6.ebuild
index d467425..80fa9fc 100644
--- a/dev-python/notebook/notebook-4.0.5.ebuild
+++ b/dev-python/notebook/notebook-4.0.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
 HOMEPAGE="http://jupyter.org";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
 LICENSE="BSD"

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-10-02 Thread Marius Brehler 
commit: 3db5c87d6b252b2a5ede3f7894f9ebde65093240
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Fri Oct  2 14:27:55 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Fri Oct  2 14:27:55 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3db5c87d

dev-python/notebook: Fix SRC_URI

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog | 3 +++
 dev-python/notebook/notebook-4.0.5.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 2158642..f5c44fd 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  02 Oct 2015; Marius Brehler  notebook-4.0.5.ebuild:
+  dev-python/notebook: Fix SRC_URI
+
   03 Sep 2015; Sean Vig  notebook-4.0.5.ebuild,
   notebook-.ebuild:
   dev-python/notebook: Add javascript tests

diff --git a/dev-python/notebook/notebook-4.0.5.ebuild 
b/dev-python/notebook/notebook-4.0.5.ebuild
index 80fa9fc..d467425 100644
--- a/dev-python/notebook/notebook-4.0.5.ebuild
+++ b/dev-python/notebook/notebook-4.0.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Jupyter Interactive Notebook"
 HOMEPAGE="http://jupyter.org";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
 KEYWORDS="~amd64 ~x86"
 
 LICENSE="BSD"

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-23 Thread Justin Lecher 
commit: 004415190a1d4f3c7b911256b0241ff4dafb9b3d
Author: Sean Vig  gmail  com>
AuthorDate: Thu Sep  3 18:39:22 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Sep 22 14:17:46 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=00441519

dev-python/notebok: Add javascript tests

 dev-python/notebook/ChangeLog | 4 
 dev-python/notebook/notebook-4.0.5.ebuild | 6 ++
 dev-python/notebook/notebook-.ebuild  | 6 ++
 3 files changed, 16 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 2d7e2ea..2158642 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  03 Sep 2015; Sean Vig  notebook-4.0.5.ebuild,
+  notebook-.ebuild:
+  dev-python/notebook: Add javascript tests
+
 *notebook-4.0.5 (22 Sep 2015)
 
   22 Sep 2015; Marius Brehler  
+notebook-4.0.5.ebuild:

diff --git a/dev-python/notebook/notebook-4.0.5.ebuild 
b/dev-python/notebook/notebook-4.0.5.ebuild
index 1989a1a..80fa9fc 100644
--- a/dev-python/notebook/notebook-4.0.5.ebuild
+++ b/dev-python/notebook/notebook-4.0.5.ebuild
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
+   www-client/casperjs
)
doc? (
app-text/pandoc
@@ -66,6 +67,11 @@ python_compile_all() {
 
 python_test() {
nosetests --with-coverage --cover-package=notebook notebook || die
+
+   "${PYTHON}" -m notebook.jstest base || die
+   "${PYTHON}" -m notebook.jstest notebook || die
+   "${PYTHON}" -m notebook.jstest services || die
+   "${PYTHON}" -m notebook.jstest tree || die
 }
 
 python_install() {

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 0d2e0f9..d5ab6df 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
+   www-client/casperjs
)
doc? (
app-text/pandoc
@@ -65,6 +66,11 @@ python_compile_all() {
 
 python_test() {
nosetests --with-coverage --cover-package=notebook notebook || die
+
+   "${PYTHON}" -m notebook.jstest base || die
+   "${PYTHON}" -m notebook.jstest notebook || die
+   "${PYTHON}" -m notebook.jstest services || die
+   "${PYTHON}" -m notebook.jstest tree || die
 }
 
 python_install() {

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-22 Thread Justin Lecher 
commit: d7ae29e138834e66fe9e8d94e6e394e76752621e
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Sep 22 09:11:00 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Sep 22 09:11:00 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d7ae29e1

dev-python/notebook: Cleanup ebuild

Package-Manager: portage-2.2.20.1

 dev-python/notebook/notebook-.ebuild | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index ec79e4f..0d2e0f9 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -5,18 +5,11 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
 
-inherit distutils-r1
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Jupyter Interactive Notebook"
 HOMEPAGE="http://jupyter.org";
-
-if [ ${PV} == "" ] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/jupyter/${PN}.git 
git://github.com/jupyter/${PN}.git"
-else
-   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
+EGIT_REPO_URI="https://github.com/jupyter/${PN}.git 
git://github.com/jupyter/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-22 Thread Justin Lecher 
commit: 1bf8af55da3d685431f0dfe9d23f6a393d12b633
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Sep 22 08:54:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Sep 22 08:54:04 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1bf8af55

dev-python/notebook: Version bump

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog |  5 ++
 dev-python/notebook/notebook-4.0.5.ebuild | 85 +++
 2 files changed, 90 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 9585e9f..2d7e2ea 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*notebook-4.0.5 (22 Sep 2015)
+
+  22 Sep 2015; Marius Brehler  
+notebook-4.0.5.ebuild:
+  dev-python/notebook: Version bump
+
   22 Sep 2015; Marius Brehler 
   notebook-4.0.4-r3.ebuild, notebook-.ebuild:
   dev-python/notebook: Add ~x86 to KEYWORDS, fixes #561032

diff --git a/dev-python/notebook/notebook-4.0.5.ebuild 
b/dev-python/notebook/notebook-4.0.5.ebuild
new file mode 100644
index 000..1989a1a
--- /dev/null
+++ b/dev-python/notebook/notebook-4.0.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+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[${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() {
+   sed \
+   -e "/import setup/s:$:\nimport setuptools:g" \
+   -i setup.py || die
+
+   # disable bundled mathjax
+   sed -i 's/^.*MathJax.*$//' bower.json || die
+   sed -i 's/mj(/#mj(/' setupbase.py || 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 --with-coverage --cover-package=notebook 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
+}

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-22 Thread Justin Lecher 
commit: 14382919b83da8746faa5904ac5d72a85b551cb8
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Sep 22 06:30:24 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Sep 22 06:31:58 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=14382919

dev-python/notebook: Add ~x86 to KEYWORDS, fixes #561032

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog| 4 
 dev-python/notebook/notebook-4.0.4-r3.ebuild | 2 +-
 dev-python/notebook/notebook-.ebuild | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 367ccf3..9585e9f 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  22 Sep 2015; Marius Brehler 
+  notebook-4.0.4-r3.ebuild, notebook-.ebuild:
+  dev-python/notebook: Add ~x86 to KEYWORDS, fixes #561032
+
 *notebook-4.0.4-r3 (17 Sep 2015)
 
   17 Sep 2015; Marius Brehler 

diff --git a/dev-python/notebook/notebook-4.0.4-r3.ebuild 
b/dev-python/notebook/notebook-4.0.4-r3.ebuild
index 810d194..2c00bf7 100644
--- a/dev-python/notebook/notebook-4.0.4-r3.ebuild
+++ b/dev-python/notebook/notebook-4.0.4-r3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Jupyter Interactive Notebook"
 HOMEPAGE="http://jupyter.org";
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="BSD"
 SLOT="0"

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index f6efc45..ec79e4f 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -15,7 +15,7 @@ if [ ${PV} == "" ] ; then
EGIT_REPO_URI="https://github.com/jupyter/${PN}.git 
git://github.com/jupyter/${PN}.git"
 else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-21 Thread Justin Lecher 
commit: 76ad632a8cfcb920bdfafc4e3fd432ea155e
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Sep 21 16:02:54 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Sep 21 16:02:54 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=76ad632a

dev-python/notebook: Fix leading whitespaces

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/notebook/notebook-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 155fbac..f6efc45 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
dev-python/coverage[${PYTHON_USEDEP}]
)
doc? (
-app-text/pandoc
+   app-text/pandoc
>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
)

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/, dev-python/notebook/files/

2015-09-17 Thread Jauhien Piatlicki 
commit: 94adbefba8336b4f08db6cb2ee881fd8da20ec91
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Sep 17 15:09:17 2015 +
Commit: Jauhien Piatlicki  gentoo  org>
CommitDate: Thu Sep 17 15:09:40 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=94adbefb

dev-python/notebook: Fix security issue

http://seclists.org/oss-sec/2015/q3/558
https://bugs.gentoo.org/show_bug.cgi?id=560708

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog  | 11 +++
 ...k-4.0.4-Don-t-redirect-from-edit-to-files.patch | 55 +
 ...nly-redirect-to-editor-for-text-documents.patch | 38 +
 .../notebook-4.0.4-set-mime-type-on-files.patch| 35 
 ...et-model-mimetype-even-when-content-False.patch | 64 +++
 dev-python/notebook/notebook-4.0.4-r2.ebuild   |  1 -
 dev-python/notebook/notebook-4.0.4-r3.ebuild   | 92 ++
 7 files changed, 295 insertions(+), 1 deletion(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index fdbc96c..367ccf3 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*notebook-4.0.4-r3 (17 Sep 2015)
+
+  17 Sep 2015; Marius Brehler 
+  +files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch,
+  +files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch,
+  +files/notebook-4.0.4-set-mime-type-on-files.patch,
+  +files/notebook-4.0.4-set-model-mimetype-even-when-content-False.patch,
+  +notebook-4.0.4-r3.ebuild, -notebook-4.0.4-r2.ebuild, notebook-.ebuild:
+  dev-python/notebook: Security fixes  http://seclists.org/oss-sec/2015/q3/558
+  https://bugs.gentoo.org/show_bug.cgi?id=560708
+
   07 Sep 2015; Marius Brehler  notebook-.ebuild:
   dev-python/notebook: Fix deps, >=mathjax-2.4 required
 

diff --git 
a/dev-python/notebook/files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch
 
b/dev-python/notebook/files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch
new file mode 100644
index 000..76d0e61
--- /dev/null
+++ 
b/dev-python/notebook/files/notebook-4.0.4-Don-t-redirect-from-edit-to-files.patch
@@ -0,0 +1,55 @@
+Upstream patch to fix
+"Maliciously crafted text files in IPython/Jupyter editor".
+
+http://seclists.org/oss-sec/2015/q3/558
+https://bugs.gentoo.org/show_bug.cgi?id=560708
+
+
+From 23162fd2895ad7445fdbe095b8fc8633d95ec6e6 Mon Sep 17 00:00:00 2001
+From: Min RK 
+Date: Mon, 20 Jul 2015 12:11:23 -0700
+Subject: [PATCH 4/4] Don't redirect from /edit/ to /files/
+
+show failure to decode, instead
+---
+ notebook/static/edit/js/editor.js | 15 +++
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/notebook/static/edit/js/editor.js 
b/notebook/static/edit/js/editor.js
+index ddbc2de..421fa57 100644
+--- a/notebook/static/edit/js/editor.js
 b/notebook/static/edit/js/editor.js
+@@ -90,19 +90,10 @@ function($,
+ }).catch(
+ function(error) {
+ that.events.trigger("file_load_failed.Editor", error);
+-if (((error.xhr||{}).responseJSON||{}).reason === 'bad 
format') {
+-window.location = utils.url_path_join(
+-that.base_url,
+-'files',
+-that.file_path
+-);
+-} else {
+-console.warn('Error while loading: the error was:')
+-console.warn(error)
+-}
++console.warn('Error loading: ', error);
+ cm.setValue("Error! " + error.message +
+ "\nSaving disabled.\nSee Console for more 
details.");
+-cm.setOption('readOnly','nocursor')
++cm.setOption('readOnly','nocursor');
+ that.save_enabled = false;
+ }
+ );
+@@ -186,7 +177,7 @@ function($,
+ Editor.prototype._clean_state = function(){
+ var clean = this.codemirror.isClean(this.generation);
+ if (clean === this.clean){
+-return
++return;
+ } else {
+ this.clean = clean;
+ }
+-- 
+2.4.6
+

diff --git 
a/dev-python/notebook/files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch
 
b/dev-python/notebook/files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch
new file mode 100644
index 000..899cd31
--- /dev/null
+++ 
b/dev-python/notebook/files/notebook-4.0.4-only-redirect-to-editor-for-text-documents.patch
@@ -0,0 +1,38 @@
+Upstream patch to fix
+"Maliciously crafted text files in IPython/Jupyter editor".
+
+http://seclists.org/oss-sec/2015/q3/558
+https://bugs.gentoo.org/show_bug.cgi?id=560708
+
+
+From 4f0b3b8c10811d460efc67cf61e9f4df83d2a0a7 Mon Sep 17 00:00:00 2001
+From: Min RK 
+Date: Mon, 20 Jul 2015 12:11:04 -0700
+Subject: [PATCH 3/4] on

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-09 Thread Justin Lecher 
commit: 4d05d35c6d1c113c6c1dd317309790335841503a
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Mon Sep  7 18:29:12 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Sep  7 18:29:12 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4d05d35c

dev-python/notebook: Fix deps, >=mathjax-2.4 required

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog| 3 +++
 dev-python/notebook/notebook-.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 0038d1e..fdbc96c 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  07 Sep 2015; Marius Brehler  notebook-.ebuild:
+  dev-python/notebook: Fix deps, >=mathjax-2.4 required
+
   05 Sep 2015; Marius Brehler  notebook-.ebuild:
   dev-python/notebook: Add deps for doc, fixes bug #559594
 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 81cba3d..155fbac 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -22,7 +22,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
 RDEPEND="
-   dev-libs/mathjax
+   >=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}]

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-06 Thread Justin Lecher 
commit: 16fb819e923203d86d2bfba96685195312acc907
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Sat Sep  5 10:58:32 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep  5 10:58:32 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=16fb819e

dev-python/notebook: pandoc required for use doc, partially fixes bug #559594

Package-Manager: portage-2.2.20

 dev-python/notebook/ChangeLog   | 6 ++
 .../notebook/{notebook-4.0.4-r1.ebuild => notebook-4.0.4-r2.ebuild} | 0
 dev-python/notebook/notebook-.ebuild| 1 +
 3 files changed, 7 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index c5dc4ba..3cfdac7 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*notebook-4.0.4-r2 (05 Sep 2015)
+
+  05 Sep 2015; Marius Brehler 
+  +notebook-4.0.4-r2.ebuild, -notebook-4.0.4-r1.ebuild, notebook-.ebuild:
+  dev-python/notebook: pandoc required for use doc, partially fixes bug #559594
+
   02 Sep 2015; Sean Vig  notebook-.ebuild:
   dev-python/notebook: Enable building docs
 

diff --git a/dev-python/notebook/notebook-4.0.4-r1.ebuild 
b/dev-python/notebook/notebook-4.0.4-r2.ebuild
similarity index 100%
rename from dev-python/notebook/notebook-4.0.4-r1.ebuild
rename to dev-python/notebook/notebook-4.0.4-r2.ebuild

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index e5867ef..87820f3 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
dev-python/coverage[${PYTHON_USEDEP}]
)
doc? (
+app-text/pandoc
>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
)
"

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-06 Thread Justin Lecher 
commit: 016cef1fd49316628787fc02736c685cc44e91cd
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Sat Sep  5 12:45:42 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Sep  5 12:45:42 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=016cef1f

dev-python/notebook: Add deps for doc, fixes bug #559594

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog| 3 +++
 dev-python/notebook/notebook-.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 3cfdac7..0038d1e 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  05 Sep 2015; Marius Brehler  notebook-.ebuild:
+  dev-python/notebook: Add deps for doc, fixes bug #559594
+
 *notebook-4.0.4-r2 (05 Sep 2015)
 
   05 Sep 2015; Marius Brehler 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 87820f3..81cba3d 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -44,6 +44,7 @@ DEPEND="${RDEPEND}
)
doc? (
 app-text/pandoc
+   >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
)
"

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-03 Thread Justin Lecher 
commit: c1ad3a00f0e4717718d4874884a1c75dc6031fc2
Author: Sean Vig  gmail  com>
AuthorDate: Thu Sep  3 13:17:47 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 13:17:47 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1ad3a00

dev-python/notebook: Enable building docs

 dev-python/notebook/ChangeLog|  3 +++
 dev-python/notebook/notebook-.ebuild | 15 +++
 2 files changed, 18 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index d430e4c..c5dc4ba 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  02 Sep 2015; Sean Vig  notebook-.ebuild:
+  dev-python/notebook: Enable building docs
+
   03 Sep 2015; Marius Brehler  notebook-.ebuild:
   dev-python/notebook: Re-Fix #478
 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 744998b..e5867ef 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -55,9 +55,19 @@ python_prepare_all() {
# disable bundled mathjax
sed -i 's/^.*MathJax.*$//' bower.json || die
sed -i 's/mj(/#mj(/' setupbase.py || 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 --with-coverage --cover-package=notebook notebook || die
 }
@@ -68,6 +78,11 @@ 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

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-03 Thread Justin Lecher 
commit: 83eb6b5b05f62e0e392f4476006bee42037ae80b
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Sep  3 10:21:42 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 10:21:42 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=83eb6b5b

dev-python/notebook: Re-Fix #478

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog|  3 +++
 dev-python/notebook/notebook-.ebuild | 11 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index d8f7c44..d430e4c 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  03 Sep 2015; Marius Brehler  notebook-.ebuild:
+  dev-python/notebook: Re-Fix #478
+
 *notebook-4.0.4-r1 (03 Sep 2015)
 
   03 Sep 2015; Marius Brehler 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 8d898cb..e9036e1 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -47,12 +47,6 @@ DEPEND="${RDEPEND}
)
"
 
-pkg_preinst() {
-   # remove old mathjax folder if present
-   [[ -d "${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax" 
]] \
-   && rm -rf 
"${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax"
-}
-
 python_prepare_all() {
sed \
-e "/import setup/s:$:\nimport setuptools:g" \
@@ -73,3 +67,8 @@ python_install() {
 
ln -sf "${EPREFIX}/usr/share/mathjax" 
"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
 }
+
+pkg_preinst() {
+   # remove old mathjax folder if present
+   rm -rf "${ROOT}"/usr/lib*/python*/notebook/static/components/MathJax
+}

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-03 Thread Justin Lecher 
commit: e6394fcc9c8890dbe77f47a23ce098e8b2dd17a5
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Sep  3 10:43:19 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 10:43:19 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6394fcc

dev-python/notebook: Finaly the real fix for #478

Package-Manager: portage-2.2.20.1

 dev-python/notebook/notebook-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index e9036e1..744998b 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -70,5 +70,5 @@ python_install() {
 
 pkg_preinst() {
# remove old mathjax folder if present
-   rm -rf "${ROOT}"/usr/lib*/python*/notebook/static/components/MathJax
+   rm -rf 
"${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
 }

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-03 Thread Justin Lecher 
commit: d002974b02fb229c0dea428b43d2d9a52c9c5731
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Sep  3 07:27:14 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 07:27:14 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d002974b

dev-python/notebook: Drop old

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog | 3 +++
 dev-python/notebook/notebook-4.0.1.ebuild | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 90e175d..2f9c366 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  03 Sep 2015; Marius Brehler  
-notebook-4.0.1.ebuild:
+  dev-python/notebook: Drop old
+
   02 Sep 2015; Marius Brehler  notebook-.ebuild:
   dev-python/notebook: Move setuptools from CDEPEND to DEPEND
 

diff --git a/dev-python/notebook/notebook-4.0.1.ebuild 
b/dev-python/notebook/notebook-4.0.1.ebuild
deleted file mode 12
index 1a1451d..000
--- a/dev-python/notebook/notebook-4.0.1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-notebook-.ebuild
\ No newline at end of file

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-03 Thread Justin Lecher 
commit: 4badc3895598e8aa83d0329589a02dc386ef8738
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Sep  3 07:31:16 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 07:31:16 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4badc389

dev-python/notebook: Implement pkg_preinst(); Fixes #478

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog   | 6 ++
 .../notebook/{notebook-4.0.4.ebuild => notebook-4.0.4-r1.ebuild}| 0
 dev-python/notebook/notebook-.ebuild| 6 ++
 3 files changed, 12 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 2f9c366..d8f7c44 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*notebook-4.0.4-r1 (03 Sep 2015)
+
+  03 Sep 2015; Marius Brehler 
+  +notebook-4.0.4-r1.ebuild, -notebook-4.0.4.ebuild, notebook-.ebuild:
+  dev-python/notebook: Implement pkg_preinst(); Fixes #478
+
   03 Sep 2015; Marius Brehler  
-notebook-4.0.1.ebuild:
   dev-python/notebook: Drop old
 

diff --git a/dev-python/notebook/notebook-4.0.4.ebuild 
b/dev-python/notebook/notebook-4.0.4-r1.ebuild
similarity index 100%
rename from dev-python/notebook/notebook-4.0.4.ebuild
rename to dev-python/notebook/notebook-4.0.4-r1.ebuild

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index eef13b5..8d898cb 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -47,6 +47,12 @@ DEPEND="${RDEPEND}
)
"
 
+pkg_preinst() {
+   # remove old mathjax folder if present
+   [[ -d "${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax" 
]] \
+   && rm -rf 
"${ROOT}$(python_get_sitedir)/notebook/static/components/MathJax"
+}
+
 python_prepare_all() {
sed \
-e "/import setup/s:$:\nimport setuptools:g" \

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-02 Thread Justin Lecher 
commit: 9c29cac457f1074a794232745b089df73d1362a0
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Wed Sep  2 08:13:17 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Sep  2 08:13:17 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9c29cac4

dev-python/notebook: Move setuptools from CDEPEND to DEPEND

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog| 3 +++
 dev-python/notebook/notebook-.ebuild | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index a3cad10..90e175d 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  02 Sep 2015; Marius Brehler  notebook-.ebuild:
+  dev-python/notebook: Move setuptools from CDEPEND to DEPEND
+
 *notebook-4.0.1 (01 Sep 2015)
 
   01 Sep 2015; Marius Brehler  
+notebook-4.0.1.ebuild:

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 248392d..eef13b5 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -21,9 +21,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
-CDEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
+RDEPEND="
dev-libs/mathjax
dev-python/jinja[${PYTHON_USEDEP}]
>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
@@ -37,6 +35,7 @@ RDEPEND="${CDEPEND}
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}]

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-02 Thread Justin Lecher 
commit: e4a89f6aa7f503fedaeca7995c01adc9aa0c1a90
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Sep  2 07:58:05 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Sep  2 07:58:05 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e4a89f6a

dev-python/notebook: install scripts

GH-issue: https://github.com/gentoo-science/sci/issues/477

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/notebook/notebook-.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 7f6336a..ca271a6 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -46,6 +46,13 @@ DEPEND="${RDEPEND}
)
"
 
+python_prepare_all() {
+   sed \
+   -e "/import setup/s:$:\nimport setuptools:g" \
+   -i setup.py || die
+   distutils-r1_python_prepare_all
+}
+
 python_test() {
nosetests --with-coverage --cover-package=notebook notebook || die
 }

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-02 Thread Justin Lecher 
commit: 8f6f88ad9ef30384b8aabfa1420e0abcaac21dec
Author: Sean Vig  gmail  com>
AuthorDate: Tue Sep  1 13:58:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Wed Sep  2 07:32:18 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=8f6f88ad

dev-python/notebook: Use system mathjax

 dev-python/notebook/ChangeLog|  3 +++
 dev-python/notebook/notebook-.ebuild | 16 
 2 files changed, 19 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index de63caf..a3cad10 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -7,6 +7,9 @@
   01 Sep 2015; Marius Brehler  
+notebook-4.0.1.ebuild:
   dev-python/notebook: Bring back 4.0.1
 
+  01 Sep 2015; Sean Vig  notebook-.ebuild:
+  dev-python/notebook: Use system mathjax
+
 *notebook-4.0.4 (01 Sep 2015)
 
   01 Sep 2015; Marius Brehler  
+notebook-4.0.4.ebuild,

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 7f6336a..5a07e90 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -24,6 +24,7 @@ IUSE="doc test"
 CDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
+   dev-libs/mathjax
dev-python/jinja[${PYTHON_USEDEP}]
>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
@@ -37,6 +38,7 @@ RDEPEND="${CDEPEND}
"
 DEPEND="${RDEPEND}
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}]
@@ -46,6 +48,20 @@ DEPEND="${RDEPEND}
)
"
 
+python_prepare_all() {
+   # disable bundled mathjax
+   sed -i 's/^.*MathJax.*$//' bower.json || die
+   sed -i 's/mj(/#mj(/' setupbase.py || die
+
+   distutils-r1_python_prepare_all
+}
+
 python_test() {
nosetests --with-coverage --cover-package=notebook notebook || die
 }
+
+python_install() {
+   distutils-r1_python_install
+
+   ln -sf "${EPREFIX}/usr/share/mathjax" 
"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-01 Thread Justin Lecher 
commit: 89a3dd8fb4a1268ffab70f79efeae4f029ee3905
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Sep  1 15:24:47 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Sep  1 15:24:47 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=89a3dd8f

dev-python/notebook: Bring back 4.0.1

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog | 5 +
 dev-python/notebook/notebook-4.0.1.ebuild | 1 +
 2 files changed, 6 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index b5f2dab..de63caf 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*notebook-4.0.1 (01 Sep 2015)
+
+  01 Sep 2015; Marius Brehler  
+notebook-4.0.1.ebuild:
+  dev-python/notebook: Bring back 4.0.1
+
 *notebook-4.0.4 (01 Sep 2015)
 
   01 Sep 2015; Marius Brehler  
+notebook-4.0.4.ebuild,

diff --git a/dev-python/notebook/notebook-4.0.1.ebuild 
b/dev-python/notebook/notebook-4.0.1.ebuild
new file mode 12
index 000..1a1451d
--- /dev/null
+++ b/dev-python/notebook/notebook-4.0.1.ebuild
@@ -0,0 +1 @@
+notebook-.ebuild
\ No newline at end of file

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-01 Thread Justin Lecher 
commit: dc111bd480374f00e47258d056537ec4840aec6a
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Sep  1 11:49:46 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Sep  1 11:49:46 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=dc111bd4

dev-python/notebook: Version bump; Remove old

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog   | 6 ++
 .../notebook/{notebook-4.0.1.ebuild => notebook-4.0.4.ebuild}   | 0
 2 files changed, 6 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 12506bf..87ff219 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*notebook-4.0.4 (01 Sep 2015)
+
+  01 Sep 2015; Marius Brehler  
+notebook-4.0.4.ebuild,
+  -notebook-4.0.1.ebuild:
+  dev-python/notebook: Version bump; Remove old
+
   27 Aug 2015; Marius Brehler  notebook-.ebuild:
   dev-python/notebook: Fix deps
 

diff --git a/dev-python/notebook/notebook-4.0.1.ebuild 
b/dev-python/notebook/notebook-4.0.4.ebuild
similarity index 100%
rename from dev-python/notebook/notebook-4.0.1.ebuild
rename to dev-python/notebook/notebook-4.0.4.ebuild

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-01 Thread Justin Lecher 
commit: f188fc8820c0dd0fab65638998455637e55f98c9
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Aug 25 13:22:54 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Tue Aug 25 13:22:54 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f188fc88

dev-python/notebook: Enable doc useflag

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog| 3 +++
 dev-python/notebook/notebook-.ebuild | 6 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index 2daf6ed..ba65bee 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Aug 2015; Marius Brehler  notebook-.ebuild:
+  dev-python/notebook: Enable doc useflag
+
 *notebook-4.0.1 (13 Aug 2015)
 *notebook- (13 Aug 2015)
 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index ba9ce57..242663a 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -20,11 +20,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
+IUSE="doc test"
 CDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
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}]
@@ -39,6 +40,9 @@ DEPEND="${RDEPEND}
>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
)
+   doc? (
+   >=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+   )
"
 
 python_test() {

[gentoo-commits] proj/sci:master commit in: dev-python/notebook/

2015-09-01 Thread Justin Lecher 
commit: 06e677b8b9cfc56fface3b6502da40ad7843b2c0
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Thu Aug 27 07:41:07 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Aug 27 07:41:07 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=06e677b8

dev-python/notebook: Fix deps

Package-Manager: portage-2.2.20.1

 dev-python/notebook/ChangeLog| 3 +++
 dev-python/notebook/notebook-.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/dev-python/notebook/ChangeLog b/dev-python/notebook/ChangeLog
index ba65bee..12506bf 100644
--- a/dev-python/notebook/ChangeLog
+++ b/dev-python/notebook/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Aug 2015; Marius Brehler  notebook-.ebuild:
+  dev-python/notebook: Fix deps
+
   25 Aug 2015; Marius Brehler  notebook-.ebuild:
   dev-python/notebook: Enable doc useflag
 

diff --git a/dev-python/notebook/notebook-.ebuild 
b/dev-python/notebook/notebook-.ebuild
index 34cc6e9..7f6336a 100644
--- a/dev-python/notebook/notebook-.ebuild
+++ b/dev-python/notebook/notebook-.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
test? (
>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
)
doc? (
>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]