From 4b6da45af22ec6fed9d3c895009c16d583bb7f12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 5 Dec 2020 21:28:36 -0500
Subject: [PATCH] python-pip: restore package, update to 20.3.1.

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

This reverts commit 2cae61c3688dff40aa6cafa827008e351db69dc1.
---
 .../patches/no-versioned-pip.patch            |  0
 srcpkgs/python-pip/template                   | 30 +++++++++++++++++++
 srcpkgs/{python3-pip => python-pip}/update    |  0
 srcpkgs/python3-pip                           |  1 +
 srcpkgs/python3-pip/template                  | 20 -------------
 5 files changed, 31 insertions(+), 20 deletions(-)
 rename srcpkgs/{python3-pip => python-pip}/patches/no-versioned-pip.patch (100%)
 create mode 100644 srcpkgs/python-pip/template
 rename srcpkgs/{python3-pip => python-pip}/update (100%)
 create mode 120000 srcpkgs/python3-pip
 delete mode 100644 srcpkgs/python3-pip/template

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python3-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
new file mode 100644
index 0000000000..0ed9ea9635
--- /dev/null
+++ b/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
+	}
+}
diff --git a/srcpkgs/python3-pip/update b/srcpkgs/python-pip/update
similarity index 100%
rename from srcpkgs/python3-pip/update
rename to srcpkgs/python-pip/update
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
new file mode 120000
index 0000000000..9de2412ef6
--- /dev/null
+++ b/srcpkgs/python3-pip
@@ -0,0 +1 @@
+python-pip
\ No newline at end of file
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
deleted file mode 100644
index 7e9967aa71..0000000000
--- a/srcpkgs/python3-pip/template
+++ /dev/null
@@ -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
-}