From 75d6c0cd865d87d1cdb664b9391dabc47169a298 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Mon, 2 Jul 2018 07:31:02 +1000
Subject: python3-pyparsing: update to remove bootstrap code

---
 python3-pyparsing/.footprint |  5 -----
 python3-pyparsing/.md5sum    |  1 -
 python3-pyparsing/.signature |  7 +++----
 python3-pyparsing/Pkgfile    | 33 +++++++++------------------------
 4 files changed, 12 insertions(+), 34 deletions(-)

(limited to 'python3-pyparsing')

diff --git a/python3-pyparsing/.footprint b/python3-pyparsing/.footprint
index efaff2767..d9358cbfc 100644
--- a/python3-pyparsing/.footprint
+++ b/python3-pyparsing/.footprint
@@ -5,9 +5,4 @@ drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/
 drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/__pycache__/pyparsing.cpython-36.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/__pycache__/pyparsing.cpython-36.pyc
-drwxr-xr-x	root/root	usr/lib/python3.6/site-packages/pyparsing-2.2.0-py3.6.egg-info/
--rw-r--r--	root/root	usr/lib/python3.6/site-packages/pyparsing-2.2.0-py3.6.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.6/site-packages/pyparsing-2.2.0-py3.6.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.6/site-packages/pyparsing-2.2.0-py3.6.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.6/site-packages/pyparsing-2.2.0-py3.6.egg-info/top_level.txt
 -rw-r--r--	root/root	usr/lib/python3.6/site-packages/pyparsing.py
diff --git a/python3-pyparsing/.md5sum b/python3-pyparsing/.md5sum
index 86fd73855..7d40b92a0 100644
--- a/python3-pyparsing/.md5sum
+++ b/python3-pyparsing/.md5sum
@@ -1,2 +1 @@
-a73d0534575b904d17913889dce5bd99  get-pip.py
 0214e42d63af850256962b6744c948d9  pyparsing-2.2.0.tar.gz
diff --git a/python3-pyparsing/.signature b/python3-pyparsing/.signature
index a5173cb86..bebaab5dc 100644
--- a/python3-pyparsing/.signature
+++ b/python3-pyparsing/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bodtIUI5WGLLmeufTTZseEZZX1yW8ZwqpRHnHE9YZAl3wc3PW2O3QHRdZNTxfN6+StbUkBcm/sFq8Ug181kJwE=
-SHA256 (Pkgfile) = 1f38d466c65c7904ba266a51b9d2e7dc8d836faf303afa1fa9d4483f0fc11f31
-SHA256 (.footprint) = a567413884d886892a22579ae74bd02bacf5de93cf6b5188348bbb07f9dbe155
+RWSE3ohX2g5d/fYz2sorLqsckQNdxM/gpG6DIXQY3IcNL/X5GjK7pyG6RE4VPmri+PvIgnsj03So9JU5bA+JmUXdeH4JtG6LPgw=
+SHA256 (Pkgfile) = e9eb16b13ef93bf1f4b29aae3f6bdf677323d9626903f0963d30d84bab929430
+SHA256 (.footprint) = d5cb603a6e6540c1d738d5423014e12a4b85d19731e65b68595c924a279ef51e
 SHA256 (pyparsing-2.2.0.tar.gz) = 0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04
-SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40
diff --git a/python3-pyparsing/Pkgfile b/python3-pyparsing/Pkgfile
index 32d184a6c..c8bd63e21 100644
--- a/python3-pyparsing/Pkgfile
+++ b/python3-pyparsing/Pkgfile
@@ -5,35 +5,20 @@
 
 name=python3-pyparsing
 version=2.2.0
-release=1
-source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz
-	https://crux.ster.zone/downloads/get-pip.py
-#	https://bootstrap.pypa.io/get-pip.py
-)
+release=2
+source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz)
 
 build() {
 	cd ${name#*-}-$version
 
-	if [ "$(pkginfo -i | egrep -c '^python3-(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then
-		install -d build
-		sed -i 's/"--upgrade"/"--upgrade", "--upgrade-strategy", "only-if-needed"/' $SRC/get-pip.py
-		/usr/bin/python3 $SRC/get-pip.py --root=$SRC/build
+	/usr/bin/python3 setup.py build
 
-		local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])')
+	/usr/bin/python3 setup.py install \
+		--prefix=/usr --root=$PKG --optimize=1
 
-		PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \
-			/usr/bin/python3 setup.py build
+	find $PKG/usr/lib/python*/site-packages -type f -exec chmod go-w {} +
 
-		PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \
-			/usr/bin/python3 setup.py install \
-			--prefix=/usr --root=$PKG --optimize=1
-	else
-		/usr/bin/python3 setup.py build
-
-		/usr/bin/python3 setup.py install \
-			--prefix=/usr --root=$PKG --optimize=1
-	fi
-
-	local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])')
-	find $PKG/usr/lib/python$PYTHONVERSION/site-packages -type f -exec chmod go-w {} +
+	# remove sdist metadata, as wheel metadata will be used with python3-pip
+	find $PKG/usr/lib/python*/site-packages/ -maxdepth 1 -type f \
+		-name "${name#*-}-$version-py*.egg-info" -delete
 }
-- 
cgit v1.2.3