From fa11cca96bdff873303a99d7ca7f114e573fac8c Mon Sep 17 00:00:00 2001
From: joborun <joborun@disroot.org>
Date: Tue, 31 Oct 2023 18:54:25 +0200
Subject: [PATCH] upg gyp

---
 gyp/PKGBUILD      | 26 +++++++++++++-----------
 gyp/PKGBUILD-arch | 51 ++++++++++++++++++++++++++++++-----------------
 gyp/deps          |  8 ++++++--
 3 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/gyp/PKGBUILD b/gyp/PKGBUILD
index 2dde526..47138a4 100644
--- a/gyp/PKGBUILD
+++ b/gyp/PKGBUILD
@@ -6,23 +6,25 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=gyp
-pkgver=20220404.9ecf45e3
-pkgrel=02
+pkgver=20230914.a03d7413
+pkgrel=01
 pkgdesc='"Generate Your Projects" Meta-Build system'
 url="https://gyp.gsrc.io/"
 depends=(python-six ninja)
-makedepends=(git python-setuptools)
-_commit=9ecf45e37677743503342ee4c6a76eaee80e4a7f  # changes/24/3562924/3
+makedepends=(git  python-build python-installer python-setuptools python-wheel)
+_commit=a03d7413becefc8d55c8aa3df58b55b9bd0e9052  # changes/05/4858505/3
 source=("git+https://chromium.googlesource.com/external/gyp#commit=$_commit"
-        0001-gyp-python38.patch
-        0002-gyp-fix-cmake.patch
-        0003-gyp-fips.patch)
+	0001-gyp-python38.patch
+	0002-gyp-fix-cmake.patch
+	0003-gyp-fips.patch)
 
 pkgver() {
   cd $pkgname
 
-  # Commit date + short rev
-  echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
+  local commit_date="$(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD)"
+  local short_rev="$(git rev-parse --short HEAD)"
+
+  echo $commit_date.$short_rev
 }
 
 prepare() {
@@ -34,12 +36,12 @@ prepare() {
 
 build() {
   cd $pkgname
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 package() {
   cd $pkgname
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
 }
 
@@ -54,4 +56,4 @@ sha256sums=(SKIP
 	8a9f1a413b943dd469f981ee5fa7b7cc372e3cd9e9f0ecf9640d4f0f6bb29647 # 0002-gyp-fix-cmake.patch
 	dda2c6717d52a9dd53ce5b4985115f947dcca2bce3a207bd9c543976c41decf5) # 0003-gyp-fips.patch
 
-##  fb6c543583b098d704d98b7db56727fabf4a9193dc7ff55e723e0d367b847c32  gyp-20220404.9ecf45e3-02-x86_64.pkg.tar.lz
+##  34f983b5646ed2fdbee85877b3cfa500a809359277622a8f2ea1579c2cd01c83  gyp-20230914.a03d7413-01-x86_64.pkg.tar.lz
diff --git a/gyp/PKGBUILD-arch b/gyp/PKGBUILD-arch
index d5dd36d..7fe36cf 100644
--- a/gyp/PKGBUILD-arch
+++ b/gyp/PKGBUILD-arch
@@ -1,29 +1,42 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgname=gyp
-pkgver=20220404.9ecf45e3
-pkgrel=2
-pkgdesc='"Generate Your Projects" Meta-Build system'
+pkgver=20230914.a03d7413
+pkgrel=1
+pkgdesc="Generate Your Projects meta-build system"
 url="https://gyp.gsrc.io/"
 arch=(any)
 license=(custom:BSD)
-depends=(python-six ninja)
-makedepends=(git python-setuptools)
-_commit=9ecf45e37677743503342ee4c6a76eaee80e4a7f  # changes/24/3562924/3
-source=("git+https://chromium.googlesource.com/external/gyp#commit=$_commit"
-        0001-gyp-python38.patch
-        0002-gyp-fix-cmake.patch
-        0003-gyp-fips.patch)
-sha256sums=('SKIP'
-            '7fb04acbac92a1d173c2bc3022b7814a711427225a7fd32912dc60f1e1a6746e'
-            '8a9f1a413b943dd469f981ee5fa7b7cc372e3cd9e9f0ecf9640d4f0f6bb29647'
-            'dda2c6717d52a9dd53ce5b4985115f947dcca2bce3a207bd9c543976c41decf5')
+depends=(
+  ninja
+  python-six
+)
+makedepends=(
+  git
+  python-build
+  python-installer
+  python-setuptools
+  python-wheel
+)
+_commit=a03d7413becefc8d55c8aa3df58b55b9bd0e9052  # changes/05/4858505/3
+source=(
+  "git+https://chromium.googlesource.com/external/gyp#commit=$_commit"
+  0001-gyp-python38.patch
+  0002-gyp-fix-cmake.patch
+  0003-gyp-fips.patch
+)
+b2sums=('SKIP'
+        '639848a0f0eb26bc16304b9c1ef2944f5cf37b2d7367a7de34becf2ec0962ce43820a21cd6c4d839775fc2dc1440c6e94f10cfd7781c5fe2278ba497b3fbdcb9'
+        'f77bda072b6a3916c78c2061ceffa8b17bf1341d13509089effd3961e22cb315f68fdf749ab4a6abea37a9ecd61989ddcd75229a45d026e068bf11037ad4499c'
+        '61febe5fb8672c2ad4012957b1f42d2909b7adae9b9c62417c22073b7d97dfad37cb34c19839b13bea54f8ab45c068f7b121bd3b4ae62d5234611861cae73c98')
 
 pkgver() {
   cd gyp
 
-  # Commit date + short rev
-  echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
+  local commit_date="$(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD)"
+  local short_rev="$(git rev-parse --short HEAD)"
+
+  echo $commit_date.$short_rev
 }
 
 prepare() {
@@ -35,11 +48,13 @@ prepare() {
 
 build() {
   cd gyp
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 package() {
   cd gyp
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
 }
+
+# vim:set sw=2 sts=-1 et:
diff --git a/gyp/deps b/gyp/deps
index 653e052..44f3f23 100644
--- a/gyp/deps
+++ b/gyp/deps
@@ -2,6 +2,10 @@ python-six
 ninja
 git
 python-setuptools
-
-
 python-typing_extensions
+
+
+python-build
+python-installer
+python-wheel
+