From 229bab746b4af2225505e0f60aa6f0281d1b0fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Tue, 31 Mar 2020 12:14:36 +0700
Subject: [PATCH] python-jupyter: drop python 2 package

Also make jupyter as subpackage of jupyter_core to avoid vlicense lint.

/usr/bin/jupyter is provided by jupyter_core packages.
---
 srcpkgs/python-jupyter/template      | 26 --------------------------
 srcpkgs/python-jupyter_core/template | 16 +++++++++++-----
 srcpkgs/python3-jupyter              |  2 +-
 3 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-jupyter/template

diff --git a/srcpkgs/python-jupyter/template b/srcpkgs/python-jupyter/template
deleted file mode 100644
index e89802506c..0000000000
--- a/srcpkgs/python-jupyter/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-jupyter'
-pkgname=python-jupyter
-version=1.0.0
-revision=5
-archs=noarch
-build_style=meta
-short_desc="The Jupyter metapackage for Void Linux (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://jupyter.org/"
-license="BSD-3-Clause"
-depends="
-	python-jupyter_notebook
-	python-jupyter_console
-	python-jupyter_nbconvert
-	python-jupyter_ipywidgets"
-
-python3-jupyter_package() {
-	archs=noarch
-	build_style=meta
-	short_desc="${short_desc/Python2/Python3}"
-	depends="
-		python3-jupyter_notebook
-		python3-jupyter_console
-		python3-jupyter_nbconvert
-		python3-jupyter_ipywidgets"
-}
diff --git a/srcpkgs/python-jupyter_core/template b/srcpkgs/python-jupyter_core/template
index f1629208e8..07c270fa77 100644
--- a/srcpkgs/python-jupyter_core/template
+++ b/srcpkgs/python-jupyter_core/template
@@ -1,17 +1,16 @@
 # Template file for 'python-jupyter_core'
 pkgname=python-jupyter_core
 version=4.4.0
-revision=2
+revision=3
 archs=noarch
 wrksrc="jupyter_core-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-traitlets"
-pycompile_module="jupyter_core jupyter.py"
 short_desc="Jupyter core package (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/jupyter/jupyter_core"
-license="3-clause-BSD"
+license="BSD-3-Clause"
+homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz"
 checksum=ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7
 
@@ -29,7 +28,6 @@ python3-jupyter_core_package() {
 	 jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate3"
 	archs=noarch
 	depends="python3-traitlets"
-	pycompile_module="jupyter_core jupyter.py"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/bin/jupyter3
@@ -38,3 +36,11 @@ python3-jupyter_core_package() {
 		vlicense COPYING.md LICENSE
 	}
 }
+
+python3-jupyter_package() {
+	build_style=meta
+	archs=noarch
+	depends="python3-jupyter_notebook python3-jupyter_console
+	 python3-jupyter_ipywidgets"
+	short_desc="Jupyter metapackage for Void Linux"
+}
diff --git a/srcpkgs/python3-jupyter b/srcpkgs/python3-jupyter
index 5c43ae0865..d348df87da 120000
--- a/srcpkgs/python3-jupyter
+++ b/srcpkgs/python3-jupyter
@@ -1 +1 @@
-python-jupyter
\ No newline at end of file
+python3-jupyter_core
\ No newline at end of file