diff --git a/srcpkgs/python-jupyter_console/template b/srcpkgs/python-jupyter_console/template index 51e8aa293c4..2594c4a8ece 100644 --- a/srcpkgs/python-jupyter_console/template +++ b/srcpkgs/python-jupyter_console/template @@ -1,12 +1,11 @@ # Template file for 'python-jupyter_console' pkgname=python-jupyter_console version=4.1.1 -revision=2 +revision=3 noarch=yes wrksrc="jupyter_console-${version}" build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" +hostmakedepends="python-setuptools python3-setuptools" depends="python-ipython>=4.0.0 python-ipython_ipykernel python-jupyter_client" pycompile_module="jupyter_console" short_desc="Jupyter terminal console (Python2)" @@ -15,22 +14,28 @@ homepage="https://github.com/jupyter/jupyter_console" license="3-clause-BSD" distfiles="${PYPI_SITE}/j/jupyter_console/jupyter_console-${version}.tar.gz" checksum=d754cfd18d258fa9e7dde39a36e589c4a7241075b5d0f420691fa3d50e4c4ae3 -alternatives="jupyter-console:jupyter-console:/usr/bin/jupyter-console2.7" +alternatives="jupyter-console:jupyter-console:/usr/bin/jupyter-console2" post_install() { vlicense COPYING.md LICENSE } -python3.4-jupyter_console_package() { +python3-jupyter_console_package() { noarch=yes - depends="python3.4-ipython>=4.0.0 python3.4-ipython_ipykernel python3.4-jupyter_client" - pycompile_version="3.4" + depends="python3-ipython>=4.0.0 python3-ipython_ipykernel python3-jupyter_client" pycompile_module="jupyter_console" - short_desc="${short_desc/Python2/Python3.4}" - alternatives="jupyter-console:jupyter-console:/usr/bin/jupyter-console3.4" + replaces="python3.4-jupyter_console>=0" + short_desc="${short_desc/Python2/Python3}" + alternatives="jupyter-console:jupyter-console:/usr/bin/jupyter-console3" pkg_install() { - vmove usr/bin/jupyter-console3.4 - vmove usr/lib/python3.4 + vmove usr/bin/jupyter-console3 + vmove usr/lib/python3* vlicense COPYING.md LICENSE } } +python3.4-jupyter_console_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-jupyter_console>=${version}_${revision}" +} diff --git a/srcpkgs/python3-jupyter_console b/srcpkgs/python3-jupyter_console new file mode 120000 index 00000000000..d57f6727496 --- /dev/null +++ b/srcpkgs/python3-jupyter_console @@ -0,0 +1 @@ +python-jupyter_console \ No newline at end of file