From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8E98B1384B4 for ; Sat, 28 Nov 2015 14:13:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BBA721C062; Sat, 28 Nov 2015 14:13:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19D1321C062 for ; Sat, 28 Nov 2015 14:13:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2BE433E142 for ; Sat, 28 Nov 2015 14:13:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8B0AA43 for ; Sat, 28 Nov 2015 14:13:35 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1448719969.820cc250751bd8e14cd80db11599e3a3f6b1f5b8.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/xonsh/, dev-python/xonsh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/xonsh/Manifest dev-python/xonsh/files/xonsh-0.2.3-kernel-backport.patch dev-python/xonsh/files/xonsh-0.2.3-xonsh.bat-backport.patch dev-python/xonsh/metadata.xml dev-python/xonsh/xonsh-0.2.3.ebuild X-VCS-Directories: dev-python/xonsh/files/ dev-python/xonsh/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 820cc250751bd8e14cd80db11599e3a3f6b1f5b8 X-VCS-Branch: master Date: Sat, 28 Nov 2015 14:13:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b5aa6bdd-3f77-4783-af46-d9caa147df3d X-Archives-Hash: addd5f2ee2f9943fd6614286f4f3b008 commit: 820cc250751bd8e14cd80db11599e3a3f6b1f5b8 Author: Justin Lecher gentoo org> AuthorDate: Sat Nov 28 12:53:52 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Nov 28 14:12:49 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=820cc250 dev-python/xonsh: New package, ebuild written by me Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/xonsh/Manifest | 1 + .../xonsh/files/xonsh-0.2.3-kernel-backport.patch | 47 +++++++++++++++++++ .../files/xonsh-0.2.3-xonsh.bat-backport.patch | 22 +++++++++ dev-python/xonsh/metadata.xml | 12 +++++ dev-python/xonsh/xonsh-0.2.3.ebuild | 52 ++++++++++++++++++++++ 5 files changed, 134 insertions(+) diff --git a/dev-python/xonsh/Manifest b/dev-python/xonsh/Manifest new file mode 100644 index 0000000..ff0e8c8 --- /dev/null +++ b/dev-python/xonsh/Manifest @@ -0,0 +1 @@ +DIST xonsh-0.2.3.tar.gz 135218 SHA256 e54f045bbcb2c49f8bf67812bc1c1428628745d0b4dd9880c32b4703e51c4a4d SHA512 78cd577765e3116d0b0060a4db6e3e9aaa5bd870fce2e35241eaa00ca1600039d71b4f0ee011f20c959bf72f33ed09a69b4149c8daf377b9151ae0157259c700 WHIRLPOOL d1660a9f0571c8819560412033399cea4d80ee25707b87d84d852d26a7fcb392e0cf8d57f9084e2a3a36eb2ffffa38ae706b5da540cb2015c816efdd52148caf diff --git a/dev-python/xonsh/files/xonsh-0.2.3-kernel-backport.patch b/dev-python/xonsh/files/xonsh-0.2.3-kernel-backport.patch new file mode 100644 index 0000000..feed0d0 --- /dev/null +++ b/dev-python/xonsh/files/xonsh-0.2.3-kernel-backport.patch @@ -0,0 +1,47 @@ +From c650bc8a2b901a9e8d0c09f11f2482cfa6a1daee Mon Sep 17 00:00:00 2001 +From: Daniel Milde +Date: Sun, 8 Nov 2015 21:15:08 +0100 +Subject: [PATCH] installation of jupyter hook to given destination + +--- + setup.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 2996546..83984ba 100755 +--- a/setup.py ++++ b/setup.py +@@ -19,7 +19,7 @@ + HAVE_SETUPTOOLS = False + + try: +- from jupyter_client.kernelspec import install_kernel_spec ++ from jupyter_client.kernelspec import KernelSpecManager + HAVE_JUPYTER = True + except ImportError: + HAVE_JUPYTER = False +@@ -49,7 +49,7 @@ def build_tables(): + sys.path.pop(0) + + +-def install_jupyter_hook(): ++def install_jupyter_hook(root=None): + if not HAVE_JUPYTER: + print('Could not install Jupyter kernel spec, please install Jupyter/IPython.') + return +@@ -73,13 +73,13 @@ def install_jupyter_hook(): + with open(os.path.join(d, 'kernel.json'), 'w') as f: + json.dump(spec, f, sort_keys=True) + print('Installing Jupyter kernel spec...') +- install_kernel_spec(d, 'xonsh', user=('--user' in sys.argv), replace=True) ++ KernelSpecManager().install_kernel_spec(d, 'xonsh', user=('--user' in sys.argv), replace=True, prefix=root) + + class xinstall(install): + def run(self): + clean_tables() + build_tables() +- install_jupyter_hook() ++ install_jupyter_hook(self.root if self.root else None) + install.run(self) + + diff --git a/dev-python/xonsh/files/xonsh-0.2.3-xonsh.bat-backport.patch b/dev-python/xonsh/files/xonsh-0.2.3-xonsh.bat-backport.patch new file mode 100644 index 0000000..f938ad7 --- /dev/null +++ b/dev-python/xonsh/files/xonsh-0.2.3-xonsh.bat-backport.patch @@ -0,0 +1,22 @@ +From ed8b6ce37c76f62585a5cc86ac99194bf7115a84 Mon Sep 17 00:00:00 2001 +From: selepo +Date: Wed, 18 Nov 2015 18:50:17 +0100 +Subject: [PATCH] bugfix for issue 466 with xonsh.bat installed in non-windows + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 0fb407b..7c10805 100755 +--- a/setup.py ++++ b/setup.py +@@ -77,7 +77,7 @@ def main(): + platforms='Cross Platform', + classifiers=['Programming Language :: Python :: 3'], + packages=['xonsh'], +- scripts=['scripts/xonsh', 'scripts/xonsh.bat'], ++ scripts=['scripts/xonsh'] if 'win' not in sys.platform else ['scripts/xonsh.bat'], + cmdclass={'install': xinstall, 'sdist': xsdist}, + ) + if HAVE_SETUPTOOLS: diff --git a/dev-python/xonsh/metadata.xml b/dev-python/xonsh/metadata.xml new file mode 100644 index 0000000..b15221c --- /dev/null +++ b/dev-python/xonsh/metadata.xml @@ -0,0 +1,12 @@ + + + + python + + xonsh + + scopatz@gmail.com + Anthony Scopatz + + + diff --git a/dev-python/xonsh/xonsh-0.2.3.ebuild b/dev-python/xonsh/xonsh-0.2.3.ebuild new file mode 100644 index 0000000..648162d --- /dev/null +++ b/dev-python/xonsh/xonsh-0.2.3.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python3_{4,5} ) + +inherit distutils-r1 eutils + +DESCRIPTION="An exotic, usable shell" +HOMEPAGE=" + http://xonsh.readthedocs.org/ + https://github.com/scopatz/xonsh + http://pypi.python.org/pypi/xonsh" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-python/ply[${PYTHON_USEDEP}] +" +DEPEND="${REDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}"/${P}-kernel-backport.patch + "${FILESDIR}"/${P}-${PN}.bat-backport.patch +) + +python_prepare_all() { + sed \ + -e "/install_kernel_spec/s:prefix=None:prefix=u\"${ED}/usr\":g" \ + -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests --verbose || die +} + +pkg_postinst() { + optfeature "Jupyter kernel support" dev-python/jupyter + optfeature "Alternative to readline backend" dev-python/prompt_toolkit +}