From cb311e0c22259b3a5ab39073e2a5f8203765fd5a Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 29 Jan 2023 17:02:16 +0100
Subject: [PATCH] Update autotools-wrappers to 20221207

Gentoo has now moved the wrappers into their own git repo
and versions them in one.

To keep things simple, follow their lead and build both wrapper
packages in one PKGBUILD.
---
 autoconf-wrapper/PKGBUILD   | 29 --------------------
 automake-wrapper/PKGBUILD   | 29 --------------------
 autotools-wrappers/PKGBUILD | 53 +++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 58 deletions(-)
 delete mode 100644 autoconf-wrapper/PKGBUILD
 delete mode 100644 automake-wrapper/PKGBUILD
 create mode 100644 autotools-wrappers/PKGBUILD

diff --git a/autoconf-wrapper/PKGBUILD b/autoconf-wrapper/PKGBUILD
deleted file mode 100644
index 158c3a02..00000000
--- a/autoconf-wrapper/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
-
-pkgname=autoconf-wrapper
-pkgver=15
-pkgrel=1
-pkgdesc="Wrapper scripts for autoconf commands"
-arch=('any')
-license=('spdx:GPL-2.0-only')
-url="https://packages.gentoo.org/packages/sys-devel/autoconf-wrapper"
-depends=(
-  'bash'
-  'sed'
-  'autoconf2.71'
-  'autoconf2.69'
-  'autoconf2.13')
-source=("ac-wrapper-${pkgver}.sh::https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-devel/autoconf-wrapper/files/ac-wrapper-${pkgver}.sh?id=bff583ede76fd4f7ab5b21399ff72bfce15634aa")
-sha256sums=('707a9b003d43bcd6701df4ae65abf8e449a8b9337ec91a86ef17e8e76e48942b')
-provides=("autoconf")
-conflicts=("autoconf")
-replaces=("autoconf")
-
-package() {
-  mkdir -p ${pkgdir}/usr/bin
-
-  for prog in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames
-  do
-    cp "${srcdir}/ac-wrapper-${pkgver}.sh" "${pkgdir}/usr/bin/${prog}"
-  done
-}
diff --git a/automake-wrapper/PKGBUILD b/automake-wrapper/PKGBUILD
deleted file mode 100644
index 105a3316..00000000
--- a/automake-wrapper/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Alexey Pavlov <alexpux@gmail.com>
-
-pkgname=automake-wrapper
-pkgver=11
-pkgrel=4
-pkgdesc="Wrapper scripts for automake and aclocal"
-arch=('any')
-license=('GPL')
-url="https://packages.gentoo.org/packages/sys-devel/automake-wrapper"
-depends=(
-  'bash'
-  'gawk'
-  'automake1.11'
-  'automake1.12'
-  'automake1.13'
-  'automake1.14'
-  'automake1.15'
-  'automake1.16')
-source=("am-wrapper-${pkgver}.sh::https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-devel/automake-wrapper/files/am-wrapper-${pkgver}.sh?id=1c995dec8c8361c4c52b83a06b2cfc20c2d7213d")
-sha256sums=('455dd326ec1ab04f5cbbdfd9bc0df5ad86152c0b2442faca98da0813827e0cbc')
-provides=("automake")
-conflicts=("automake")
-
-package() {
-  mkdir -p ${pkgdir}/usr/bin
-
-  cp "${srcdir}"/am-wrapper-${pkgver}.sh ${pkgdir}/usr/bin/automake
-  cp "${srcdir}"/am-wrapper-${pkgver}.sh ${pkgdir}/usr/bin/aclocal
-}
diff --git a/autotools-wrappers/PKGBUILD b/autotools-wrappers/PKGBUILD
new file mode 100644
index 00000000..71ed78e2
--- /dev/null
+++ b/autotools-wrappers/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
+
+pkgbase=autotools-wrappers
+pkgname=('automake-wrapper' 'autoconf-wrapper' )
+pkgver=20221207
+pkgrel=1
+arch=('any')
+license=('spdx:GPL-2.0-only')
+makedepends=('git')
+url="https://gitweb.gentoo.org/proj/autotools-wrappers.git/"
+_commit="afe80def609c91d72df73837ce2c51fed8b69f28" # at-20221207
+source=("git+https://anongit.gentoo.org/git/proj/autotools-wrappers.git#commit=${_commit}")
+sha256sums=('SKIP')
+
+package_automake-wrapper() {
+  pkgdesc="Wrapper scripts for automake commands"
+  depends=(
+    'bash'
+    'gawk'
+    'automake1.11'
+    'automake1.12'
+    'automake1.13'
+    'automake1.14'
+    'automake1.15'
+    'automake1.16')
+  provides=("automake")
+  conflicts=("automake")
+
+  mkdir -p ${pkgdir}/usr/bin
+  for prog in automake aclocal
+  do
+    cp "${srcdir}/${pkgbase}/am-wrapper.sh" "${pkgdir}/usr/bin/${prog}"
+  done
+}
+
+package_autoconf-wrapper() {
+  pkgdesc="Wrapper scripts for autoconf commands"
+  depends=(
+    'bash'
+    'sed'
+    'autoconf2.71'
+    'autoconf2.69'
+    'autoconf2.13')
+  provides=("autoconf")
+  conflicts=("autoconf")
+  replaces=("autoconf")
+
+  mkdir -p ${pkgdir}/usr/bin
+  for prog in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames
+  do
+    cp "${srcdir}/${pkgbase}/ac-wrapper.sh" "${pkgdir}/usr/bin/${prog}"
+  done
+}