| 1 |
commit: 55d6b31cd155eb142212fb1b2ebc457922518465 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 2 07:59:08 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 2 07:59:08 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=55d6b31c |
| 7 |
|
| 8 |
Merge remote-tracking branch 'github/master' |
| 9 |
|
| 10 |
* github/master: |
| 11 |
dev-python/ipython: remove mathjax references |
| 12 |
dev-python/notebook: Use system mathjax |
| 13 |
|
| 14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-python/ipython/ChangeLog | 3 +++ |
| 17 |
dev-python/ipython/ipython-4.0.0-r1.ebuild | 2 -- |
| 18 |
dev-python/notebook/ChangeLog | 3 +++ |
| 19 |
dev-python/notebook/notebook-9999.ebuild | 12 ++++++++++++ |
| 20 |
4 files changed, 18 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --cc dev-python/notebook/notebook-9999.ebuild |
| 23 |
index ca271a6,5a07e90..248392d |
| 24 |
--- a/dev-python/notebook/notebook-9999.ebuild |
| 25 |
+++ b/dev-python/notebook/notebook-9999.ebuild |
| 26 |
@@@ -47,9 -49,10 +49,13 @@@ DEPEND="${RDEPEND |
| 27 |
" |
| 28 |
|
| 29 |
python_prepare_all() { |
| 30 |
+ sed \ |
| 31 |
+ -e "/import setup/s:$:\nimport setuptools:g" \ |
| 32 |
+ -i setup.py || die |
| 33 |
++ |
| 34 |
+ # disable bundled mathjax |
| 35 |
+ sed -i 's/^.*MathJax.*$//' bower.json || die |
| 36 |
+ sed -i 's/mj(/#mj(/' setupbase.py || die |
| 37 |
- |
| 38 |
distutils-r1_python_prepare_all |
| 39 |
} |
Archives