3 files changed, 12 insertions, 19 deletions
diff --git a/extra/archiso/PKGBUILD b/extra/archiso/PKGBUILD
index 7ac63aa6..4afe81d6 100644
--- a/extra/archiso/PKGBUILD
+++ b/extra/archiso/PKGBUILD
@@ -3,15 +3,15 @@
 pkgver=34
 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")
+url='https://git.archlinux32.org/archlinux32/archiso32'
+source=("$pkgname-$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/${pkgname}32/archive/i686-v${pkgver}.tar.gz")
 unset sha256sums
-sha512sums=('8337aac52542310b8e1f14e6f5e11e8973b4fd778d51eeb7bb962c7817c9399a0a23097c18f69e5a4a1f242a6daf8fdd7d65c75bfc2e0003ca922e2839f28e14')
+sha512sums=('88439b6cbdc24a330a2d95227ce60e8a7f5d50a081ed688ebae1f9292196c9036da8570264100504f6799b90977e43adc840668c3385f14ef93c41cba28b6d33')
 unset validpgpkeys
 
 eval "$(
   declare -f prepare build check package | \
     sed '
-      s/\(\${pkgname}\)-/\132-i686-v/
+      s/\(\${pkgname}\)-\${pkgver}/\132/
     '
 )"
diff --git a/extra/asp/PKGBUILD b/extra/asp/PKGBUILD
index 494ed142..766e85b2 100644
--- a/extra/asp/PKGBUILD
+++ b/extra/asp/PKGBUILD
@@ -2,10 +2,10 @@
 
 pkgver=0.0
 pkgrel=1
-url='https://github.com/archlinux32/asp32/'
+url='https://git.archlinux32.org/archlinux32/asp32/'
 license=(MIT)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/archlinux32/${pkgname}32/archive/v$pkgver.tar.gz")
-sha512sums=('2521125cc49139700dae77b52ffc0db339ddbf1347d37f49e03b896214a61c624fa70c530d4254b3f26c92b4cd6e3fcea0ebd4cee0d1e14e16a40a9c6a702a67')
+source=("$pkgname-$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/${pkgname}32/archive/v$pkgver.tar.gz")
+sha512sums=('82b7129b75fa3c9d7f86f6f0e76b866ee6b0ef7457755830b710eb9149165748562e72e578f1a9c623baacf58671059af7293f7b8657f69cc63fe281ec7ce1a4')
 
 unset sha256sums
 unset validpgpkeys
@@ -13,6 +13,6 @@ unset validpgpkeys
 eval "$(
   declare -f prepare build check package | \
     sed '
-       s/\${pkgname}\|asp/\032/
+       s/\('"${pkgname}"'\)-\$pkgver/\132/
     '
 )"
diff --git a/extra/devtools/PKGBUILD b/extra/devtools/PKGBUILD
index 3a21a2dd..afd61731 100644
--- a/extra/devtools/PKGBUILD
+++ b/extra/devtools/PKGBUILD
@@ -4,23 +4,16 @@ pkgver=20180531
 pkgrel=1
 pkgdesc='Tools for Arch Linux 32 package maintainers'
 license=('GPL')
-url='https://github.com/archlinux32/devtools32/'
+url='https://git.archlinux32.org/archlinux32/devtools32/'
 source=(
-  "https://github.com/archlinux32/${pkgname}32/releases/download/v$pkgver/${pkgname}32-v$pkgver.tar.xz"{,.sig}
-)
-sha512sums=('75ec36fb351d576ca1bb4db07b61f8b417e68c386220a3e63f13618aa6bae8d0e2b1552a60bad78d7b5872c57ccc66d27a8a29a2a56bdbdcbfdf00277467118e'
-            'SKIP')
-validpgpkeys=(
-  '5FDCA472AB93292BC678FD59255A76DB9A12601A'
-  'DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A'
+  "${pkgname}32-v$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/${pkgname}32/archive/v$pkgver.tar.gz"
 )
+sha512sums=('f161b33ccc35da813326c868e0081b9e0ec611783755fbceedb77bf1990c42812c0b9bc678380445adead23ff82e3f742091752c4b5bec264a3fc7b780d28862')
 unset md5sums
 
 eval "$(
   declare -f prepare build check package | \
     sed '
-      s/\${pkgname}/\032/g
-      s/\${pkgver}/v\0/g
-      /^\s*patch .*add-etc-shadow-entry-for-builduser\.patch$/d
+      s/\(\${pkgname}\)-\${pkgver}/\132/g
     '
 )"