rename extra/archiso32 to extra/archiso

3 files changed, 17 insertions, 20 deletions

diff --git a/blacklist b/blacklist
index a848a41e..67cce022 100644
--- a/blacklist
+++ b/blacklist
@@ -1,4 +1,3 @@
-archiso # the official package does not build an iso on i686
 bluegriffon # closed source, doesn't provide a i686 Ubuntu package anymore since version 2.4
 bluegriffon-i18n # see bluegriffon
 ceph # fails fatally in check() - see <a href="https://bugs.archlinux32.org/index.php?do=details&task_id=21">FS32#21</a>
diff --git a/extra/archiso/PKGBUILD b/extra/archiso/PKGBUILD
new file mode 100644
index 00000000..f686b74a
--- /dev/null
+++ b/extra/archiso/PKGBUILD
@@ -0,0 +1,17 @@
+# we override almost everything
+
+pkgver=33
+pkgrel=1
+license=('GPL')
+url='https://github.com/archlinux32/archiso32'
+source=("$pkgname-$pkgver.tar.gz::https://github.com/archlinux32/${pkgname}32/archive/i686-v${pkgver}.tar.gz")
+unset sha256sums
+sha512sums=('7d882d813f952bc4ffa060e3f429e7abf9b5d28db61c18efee605f2819ec1fdf6b7d5fa8a02da61b706195e7769218ea207fb99bf3a97e4f66375d9ada5f36ac')
+unset validpgpkeys
+
+eval "$(
+  declare -f prepare build check package | \
+    sed '
+      s/\(\${pkgname}\)-/\132-i686-v/
+    '
+)"
diff --git a/extra/archiso32/PKGBUILD b/extra/archiso32/PKGBUILD
deleted file mode 100644
index 65bc1ef9..00000000
--- a/extra/archiso32/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Erich Eckner <arch at eckner dot net>
-# Contributor: Gerardo Exequiel Pozzi <djgera@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=archiso32
-pkgver=31
-pkgrel=4
-pkgdesc='Tools for creating Arch Linux live and install iso images - for i686'
-arch=('any')
-license=('GPL')
-url='https://github.com/archlinux32/archiso32'
-depends=('make' 'arch-install-scripts' 'squashfs-tools' 'libisoburn' 'dosfstools' 'lynx')
-conflicts=('archiso' 'archiso-dual')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/archlinux32/${pkgname}/archive/v${pkgver}.tar.gz")
-sha256sums=('ba924d158562bc26d56af9477ea59785ff3517a8643f7b045b140419e137bd35')
-
-package() {
-    make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
-}