gentoo resync : 30.06.2018

5 files changed, 2 insertions, 115 deletions

diff --git a/dev-python/xonsh/Manifest b/dev-python/xonsh/Manifest
index c27d836405a5..96f6d6aa534a 100644
--- a/dev-python/xonsh/Manifest
+++ b/dev-python/xonsh/Manifest
@@ -1,8 +1,3 @@
-AUX xonsh-0.4.4-destdir.patch 497 BLAKE2B 05edccabc8fb6af058942d6d27a94c844e24578f38fd21cf2c1e114424ac2595f44e4cba4b74202d49d09799b6e98c62a31c571d4e531a5ff7f1f3e54db10f62 SHA512 56d5f7a67769a8f5d54ef03d6f46291d0eee9dbd09c869bf5837fc113a2a91fce29beed464cf024986fc41c6c97ed2660152d74da2cc3bd67202046c2dfe716e
-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
-EBUILD xonsh-0.2.6.ebuild 936 BLAKE2B 649539209a5d6b863d602eadb2d67afc0ed481aaba148c314dd0917b366be4d687322e02ae384ba15acd1b93f5493123434fa2dea7fa96242b4f06d66fbe0243 SHA512 d7bded0194d0f852e0e0ce40d97cd5e1c5b2ef223a06d70ae704ff98ea499417dfdd7960d7aa16aebbfdade32e41b1b0d47fdc4cb26ec019833a80096ca27f8b
-EBUILD xonsh-0.4.4.ebuild 927 BLAKE2B c566e217917b2bb70e0d4f4d2afd076f166c49b2fdd4629334a2197485a45bba676e451b439ce99dbae7e034351b1fa61309f8e54571a370291863e46f2d2eac SHA512 0b4a505b089416ddcacb5ed3243936dd6a6e6c23433fae6cabdbe823a7f87052785b7278fcc477f3975795fd11b7f20e59069b1f9bb96a2bfd12b09bdbf2632c
-EBUILD xonsh-0.4.7.ebuild 1001 BLAKE2B 3a4f1f4dc2bc5a267d79834e5fdbbf7536164f66a3d034430808f4fbce788d0afe6ce007a3b76bba93d5f701096e5878ff2e624585858ccf46a06fa4606b0cf3 SHA512 3f72e0ad60eb3bbe6eaf645da00ce043113ec6b6ddada754c4bb003704e552d805af3a2996c0d1a8be142c857e2db2f5256201fe5d5d7aea12422d7249c0a2f1
+EBUILD xonsh-0.4.7.ebuild 1003 BLAKE2B dac21f40a3cb072bdea5e0d1e63a669c2140ac46d503169d86637a88871166463cb19c81cd3be8db4862d73e97c2bcd0a2c33b68b23c2a6313e11ab11f89241c SHA512 64a9fccc3e71bcdc2dd0d7bb5088f735f0c9df78a86a251f02835b9c4789a9c54768b45c6724b991b63f3b65400c47cd0849b714c8f84d6747f44ee1074b40d9
 MISC metadata.xml 421 BLAKE2B 61c8423ad1c450e2a42a32fab7f839151ca56529b73633169fbebfb09e9cf8bf35d3387e06eaf0cb4951cb74478c69114acc3c7a7aea4e0fb4cc1bc46abdec66 SHA512 7a6b4489d4ccadf9659bffc020893f0282a843a8fefc04326a9a40964304416bd021613f231b46b1c39ff4f91a623f8e521c8f5b9d1a9311574fd6b83a5c40b3
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 63d7e86149a0..000000000000
--- 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 661d625aaccc..000000000000
--- 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 7c361d8e21a5..000000000000
--- 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
-}
diff --git a/dev-python/xonsh/xonsh-0.4.7.ebuild b/dev-python/xonsh/xonsh-0.4.7.ebuild
index 92dd9328a6e2..d6c9310916d2 100644
--- a/dev-python/xonsh/xonsh-0.4.7.ebuild
+++ b/dev-python/xonsh/xonsh-0.4.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 eutils