From 6db354d731c2a8aa891cd01a302d46234b7a0dec Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Fri, 23 Sep 2022 11:42:48 +0530
Subject: [PATCH] Remove old removestaticlibs function call in giflib, libcap,
 mozilla-nssand x264 packages in base Upgraded python-{pip,wheel,setuptools}
 in base

---
 base/giflib/giflib.SMBuild                       |  1 -
 base/libcap/libcap.SMBuild                       |  1 -
 base/mozilla-nss/mozilla-nss.SMBuild             |  1 -
 base/python-pip/python-pip.SMBuild               |  9 +++------
 base/python-setuptools/python-setuptools.SMBuild | 12 +++++++-----
 base/python-wheel/python-wheel.SMBuild           |  3 ++-
 base/x264/x264.SMBuild                           |  1 -
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/base/giflib/giflib.SMBuild b/base/giflib/giflib.SMBuild
index 0cace68..55e5b06 100755
--- a/base/giflib/giflib.SMBuild
+++ b/base/giflib/giflib.SMBuild
@@ -20,7 +20,6 @@ build() {
   make install DESTDIR=$pkg PREFIX="/"
 
   cp COPYING $pkgdocs/
-  removestaticlibs
 
   mkfinalpkg
 }
diff --git a/base/libcap/libcap.SMBuild b/base/libcap/libcap.SMBuild
index 2d2d09c..8e83fed 100755
--- a/base/libcap/libcap.SMBuild
+++ b/base/libcap/libcap.SMBuild
@@ -31,7 +31,6 @@ build() {
   LD_LIBRARY_PATH=${LIBDIR} ${SBINDIR}/setcap cap_setfacap=i ${SBINDIR}/setcap || echo "oops"
 
   cp License $pkgdocs/
-  removestaticlibs
 
   mkfinalpkg
 }
diff --git a/base/mozilla-nss/mozilla-nss.SMBuild b/base/mozilla-nss/mozilla-nss.SMBuild
index 7394bd8..f43dbe9 100755
--- a/base/mozilla-nss/mozilla-nss.SMBuild
+++ b/base/mozilla-nss/mozilla-nss.SMBuild
@@ -100,7 +100,6 @@ EOT
   )
 
   cp -a $srcdir/{MPL-1.1.txt,gpl-2.0.txt,lgpl-2.1.txt} $pkgdocs/
-  removestaticlibs
 
   mkfinalpkg
 }
diff --git a/base/python-pip/python-pip.SMBuild b/base/python-pip/python-pip.SMBuild
index ac8e1a5..bc5f5b8 100755
--- a/base/python-pip/python-pip.SMBuild
+++ b/base/python-pip/python-pip.SMBuild
@@ -1,8 +1,8 @@
 app=python-pip
-version=20.1.1
+version=22.2.2
 build=1sml
 homepage="https://pypi.org/project/pip/"
-download="https://github.com/pypa/pip/archive/refs/tags/20.1.1.tar.gz"
+download="https://github.com/pypa/pip/archive/refs/tags/$version.tar.gz"
 desc="Package installer for python"
 requires="python3 python-setuptools"
 
@@ -14,14 +14,11 @@ build() {
   cd pip-$version 
   fixbuilddirpermissions
 
-  python setup.py build
   python setup.py install --prefix="" --root=$pkg
 
-  cp LICENSE.txt $pkgdocs/
-
   mkfinalpkg
 }
 
 sha512sums="
-383bab9880fbaaa46681257c389bf04238c8b9418d83f110be7b23331846cf3d353287793c3bfb920ba6b05fe23d1779b43a84c0d74cafb4c3561f55736423d8  pip-20.1.1.tar.lz
+bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015  pip-22.2.2.tar.gz
 "
diff --git a/base/python-setuptools/python-setuptools.SMBuild b/base/python-setuptools/python-setuptools.SMBuild
index cbc7082..650307c 100755
--- a/base/python-setuptools/python-setuptools.SMBuild
+++ b/base/python-setuptools/python-setuptools.SMBuild
@@ -1,8 +1,8 @@
 app=python-setuptools
-version=46.4.0
+version=57.5.0
 build=1sml
 homepage="https://github.com/pypa/setuptools"
-download="https://github.com/pypa/setuptools/archive/refs/tags/v$version.tar.gz"
+download="https://slackware.uk/slackware/slackware-15.0/source/d/python-setuptools/setuptools-$version.tar.lz"
 desc="python module installation helper"
 requires="python3"
 
@@ -13,9 +13,11 @@ build() {
   tar xf $srcdir/setuptools-$version.tar.?z*
   cd setuptools-$version 
   fixbuilddirpermissions
+  
+  # Discard Windows binaries
+  rm -f setuptools/*.exe
 
-  python bootstrap.py
-  python setup.py install --prefix="" --root=$pkg --optimize=1
+  python setup.py install --prefix="" --root=$pkg
 
   cp LICENSE $pkgdocs/
 
@@ -23,5 +25,5 @@ build() {
 }
 
 sha512sums="
-fe22f2fd29791fbdb065c5ef4eca478f623f029dc6ef572e206b47419df311e42d2968e2f3752f1299a35bd71b59bcf69c0f6fb67b477ba810fd0c141ea1183b  setuptools-46.4.0.tar.lz
+8a43126d246644eeffc34f5c3418ed31128b4a60d0965aadc258105e3e8545fa1716dc320393cf8a96b4a8558bb7bf8b62146dee443fa185f154dbb6c85ca6cb  setuptools-57.5.0.tar.lz
 "
diff --git a/base/python-wheel/python-wheel.SMBuild b/base/python-wheel/python-wheel.SMBuild
index e036a89..a22a845 100755
--- a/base/python-wheel/python-wheel.SMBuild
+++ b/base/python-wheel/python-wheel.SMBuild
@@ -1,7 +1,8 @@
 app=python-wheel
-version=0.36.2
+version=0.37.1
 build=1sml
 homepage="https://pypi.org/project/wheel/"
+download="https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a540964b73589256cb10cc10057c87ac78fc2/wheel-$version.tar.gz"
 desc="Python implementation of the python wheel packaging standard"
 requires="python-click"
 
diff --git a/base/x264/x264.SMBuild b/base/x264/x264.SMBuild
index 6b98ca9..453c6b3 100755
--- a/base/x264/x264.SMBuild
+++ b/base/x264/x264.SMBuild
@@ -25,7 +25,6 @@ build() {
   make install DESTDIR=$pkg
 
   cp AUTHORS COPYING doc/* $pkgdocs/
-  removestaticlibs
 
   mkfinalpkg
 }