python-pip: restore package, update to 20.3.1.

python3-pip: merge back into python-pip template.

This reverts commit 2cae61c368.

srcpkgs/python-pip/template

@@ -0,0 +1,30 @@
+# Template file for 'python-pip'
+pkgname=python-pip
+version=20.3.1
+revision=2
+wrksrc="pip-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=43f7d3811f05db95809d39515a5111dd05994965d870178a4fe10d5482f9d2e2
+
+post_install() {
+	vlicense LICENSE.txt
+}
+
+python3-pip_package() {
+	depends="python3-setuptools"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/bin/pip3
+		mv ${PKGDESTDIR}/usr/bin/pip{3,}
+		vmove ${py3_lib}
+		vlicense LICENSE.txt
+	}
+}

srcpkgs/python3-pip

@@ -0,0 +1 @@
+python-pip

srcpkgs/python3-pip/template

@@ -1,20 +0,0 @@
-# Template file for 'python3-pip'
-pkgname=python3-pip
-version=20.3.1
-revision=1
-wrksrc="pip-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=43f7d3811f05db95809d39515a5111dd05994965d870178a4fe10d5482f9d2e2
-conflicts="python-pip>=0"
-
-post_install() {
-	vlicense LICENSE.txt
-}