Mon Aug 14 19:04:41 UTC 202320230814190441

ap/mariadb-10.11.5-x86_64-1.txz:  Upgraded.
ap/mc-4.8.30-x86_64-1.txz:  Upgraded.
d/vala-0.56.11-x86_64-1.txz:  Upgraded.
l/json-c-0.17_20230812-x86_64-1.txz:  Upgraded.
l/libsndfile-1.2.2-x86_64-1.txz:  Upgraded.
l/openexr-3.1.11-x86_64-1.txz:  Upgraded.

5 files changed, 13 insertions, 32 deletions

diff --git a/source/ap/sc-im/repack-github-archive.sh b/source/ap/sc-im/repack-github-archive.sh
index 3c9d3b571..052751b87 100755
--- a/source/ap/sc-im/repack-github-archive.sh
+++ b/source/ap/sc-im/repack-github-archive.sh
@@ -48,6 +48,11 @@ EXTRACT_DIR=$(mktemp -d)
     OUTPUT_NAME="$(echo $OUTPUT_NAME | cut -f 2- -d -)"
     echo $OUTPUT_NAME
     mv * $OUTPUT_NAME
+  elif [ "$(echo $OUTPUT_NAME | cut -f 1-2 -d -)" = "$(echo $OUTPUT_NAME | cut -f 3-4 -d -)" ]; then
+    echo -n "Fixing internal archive name $OUTPUT_NAME -> "
+    OUTPUT_NAME="$(echo $OUTPUT_NAME | cut -f 3- -d -)"
+    echo $OUTPUT_NAME
+    mv * $OUTPUT_NAME
   fi
   tar cf $OUTPUT_NAME.tar $OUTPUT_NAME
   plzip -9 $OUTPUT_NAME.tar
diff --git a/source/l/json-c/json-c.SlackBuild b/source/l/json-c/json-c.SlackBuild
index 06e548e24..4764c7dfb 100755
--- a/source/l/json-c/json-c.SlackBuild
+++ b/source/l/json-c/json-c.SlackBuild
@@ -71,9 +71,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PKGNAME-$PKGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$PKGNAM-$VERSION || exit 1
+cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild b/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild
index 5c0896b3a..3e9159842 100755
--- a/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild
+++ b/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild
@@ -60,15 +60,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-# Use this setup.py shim:
-cat << EOF > setup.py
-from setuptools import setup
-setup(name="${SRCNAM}", version="${VERSION}", packages=["${SRCNAM}"], package_data={"": ["*"]})
-EOF
+unshare -n python3 -m build --wheel --no-isolation || exit 1
 
-# With the shim, it's a good idea to use "unshare -n" to prevent downloading
-# anything extra:
-unshare -n python3 setup.py install --root=$PKG || exit 1
+python3 -m installer --destdir "$PKG" dist/*.whl || exit 1
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a *.rst LICENSE* NOTICE PKG-INFO \
diff --git a/source/l/python-tomli/python-tomli.SlackBuild b/source/l/python-tomli/python-tomli.SlackBuild
index 0c207be54..a77948ede 100755
--- a/source/l/python-tomli/python-tomli.SlackBuild
+++ b/source/l/python-tomli/python-tomli.SlackBuild
@@ -61,18 +61,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-# flit is not needed at runtime
-sed -i '/flit_core/d' pyproject.toml
+unshare -n python3 -m build --wheel --no-isolation || exit 1
 
-# Use this setup.py shim:
-cat << EOF > setup.py
-from setuptools import setup
-setup(name="${SRCNAM}", version="${VERSION}", packages=["${SRCNAM}"], package_data={"": ["*"]})
-EOF
-
-# With the shim, it's a good idea to use "unshare -n" to prevent downloading
-# anything extra:
-unshare -n python3 setup.py install --root=$PKG || exit 1
+python3 -m installer --destdir "$PKG" dist/*.whl || exit 1
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a *.rst LICENSE* NOTICE PKG-INFO README* \
diff --git a/source/l/python-zipp/python-zipp.SlackBuild b/source/l/python-zipp/python-zipp.SlackBuild
index 3e691d88a..dd5dbbe56 100755
--- a/source/l/python-zipp/python-zipp.SlackBuild
+++ b/source/l/python-zipp/python-zipp.SlackBuild
@@ -60,18 +60,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-# Not sure why this is needed?
-mkdir zipp
+unshare -n python3 -m build --wheel --no-isolation || exit 1
 
-# Use this setup.py shim:
-cat << EOF > setup.py
-from setuptools import setup
-setup(name="${SRCNAM}", version="${VERSION}", packages=["${SRCNAM}"], package_data={"": ["*"]})
-EOF
-
-# With the shim, it's a good idea to use "unshare -n" to prevent downloading
-# anything extra:
-unshare -n python3 setup.py install --root=$PKG || exit 1
+python3 -m installer --destdir "$PKG" dist/*.whl || exit 1
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a *.rst LICENSE* NOTICE PKG-INFO \