Merge remote-tracking branch 'github/master'

* github/master:
  www-client/casjerjs: Fix installation of casperjs executable
  dev-python/metakernel_bash: Install missing kernel spec
  dev-python/metakernel_python: Install missing kernel spec
  dev-python/metakernel_bash: New package, ebuild written by me
  dev-python/metakernel: New package, ebuild written by me
  dev-python/metakernel_python: New package, ebuild written by me

16 files changed, 179 insertions, 2 deletions

diff --git a/dev-python/metakernel/ChangeLog b/dev-python/metakernel/ChangeLog
new file mode 100644
index 000000000..e7392d391
--- /dev/null
+++ b/dev-python/metakernel/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-python/metakernel
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Id$
+
+*metakernel-0.11.0 (24 Sep 2015)
+
+  24 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> +metadata.xml,
+  +metakernel-0.11.0.ebuild:
+  dev-python/metakernel: New package, ebuild written by me
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
new file mode 100644
index 000000000..bcbedb65f
--- /dev/null
+++ b/dev-python/metakernel/Manifest
@@ -0,0 +1 @@
+DIST metakernel-0.11.0.tar.gz 88834 SHA256 8b030de8477b532b9c871413ccd6cd853319f842f7bcee12de2413ea4afc0572 SHA512 d9dabf1dcbc6075af7c03949d8ffeaf2d8f8381972c9b18f25b50423492084ffe2afe3357d27576c1f36387508ca27d8a0fc54abe7e0f72ab206822ed402aad2 WHIRLPOOL bf67d360366f7c80ce2b4d0f18a6979ca789cf96aa79ff998bbad722c2bd4a50c2561840aa931b0558049aaefead2dee01b0b04dc7b4c00fa4a819b222c461ab
diff --git a/dev-python/metakernel/metadata.xml b/dev-python/metakernel/metadata.xml
new file mode 100644
index 000000000..be095aee3
--- /dev/null
+++ b/dev-python/metakernel/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    A Jupyter/IPython kernel template which includes core magic
+    functions (including help, command and file path completion,
+    parallel and distributed processing, downloads, and much more).
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">metakernel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/metakernel/metakernel-0.11.0.ebuild b/dev-python/metakernel/metakernel-0.11.0.ebuild
new file mode 100644
index 000000000..f02b935f9
--- /dev/null
+++ b/dev-python/metakernel/metakernel-0.11.0.ebuild
@@ -0,0 +1,37 @@
+# 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="Metakernel for Jupyter"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-3.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/metakernel_python-0.11.3[${PYTHON_USEDEP}]
+	)
+"
+
+# tests currently fail and the dying/stopping of ipcluster needs to be fixed
+RESTRICT="test"
+
+python_test() {
+	ipcluster start -n=3 &
+	nosetests --with-doctest --with-coverage --cover-package metakernel || die
+	ipcluster stop
+}
diff --git a/dev-python/metakernel_bash/ChangeLog b/dev-python/metakernel_bash/ChangeLog
new file mode 100644
index 000000000..ec1c1a02f
--- /dev/null
+++ b/dev-python/metakernel_bash/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for dev-python/metakernel_bash
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Id$
+
+*metakernel_bash-0.11.3-r1 (24 Sep 2015)
+
+  24 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> +files/kernel.json,
+  +metakernel_bash-0.11.3-r1.ebuild, -metakernel_bash-0.11.3.ebuild:
+  dev-python/metakernel_bash: Install missing kernel spec
+
+*metakernel_bash-0.11.3 (24 Sep 2015)
+
+  24 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> +metadata.xml,
+  +metakernel_bash-0.11.3.ebuild:
+  dev-python/metakernel_bash: New package, ebuild written by me
diff --git a/dev-python/metakernel_bash/Manifest b/dev-python/metakernel_bash/Manifest
new file mode 100644
index 000000000..b24fc1061
--- /dev/null
+++ b/dev-python/metakernel_bash/Manifest
@@ -0,0 +1 @@
+DIST metakernel_bash-0.11.3.tar.gz 1801 SHA256 e86087b9fe6aa86d5f33f394db98dddc759fea5b0ef65061d0adc9e02105f919 SHA512 8a96580d7bbb409c461c227d5255d9075968c4c423a4e7fc329713dcf097c0194031a8a9c747146e18ccdcf58958478e99233f586b715601514741ceb1b67c75 WHIRLPOOL 54dc704783666f73793ab62836d91882936eadb5baf0ee2b7a47ecd51ac3b7a3d4496ea08e817e568b335ab75929812bb4cbeb433a2b72097d967f2041ccb126
diff --git a/dev-python/metakernel_bash/files/kernel.json b/dev-python/metakernel_bash/files/kernel.json
new file mode 100644
index 000000000..a8e06d478
--- /dev/null
+++ b/dev-python/metakernel_bash/files/kernel.json
@@ -0,0 +1 @@
+{"argv": ["/usr/bin/python", "-m", "metakernel_bash", "-f", "{connection_file}"], "display_name": "MetaKernel Bash", "language": "bash", "name": "metakernel_bash"}
diff --git a/dev-python/metakernel_bash/metadata.xml b/dev-python/metakernel_bash/metadata.xml
new file mode 100644
index 000000000..9e6119aea
--- /dev/null
+++ b/dev-python/metakernel_bash/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    A Bash kernel for Jupyter/IPython, based on MetaKernel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">metakernel_bash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/metakernel_bash/metakernel_bash-0.11.3-r1.ebuild b/dev-python/metakernel_bash/metakernel_bash-0.11.3-r1.ebuild
new file mode 100644
index 000000000..9bd8f0b7f
--- /dev/null
+++ b/dev-python/metakernel_bash/metakernel_bash-0.11.3-r1.ebuild
@@ -0,0 +1,28 @@
+# 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="A Bash kernel for Jupyter/IPython"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/metakernel-0.11.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	insinto /usr/share/jupyter/kernels/${PN}
+	doins "${FILESDIR}"/kernel.json
+
+	distutils-r1_python_install_all
+}
\ No newline at end of file
diff --git a/dev-python/metakernel_python/ChangeLog b/dev-python/metakernel_python/ChangeLog
new file mode 100644
index 000000000..c26be8420
--- /dev/null
+++ b/dev-python/metakernel_python/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for dev-python/metakernel_python
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Id$
+
+*metakernel_python-0.11.3-r1 (24 Sep 2015)
+
+  24 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> +files/kernel.json,
+  +metakernel_python-0.11.3-r1.ebuild, -metakernel_python-0.11.3.ebuild:
+  dev-python/metakernel_python: Install missing kernel spec
+
+*metakernel_python-0.11.3 (24 Sep 2015)
+
+  24 Sep 2015; Marius Brehler <marbre@linux.sungazer.de> +metadata.xml,
+  +metakernel_python-0.11.3.ebuild:
+  dev-python/metakernel_python: New package, ebuild written by me
diff --git a/dev-python/metakernel_python/Manifest b/dev-python/metakernel_python/Manifest
new file mode 100644
index 000000000..269c992fa
--- /dev/null
+++ b/dev-python/metakernel_python/Manifest
@@ -0,0 +1 @@
+DIST metakernel_python-0.11.3.tar.gz 1856 SHA256 ae596a14f1914db5448500b0ca691dee4b1637f96d36184a8e5afd3f5f4e2f34 SHA512 13cc9ee62047a6048b1ea469a3850c34e369a426a16b6c43e002427601f07a585f109c4162bfd30e6607186233affbff7333ae84b12ca6749ecbbc2cea2a1915 WHIRLPOOL 36bf4dddb9f4550bfd4c8815eb896d1c185b95bae9a8bfb89c87bfe9564dbab9c83e0a96f3db2bad756ed9c28c636422407089250c7a5108ef8162c1410a7078
diff --git a/dev-python/metakernel_python/files/kernel.json b/dev-python/metakernel_python/files/kernel.json
new file mode 100644
index 000000000..0a561584a
--- /dev/null
+++ b/dev-python/metakernel_python/files/kernel.json
@@ -0,0 +1 @@
+{"argv": ["/usr/bin/python", "-m", "metakernel_python", "-f", "{connection_file}"], "display_name": "MetaKernel Python", "language": "python", "name": "metakernel_python"}
diff --git a/dev-python/metakernel_python/metadata.xml b/dev-python/metakernel_python/metadata.xml
new file mode 100644
index 000000000..8bebad5bc
--- /dev/null
+++ b/dev-python/metakernel_python/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription>
+    A Python kernel for Jupyter/IPython, based on MetaKernel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">metakernel_python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/metakernel_python/metakernel_python-0.11.3-r1.ebuild b/dev-python/metakernel_python/metakernel_python-0.11.3-r1.ebuild
new file mode 100644
index 000000000..9b4def176
--- /dev/null
+++ b/dev-python/metakernel_python/metakernel_python-0.11.3-r1.ebuild
@@ -0,0 +1,29 @@
+# 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="A Python kernel for Jupyter/IPython"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/metakernel-0.11.0[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	insinto /usr/share/jupyter/kernels/${PN}
+	doins "${FILESDIR}"/kernel.json
+
+	distutils-r1_python_install_all
+}
\ No newline at end of file
diff --git a/www-client/casperjs/ChangeLog b/www-client/casperjs/ChangeLog
index eb4d1f336..eec6cb0d5 100644
--- a/www-client/casperjs/ChangeLog
+++ b/www-client/casperjs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  24 Sep 2015; Sean Vig <sean.v.775@gmail.com> casperjs-1.1_beta3.ebuild:
+  www-client/casjerjs: Fix installation of casperjs executable
+
 *casperjs-1.1_beta3 (02 Sep 2015)
 
   02 Sep 2015; Sean Vig <sean.v.775@gmail.com> +casperjs-1.1_beta3.ebuild,
diff --git a/www-client/casperjs/casperjs-1.1_beta3.ebuild b/www-client/casperjs/casperjs-1.1_beta3.ebuild
index a90310a85..b71ba9727 100644
--- a/www-client/casperjs/casperjs-1.1_beta3.ebuild
+++ b/www-client/casperjs/casperjs-1.1_beta3.ebuild
@@ -34,8 +34,9 @@ src_install() {
 	doins bin/bootstrap.js
 	doins bin/usage.txt
 
-	dobin bin/casperjs
-	dosym /usr/bin/casperjs ../share/${P}/bin/casperjs
+	exeinto /usr/share/${P}/bin
+	doexe bin/casperjs
+	dosym ../share/${P}/bin/casperjs /usr/bin/casperjs
 
 	dodoc CHANGELOG.md CONTRIBUTORS.md README.md
 }