Permalink
Browse files

jmol now working in sage-notebook-0.9.1-r3!

(Portage version: 2.2.0_alpha121/git/Linux x86_64, unsigned Manifest commit)
  • Loading branch information...
1 parent 90922e8 commit 146582a2db819b08a6b437fea5fc207339157b97 @kiwifb kiwifb committed Aug 23, 2012
View
7 sci-mathematics/sage-notebook/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*sage-notebook-0.9.1-r3 (23 Aug 2012)
+
+ 23 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+ -sage-notebook-0.9.1.ebuild, -sage-notebook-0.9.1-r2.ebuild,
+ +sage-notebook-0.9.1-r3.ebuild, files/sage-notebook-0.9.1-base-jmol.patch:
+ jmol stuff - drop 0.9.1
+
*sage-notebook-0.9.1-r2 (05 Aug 2012)
05 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz>
View
7 sci-mathematics/sage-notebook/Manifest
@@ -3,14 +3,13 @@ AUX sage-notebook-0.8-nojava.patch 487 SHA256 6f46501927def7c74913c342c2af4c79e6
AUX sage-notebook-0.8.14-fix-secure-connection.patch 1128 SHA256 6b2d2c56cda7aea04a67e90998aab3d025fff9a29b65cfebb8481d96e5bbcb42 SHA512 a0364b33da2b5a2794c51403fe5eb0cb6c00bfdd4b78e59dcb6d38f5d9c6d191624f1df7277fa3e6fff9e4c1f65d2d7d40c36dd86a849e308d93dd4890f7e980 WHIRLPOOL 5382b01478e22ee96b1d6ff34fbb8f79f35b5d60375b6ae8abb74f1b6e3e295f80da52696c5648029dbf2320f1e92954a7e6d8d8368ef7a72a90520861f562cf
AUX sage-notebook-0.8.16-twistd-python-version.patch 843 SHA256 4968de713c854bfa835eb9a5e1c1394f10d93696a4669d7b3768f28c14cb95cf SHA512 76f53e6bad008ff6ed3351da2a6caa8c6b8d4d4d19a9d3297f54a9318279b349e7f6dc48b2f722654d7168eb8c5e32cf15c2a7223156e905781954afe32e223d WHIRLPOOL 0335e70b5337e1acf81d376d44a7d685bca2e9ec2d8140493d0f5a195f361f8eee4a4bb00e04413a0e3ba742d8714ecabb83ce4281a8506f946e4d9a839a45f3
AUX sage-notebook-0.9.0-setup.py.patch 862 SHA256 2bdddb93db231b24891903af566accf10e970ca3c98fa578d5dcb6133ed75d62 SHA512 62e85b5ce94aba9acc9da0beca61a094bc2db9b82e8d4e879935bd0da2dee54c77249096bac13e4bd0f8397bb270364854d2303fe5eaef648d4eaeaf371d0cc9 WHIRLPOOL 995a13ea1ad62d8cdc8d7a0db09b4911c38c4dcccccf3b42f025c8f4b04b5de299942f137999c9de1ba0fbdcdd73ec807aee419c2aa74e0f3667f7127ce65dc2
-AUX sage-notebook-0.9.1-base-jmol.patch 1045 SHA256 e080b2c92af46fb1e35cbeefb97b6c4040098198155ca9132c6de5e6e53d58f8 SHA512 08ebf78028c05dd06c067cc1cd4ccf22e7988868b03b497c72bbc37cfad9a248ac54c9d33deb5274dc7d67a5886ad21c51912e016f6bbd1ab1f61a83db0a1db1 WHIRLPOOL cfedf84027c6f1749ca2c16e130c48c0a8853153039118215c72790d5b8203aef6e58714215eb08008cf02a20e26873a336c83bf202dba693a08954da970c8d3
+AUX sage-notebook-0.9.1-base-jmol.patch 1052 SHA256 70e91283ea7857debe8c07620db325c449ac8233871261b3e1aacdc675c3d479 SHA512 d137eff25d4661f8647691a7310616c44f663e2ff4badb8bc07d889957bea236666ac12dcb61342675e64fd39355e3bad180a8121877b723a60223fae7f61979 WHIRLPOOL 15ee524dd1a1664d0c33b920b613a2cc38c104d2075a63b6ae3f1436ec647cdc364d970d9f07210edf66239bb537a8d6f722ad5af90a735a8ba345d8c5acd2f8
AUX sage-notebook-0.9.1-notebook.patch 591 SHA256 d01656720591ad1f5cb3e717684f02720fb273f70df17fc1551b8950cecaa576 SHA512 5ed95284b1682e3b514de0edcf8b7d4f6ce19f9deef9b399732cf03df4009dce80f70532597edc2093bd5741d454496d93484f94cff759dc31d00c4c33e4243c WHIRLPOOL 515f2586b77cb9d852d1dd9fd8ddf5f950f844f50a5e93019c97b5040c2dca01d4ba14fc5a386469f8ffe5d167f2768786ae2fa291c4d34ee3bbe59e3cba0155
AUX sage-notebook-0.9.1-sageinspect.patch 412 SHA256 d29925e1df4881ed7ee6e506534368669aaf202c09de552d6d42934d9360b2a4 SHA512 6bdf81cc0282fa0ceb3c3c67302bdc5133173dba2ce28f9f8d3fadae2b199ae78953de0632c41f46a7db935c835e7aace3d23b39531b43f918572ff68abb5c66 WHIRLPOOL b693eb062ac65acaee7cc3b1a3d90e89ef1e1b3b24ad5368716bd9a4b498fa5ba63f914d4e6f2a9f8eef09aedb9ba68b019ed604275fe57cb5e33dc8b1c116c0
AUX sage-notebook.conf 2380 SHA256 6c706850bba9530b24bb1512432807874124197b2598fc46fab78070abf9979e SHA512 284b88f05675935c26750ae0c1719cfaaeca17c574c27fd93d29cf2ce15520170938f6f7eee4c642fb95adadad77b2e32d221c6ed9c2fb3a8e20e8a37c0f3bec WHIRLPOOL 4df0106b93be259633e4c1b043c504940f72acda284bf58449bd4acf7dfb475afcde6dcc7bcda8d38e8f8cf4ca27075e15942c51b1521ae7e6beda171b51b586
DIST sage-notebook-0.8.29.tar.bz2 18899951 SHA256 a1804d2235567a33d93b4477a71e3221b55a7cd3324ab07889bdb9287bfb4b82 SHA512 666aa6e5253fde302844e2954a35123120767130facc9729d0eb586b3d1edbfaf573dd3a6ea83186c7b3c87cf1f7b7be3e20baa17209f63ff74700053061595e WHIRLPOOL 3c78b157ae72f2a0bbbe5e2e2e6e4bb255a1a6e5976802b7ee54b5e696c01ac7cf95f7d7b75996f22be186919d29851ce02adcc05ee70ad3a6ec53ca180c25b4
DIST sage-notebook-0.9.1.tar.gz 3394879 SHA256 bd52207e8b04d6a35152a67ea140bf96c82c45354ea478d70b316005c5e8f554 SHA512 0b4e4c8ee218c7e95233bdc30f961a603ef2f3e3892ab9eb71728080bb7ac15f766579dc91e60f927a201cf01faca66408e411dbb8d584bada1601903813bdb7 WHIRLPOOL b494d8454366f2920249620535d4fac8e4075ca099701baad5f39e7be3882d30077116de3e3c1c2e438e33e1c6bcb3de0f47affd0db6f1bb8b6c45df10e62a3c
EBUILD sage-notebook-0.8.29-r2.ebuild 3221 SHA256 6244448983f8cc5d8af37ae772f7703d2e044c789c165bc3167ce9ce73fc8e9d SHA512 7ac57e61b533ed1691914ef7fc3f7e0fd79f9733a6f232f6615bfc7e90c651c8916431f4cac20cfea423ed639dc36cdeae1e41d56b10cfee0eb897562d15405d WHIRLPOOL 01b5725f32297735623c64025c2a157cf9588ec2a421759a4d1c6f968d5a2f62140d6916d1346c9f16c19fa59fb1f34e059e274835b82e2d74705b90c6f2fab6
-EBUILD sage-notebook-0.9.1-r2.ebuild 2431 SHA256 3dfabb93e2390f99ebc9c5d237209a8b1d9293f5bff0343dab9a90e5953de905 SHA512 281d2968886d15fc05b89dde630104feb14d5114225934fecef6de9d95ddf7b753c0b5fd79905fb96583a48b09e7d7e09d5d5fc3166ff072f641974b8db67d6e WHIRLPOOL 1b3e864bb8e875c2329ef3a73a0da0470977a83ef988c05a86fcd6b86ecc5c162a7892056f91dd904abef9ad5f6c7b9dcf2f3e8d1333a6360e5cee11b2eae4ea
-EBUILD sage-notebook-0.9.1.ebuild 2323 SHA256 5b433416ee4d241a6a566135f4d02c9576f4c19b3e32d41f88b78fde5612a320 SHA512 62f8325cacab31c30b8f61060c8fcdfdeb183545cac3c98aef8da8b782c7abd8198506eab95acff328aca9efc69780dac278df7db580636a1f65f729708a1f20 WHIRLPOOL ce39e4497aea15046f25adeacd31689dfb418d71cc08c30e9b0c9339c1aadf1c8c1bfd4a5149c39fad38b2b1942e72c1a53df4061990b4421e009eea48d6eeaa
-MISC ChangeLog 17470 SHA256 916b0463d83cfeee8e02f608b3657310123e9a1f3f0335ad93f516a8e997c2b7 SHA512 4388f5f34100d756efea6bff0698ae258947f0772f668aeecd06a7476c10de53e407a8a25545c8563e17a705a70e2338a61f0301203b448c9369a0ecbd59c651 WHIRLPOOL 1a9855c8fe0d21cc6e528bc4fb7741865da3eacc1ef1a4fd5abd5bbcac188447048024f9d951c88a0a8f1a4d03832a276886e0db039b1410fa335c73fb8a4b65
+EBUILD sage-notebook-0.9.1-r3.ebuild 2522 SHA256 95f403324d0c55340a1142115a17ee8de0fecbd1ae0bf08910fa028272f61862 SHA512 2971ff33fa71bb7ce1e43a16c32c614eb54f85940cba7b42eba629d7562f3b2b614c06a3bad1b201511ce5c1b3622abb29176fdb1695538ab86495fbc8ee06c5 WHIRLPOOL 010882aef3b4f32974edf1efcba1a7bd5f5a14ebdb6a9c65a9678eca467b3ee14fbd32a0d4187c80cd07c3fe72636343f51a8e4ce726079c259372aecbed6ff5
+MISC ChangeLog 17743 SHA256 b2cebe269895c66bc6607a1aec3aeee8712f8a10c305a4dd5f96a19311399dfd SHA512 26a7e0977365842db364ece09dc5f388abd38a68fb31cd54d95e053f8e4e2837ff6fe4ed353f7dd05332fbd4c0cc3f505216de677f5556bb6b75df58af9ba976 WHIRLPOOL 333389aa8463d4637f415807825abd0ec24aa8666b5b52c465b58c4d26bea732ffcfb13c7e6949d5b54da802a6fcaee21ca0bf640f55136109308d947d25d221
MISC metadata.xml 390 SHA256 eccc924165a32c606bf95567e3e77e5d40fbf4e03f2ac9985086af94779798c2 SHA512 6a90189e5c1057f570fca565a2f88c36bb285166747068134589ea51a81d791ee3a545b7e41cf1d0ee6681c624d509bf42dcc164ddb5c3f78ca8e351a3888322 WHIRLPOOL 1d1631cfe52269cfbb0081013c6a557a717eba89fc953e083b45f627c2862d8013f6dfb165e6272bfa668aa73d715c38e4672834eee304d1c4313571c224788e
View
2 sci-mathematics/sage-notebook/files/sage-notebook-0.9.1-base-jmol.patch
@@ -18,7 +18,7 @@
self.add_static_path('/static', DATA)
self.add_static_path('/java', DATA)
- self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jmol"))
-+ self.add_static_path('/java/jmol', os.path.join(SAGE_LOCAL,"share","jmol"))
++ self.add_static_path('/java/jmol', os.path.join(SAGE_LOCAL,"share","jmol-applet"))
import mimetypes
mimetypes.add_type('text/plain','.jmol')
View
1 ...ge-notebook/sage-notebook-0.9.1-r2.ebuild → ...ge-notebook/sage-notebook-0.9.1-r3.ebuild
@@ -69,6 +69,7 @@ src_prepare() {
# find jmol
epatch "${FILESDIR}"/${PN}-0.9.1-base-jmol.patch
+ sed -i "s:jmol/appletweb/Jmol.js:jmol/Jmol.js:g" sagenb/data/sage/html/notebook/base.html
# fix SAGE_ROOT
epatch "${FILESDIR}"/${PN}-0.9.1-sageinspect.patch
View
92 sci-mathematics/sage-notebook/sage-notebook-0.9.1.ebuild
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.7"
-PYTHON_MODNAME="sagenb"
-PYTHON_USE_WITH_OPT="ssl"
-
-inherit distutils eutils user
-
-MY_PN="sagemath-sagenb"
-
-DESCRIPTION="The Sage Notebook is a web-based graphical user interface for mathematical software"
-HOMEPAGE="http://nb.sagemath.org"
-SRC_URI="https://github.com/sagemath/sagenb/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+java server ssl"
-
-RESTRICT="mirror"
-
-CDEPEND="~dev-python/pexpect-2.0
- >=dev-python/twisted-12.0
- >=dev-python/twisted-mail-12.0
- >=dev-python/twisted-web-12.0
- !dev-python/twisted-web2
- >=dev-python/jinja-2.5.5
- >=dev-python/docutils-0.5
- >=dev-python/flask-autoindex-0.4.1
- >=dev-python/flask-openid-1.0.1
- >=dev-python/flask-babel-0.8"
-DEPEND="${CDEPEND}
- test? ( sci-mathematics/sage[testsuite] )"
-RDEPEND="${CDEPEND}
- sci-mathematics/sage
- java? ( ~sci-chemistry/jmol-12.2.27 )"
-
-# github release tag
-TAG=911669c
-S="${WORKDIR}/${MY_PN}-${TAG}"
-
-pkg_setup() {
- # Sage now will only works with python 2.7.*
- python_set_active_version 2.7
- python_pkg_setup
- export DOT_SAGE="${S}"
-
- # create user to run the server
- if use server ; then
- enewgroup sage
- enewuser sage -1 /bin/bash /var/lib/sage sage
- fi
-}
-
-src_prepare() {
- # ship flask_version and not sage3d
- epatch "${FILESDIR}"/${PN}-0.9.0-setup.py.patch
-
- # find flask_version in the right place
- sed -i \
- "s:os.path.join(os.environ\['SAGE_ROOT'\], 'devel', 'sagenb', 'flask_version'):os.path.join('${EPREFIX}$(python_get_sitedir)', 'flask_version'):g" \
- sagenb/notebook/run_notebook.py || die "failed to patch for flask_version path"
-
- # remove sage3d
- rm -rf sagenb/data/sage3d || die "failed to remove sage3d"
-
- mkdir conf.d || die "failed to create directory"
- mkdir init.d || die "failed to create directory"
-
- cp "${FILESDIR}"/${PN} init.d/${PN} || die "failed to copy file"
- cp "${FILESDIR}"/${PN}.conf conf.d/${PN} || die "failed to copy file"
-
- distutils_src_prepare
-}
-
-src_install() {
- # install runscript+configuration file to run the notebook as a daemon
- if use server ; then
- doinitd init.d/${PN}
- doconfd conf.d/${PN}
- fi
-
- distutils_src_install
-}
-
-src_test() {
- PYTHONPATH="." default_src_test
-}

0 comments on commit 146582a

Please sign in to comment.