* [gentoo-commits] repo/gentoo:master commit in: dev-python/xonsh/, dev-python/xonsh/files/
@ 2015-11-28 14:13 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-11-28 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 820cc250751bd8e14cd80db11599e3a3f6b1f5b8
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 12:53:52 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec <AT> 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 <daniel@milde.cz>
+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 <po.lenhoff@gmail.com>
+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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>python</herd>
+ <upstream>
+ <remote-id type="pypi">xonsh</remote-id>
+ <maintainer status="unknown">
+ <email>scopatz@gmail.com</email>
+ <name>Anthony Scopatz</name>
+ </maintainer>
+ </upstream>
+</pkgmetadata>
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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/xonsh/, dev-python/xonsh/files/
@ 2018-06-26 18:46 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-06-26 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 42283400bd0e4fdb9779e0123fbd67a52e37eb29
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 18:32:47 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 18:46:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42283400
dev-python/xonsh: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-python/xonsh/Manifest | 2 -
dev-python/xonsh/files/xonsh-0.4.4-destdir.patch | 16 --------
dev-python/xonsh/xonsh-0.2.6.ebuild | 45 -----------------------
dev-python/xonsh/xonsh-0.4.4.ebuild | 47 ------------------------
4 files changed, 110 deletions(-)
diff --git a/dev-python/xonsh/Manifest b/dev-python/xonsh/Manifest
index 961743b6b6d..6537ddfd956 100644
--- a/dev-python/xonsh/Manifest
+++ b/dev-python/xonsh/Manifest
@@ -1,3 +1 @@
-DIST xonsh-0.2.6.tar.gz 170842 BLAKE2B 2fc02ce5e4cfaf1f3b602658ad313e576881163e1255863ab0a714a0248046e632fa57e67ac2b9cd403d63f6202aaccf0edcf49f25ac65d385c3cef06576f108 SHA512 43b034987323b832d052974f02a52ffd492ae4f0fbf6a0a035329000e393c9c9466ee0275cf678db5581e84e627d59bac015ad6131f35bdfbc1374bf4db20977
-DIST xonsh-0.4.4.tar.gz 543801 BLAKE2B c00358688d9b05ebf9326fdb6536a927d86ee9d5d2520237c59cacfbcf41819028a675d198cf4896b870e956592c24b667aaa9075c41f36f707c0d4526a053d5 SHA512 2cb6b045010b51d1a846625821bb6a8e415cc01f0e623f1ab7efb02ae0debaf9dab1e0bca0d27dd00a320bb1f5d9d001833ecf3a917562b683a7c59a51b8aff0
DIST xonsh-0.4.7.tar.gz 545249 BLAKE2B e7207274cccbd96a32942dad7e5b0e44c4a053c52a0f4e06bc789d86414d678192ce885e3d2cccf2c4f4d208567a2beb1319ffd01e150b5a1a953cb82ca75598 SHA512 133a493b1245048e4b8a51f01f0629283736753a7636d8bb0c123b623122b285fed9ba415972e5f44dbb9a1439a83858da50a9b01ebe6bb11e4e390708e08c9f
diff --git a/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch b/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch
deleted file mode 100644
index 63d7e86149a..00000000000
--- a/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- setup.py | 3 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 679f984..6de421e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -167,6 +167,8 @@ class xinstall(install):
- # install Jupyter hook
- root = self.root if self.root else None
- prefix = self.prefix if self.prefix else None
-+ destdir = os.environ["ED"]
-+ prefix = destdir + prefix
- try:
- install_jupyter_hook(prefix=prefix, root=root)
- except Exception:
diff --git a/dev-python/xonsh/xonsh-0.2.6.ebuild b/dev-python/xonsh/xonsh-0.2.6.ebuild
deleted file mode 100644
index 661d625aacc..00000000000
--- a/dev-python/xonsh/xonsh-0.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="An exotic, usable shell"
-HOMEPAGE="
- https://github.com/scopatz/xonsh
- https://pypi.org/project/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="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-
-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
-}
diff --git a/dev-python/xonsh/xonsh-0.4.4.ebuild b/dev-python/xonsh/xonsh-0.4.4.ebuild
deleted file mode 100644
index 7c361d8e21a..00000000000
--- a/dev-python/xonsh/xonsh-0.4.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="An exotic, usable shell"
-HOMEPAGE="
- https://github.com/scopatz/xonsh
- https://pypi.org/project/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}]
- dev-python/pygments[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-destdir.patch
-)
-
-python_test() {
- nosetests --verbose || die
-}
-
-src_install() {
- export "${ED}"
- distutils-r1_src_install
-}
-
-pkg_postinst() {
- optfeature "Jupyter kernel support" dev-python/jupyter
- optfeature "Alternative to readline backend" dev-python/prompt_toolkit
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-26 18:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-28 14:13 [gentoo-commits] repo/gentoo:master commit in: dev-python/xonsh/, dev-python/xonsh/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2018-06-26 18:46 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox