From 06251a2dcc0185d746bfe1c68bf5e0ed2099865f Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Tue, 6 Jun 2017 15:34:54 +0200
Subject: [PATCH] python-ipython: update to 5.4.1

Split out python3-ipython since IPython>=6.0 is Python3-only.
IPython 5.x is a LTS release, yet compatible with Python 2.7.
---
 .../patches/no-versioned-scripts.patch        | 12 ------
 srcpkgs/python-ipython/template               | 39 ++++---------------
 srcpkgs/python3-ipython                       |  1 -
 srcpkgs/python3.4-ipython                     |  1 -
 4 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/python-ipython/patches/no-versioned-scripts.patch
 delete mode 120000 srcpkgs/python3-ipython
 delete mode 120000 srcpkgs/python3.4-ipython

diff --git a/srcpkgs/python-ipython/patches/no-versioned-scripts.patch b/srcpkgs/python-ipython/patches/no-versioned-scripts.patch
deleted file mode 100644
index d43e1c971c7..00000000000
--- a/srcpkgs/python-ipython/patches/no-versioned-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- setupbase.py.orig
-+++ setupbase.py
-@@ -298,7 +298,7 @@ def find_entry_points():
-             'iptest%s = IPython.testing.iptestcontroller:main',
-         ]
-     suffix = str(sys.version_info[0])
--    return [e % '' for e in ep] + [e % suffix for e in ep]
-+    return [e % '' for e in ep]
- 
- script_src = """#!{executable}
- # This script was automatically generated by setup.py
-
diff --git a/srcpkgs/python-ipython/template b/srcpkgs/python-ipython/template
index 99df932608d..def772574ca 100644
--- a/srcpkgs/python-ipython/template
+++ b/srcpkgs/python-ipython/template
@@ -1,20 +1,20 @@
 # Template file for 'python-ipython'
 pkgname=python-ipython
-version=5.3.0
+version=5.4.1
 revision=1
 noarch=yes
 wrksrc="ipython-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
 depends="python-pickleshare python-simplegeneric python-traitlets python-pexpect
  python-prompt_toolkit python-Pygments python-backports.shutil_get_terminal_size"
 pycompile_module="IPython"
 short_desc="Enhanced interactive Python2 shell"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://ipython.org/"
+homepage="https://ipython.org/"
 license="3-clause-BSD"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d
+checksum=afaa92343c20cf4296728161521d84f606d8817f963beaf7198e63dfede897fb
 
 alternatives="
  ipython:ipython:/usr/bin/ipython2
@@ -25,33 +25,10 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/IPython/external/decorators/_decorators.py
 	# remove iptest
 	rm -f ${DESTDIR}/usr/bin/iptest*
+	# remove ipython for alternatives
+	rm -f ${DESTDIR}/usr/bin/ipython
 	# create versioned man pages
 	mv ${DESTDIR}/usr/share/man/man1/ipython{,2}.1
-	vman docs/man/ipython.1 ipython3.1
-	# install license
+
 	vlicense COPYING.rst LICENSE
 }
-
-python3-ipython_package() {
-	alternatives="
-	 ipython:ipython:/usr/bin/ipython3
-	 ipython:ipython.1:/usr/share/man/man1/ipython3.1"
-	noarch=yes
-	depends="python3-pickleshare python3-simplegeneric python3-traitlets
-	 python3-pexpect python3-prompt_toolkit python3-Pygments"
-	pycompile_module="IPython"
-	replaces="python3.4-ipython>=0"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/ipython3
-		vmove usr/lib/python3*
-		vmove usr/share/man/man1/ipython3.1
-		vlicense COPYING.rst LICENSE
-	}
-}
-python3.4-ipython_package() {
-	noarch=yes
-	build_style=meta
-	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
-	depends="python3-ipython>=${version}_${revision}"
-}
diff --git a/srcpkgs/python3-ipython b/srcpkgs/python3-ipython
deleted file mode 120000
index 3c02370e4b5..00000000000
--- a/srcpkgs/python3-ipython
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython
\ No newline at end of file
diff --git a/srcpkgs/python3.4-ipython b/srcpkgs/python3.4-ipython
deleted file mode 120000
index 3c02370e4b5..00000000000
--- a/srcpkgs/python3.4-ipython
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython
\ No newline at end of file