commit:     55d6b31cd155eb142212fb1b2ebc457922518465
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 07:59:08 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 07:59:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=55d6b31c

Merge remote-tracking branch 'github/master'

* github/master:
  dev-python/ipython: remove mathjax references
  dev-python/notebook: Use system mathjax

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/ipython/ChangeLog               |  3 +++
 dev-python/ipython/ipython-4.0.0-r1.ebuild |  2 --
 dev-python/notebook/ChangeLog              |  3 +++
 dev-python/notebook/notebook-9999.ebuild   | 12 ++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --cc dev-python/notebook/notebook-9999.ebuild
index ca271a6,5a07e90..248392d
--- a/dev-python/notebook/notebook-9999.ebuild
+++ b/dev-python/notebook/notebook-9999.ebuild
@@@ -47,9 -49,10 +49,13 @@@ DEPEND="${RDEPEND
        "
  
  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
 -
        distutils-r1_python_prepare_all
  }
  

Reply via email to