1 files changed, 17 insertions, 19 deletions
diff --git a/python/python3-bcrypt/python3-bcrypt.SlackBuild b/python/python3-bcrypt/python3-bcrypt.SlackBuild
index f2c55c4352..808275dae5 100644
--- a/python/python3-bcrypt/python3-bcrypt.SlackBuild
+++ b/python/python3-bcrypt/python3-bcrypt.SlackBuild
@@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=python3-bcrypt
 SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-4.1.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.2.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -94,16 +94,14 @@ fi
 # configuration tells cargo to use the configured directory
 # for dependencies intead of downloading from crates.io
 mkdir .cargo
-cat << EOF >> .cargo/config.toml
-[source]
+cat << EOF >> .cargo/config
 [source.crates-io]
-replace-with = "vendored-sources"
+replace-with = 'vendored-sources'
 
 [source.vendored-sources]
-directory = "vendor"
+directory = '$(pwd)/vendor'
 EOF
 
-# deps and versions come from Cargo.lock
 mkdir vendor
 (
   cd vendor
@@ -124,19 +122,10 @@ mkdir vendor
     ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
     dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
 
-    CRATE_FILE=$CWD/$dep-$ver.crate
-
-    if [ -z "$cksum" ] ; then
-      mkdir $dep-$ver
-      tar xvf $CRATE_FILE -C $dep-$ver --strip-components=1
-      cksum="null"
-    else
-      tar xvf $CRATE_FILE
-    fi
+    tar xvf $CWD/$dep-$ver.crate
 
     touch $dep-$ver/.cargo-ok
 
-    # generate checksum
     {
       printf "{\n"
       printf '    "files": {\n'
@@ -163,10 +152,19 @@ find -L . \
 
 PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
 export PYTHONPATH=/opt/python$PYVER/site-packages/
-CARGO_HOME=.cargo \
+export CARGO_NET_OFFLINE=true
+export CARGO_HOME=$(pwd)/.cargo
+export PATH="/opt/rust/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-python3 setup.py install --root=$PKG
+python3 -m build --no-isolation
+python3 -m installer -d "$PKG" dist/*.whl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true