dev-python/xonsh: Fix sandbox issue

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=589442

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher <jlec@gentoo.org>

2 files changed, 24 insertions, 7 deletions

diff --git a/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch b/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch
new file mode 100644
index 00000000000..63d7e86149a
--- /dev/null
+++ b/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch
@@ -0,0 +1,16 @@
+ 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.4.4.ebuild b/dev-python/xonsh/xonsh-0.4.4.ebuild
index 92f70a4d5c1..58bd2a3b8cb 100644
--- a/dev-python/xonsh/xonsh-0.4.4.ebuild
+++ b/dev-python/xonsh/xonsh-0.4.4.ebuild
@@ -30,18 +30,19 @@ DEPEND="${RDEPEND}
 		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
-}
+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