5 files changed, 35 insertions, 17 deletions
diff --git a/core/archlinux32-keyring-transition/PKGBUILD b/core/archlinux32-keyring-transition/PKGBUILD
index 2a9ed79a..92b7d149 100644
--- a/core/archlinux32-keyring-transition/PKGBUILD
+++ b/core/archlinux32-keyring-transition/PKGBUILD
@@ -9,10 +9,14 @@ url='https://archlinux32.org'
 license=('GPL')
 provides=('archlinux32-keyring')
 install="${pkgname}.install"
-source=("https://git.archlinux32.org/archlinux32/${_pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('c5480421084e8271760feecc418e3c2314b2256f68e00e98c2f73bfd18da96a2d6769fb5457cfce490985807cdca76f018b0b9e48cd64fb7c536642410d808f7')
+source=("https://sources.archlinux32.org/sources/${_pkgname}-v${pkgver}.tar.gz"{,.sig})
+sha512sums=(
+  'a9a7d4030188e851e84f7808fc7f5d817484c4d511cf5b0fe9e19b918d3e9e3d3f490158f931f3f83b04ba0851f9fd0bcc18a902da37a790b8a303aa37fa116d'
+  'SKIP'
+)
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 package() {
-    cd "${srcdir}/${_pkgname}"
+    cd "${srcdir}/${_pkgname}-v${pkgver}"
     make PREFIX=/usr DESTDIR=${pkgdir} install
 }
diff --git a/core/archlinux32-keyring/PKGBUILD b/core/archlinux32-keyring/PKGBUILD
index ee2b2555..d7b1add7 100644
--- a/core/archlinux32-keyring/PKGBUILD
+++ b/core/archlinux32-keyring/PKGBUILD
@@ -9,10 +9,14 @@ license=('GPL')
 install="${pkgname}.install"
 conflicts=('archlinux32-keyring-transition')
 replaces=('archlinux32-keyring-transition')
-source=("${pkgname}-v${pkgver}.tar.gz::https://git.archlinux32.org/archlinux32/${pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('dcd2c0d1e9fd99c8289fba6fe9bee5e7df62984594b52dbeac3d70d048dd1e482930f20414f0c354334641d22ecdb3ea127febcde4b63759170c7271bd562826')
+source=("https://sources.archlinux32.org/sources/${pkgname}-v${pkgver}.tar.gz"{,.sig})
+sha512sums=(
+  '74f92707d259657d21ddd4606c391f7efb358e14851fee980ac95418685b3a6098794400bbf46f681d010463ff186655885de6a9943ed51e1d6e7bbe31191f24'
+  'SKIP'
+)
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 package() {
-    cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${pkgname}-v${pkgver}"
     make PREFIX=/usr DESTDIR=${pkgdir} install
 }
diff --git a/extra/archiso/PKGBUILD b/extra/archiso/PKGBUILD
index 4afe81d6..3ec8b90e 100644
--- a/extra/archiso/PKGBUILD
+++ b/extra/archiso/PKGBUILD
@@ -4,14 +4,17 @@ pkgver=34
 pkgrel=1
 license=('GPL')
 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")
+source=("https://sources.archlinux32.org/sources/${pkgname}32-i686-v${pkgver}.tar.gz"{,.sig})
 unset sha256sums
-sha512sums=('88439b6cbdc24a330a2d95227ce60e8a7f5d50a081ed688ebae1f9292196c9036da8570264100504f6799b90977e43adc840668c3385f14ef93c41cba28b6d33')
-unset validpgpkeys
+sha512sums=(
+  'cf84975a1abb075bee0010c7c27f5099a4bcb4fc47a91b6f365e0ba9236fdcce2a5143c43a64124c51c84dd30f62d1ad9b23f1dd694e2b15944e7edae3862ab3'
+  'SKIP'
+)
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 eval "$(
   declare -f prepare build check package | \
     sed '
-      s/\(\${pkgname}\)-\${pkgver}/\132/
+      s/\(\${pkgname}\)-/\132-i686-v/
     '
 )"
diff --git a/extra/asp/PKGBUILD b/extra/asp/PKGBUILD
index 766e85b2..0b1c044f 100644
--- a/extra/asp/PKGBUILD
+++ b/extra/asp/PKGBUILD
@@ -4,15 +4,18 @@ pkgver=0.0
 pkgrel=1
 url='https://git.archlinux32.org/archlinux32/asp32/'
 license=(MIT)
-source=("$pkgname-$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/${pkgname}32/archive/v$pkgver.tar.gz")
-sha512sums=('82b7129b75fa3c9d7f86f6f0e76b866ee6b0ef7457755830b710eb9149165748562e72e578f1a9c623baacf58671059af7293f7b8657f69cc63fe281ec7ce1a4')
+source=("https://sources.archlinux32.org/sources/${pkgname}32-v$pkgver.tar.gz"{,.sig})
+sha512sums=(
+  'eb51380220e47bfcb735ceae8c072c2a5798ccfb0a5f72a5c1d0788d6379a48b2197108c2ffad68c987c60412978929362969f4f7ea3fbd5916ec7e0f8d93f34'
+  'SKIP'
+)
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 unset sha256sums
-unset validpgpkeys
 
 eval "$(
   declare -f prepare build check package | \
     sed '
-       s/\('"${pkgname}"'\)-\$pkgver/\132/
+       s/\('"${pkgname}"'\)-/\132-v/
     '
 )"
diff --git a/extra/devtools/PKGBUILD b/extra/devtools/PKGBUILD
index afd61731..6d2460fe 100644
--- a/extra/devtools/PKGBUILD
+++ b/extra/devtools/PKGBUILD
@@ -6,14 +6,18 @@ pkgdesc='Tools for Arch Linux 32 package maintainers'
 license=('GPL')
 url='https://git.archlinux32.org/archlinux32/devtools32/'
 source=(
-  "${pkgname}32-v$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/${pkgname}32/archive/v$pkgver.tar.gz"
+  "https://sources.archlinux32.org/sources/${pkgname}32-v${pkgver}.tar.gz"{,.sig}
 )
-sha512sums=('f161b33ccc35da813326c868e0081b9e0ec611783755fbceedb77bf1990c42812c0b9bc678380445adead23ff82e3f742091752c4b5bec264a3fc7b780d28862')
+sha512sums=(
+  'b2d0aecbda25690922a00a154bc6e7c6f89a6ca1bb39b86cab0816e500ca3e2c8e01d8ca8f53ac436b98f7acbfff815fa78639c2c4dc851914cda4ffe1b3325e'
+  'SKIP'
+)
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 unset md5sums
 
 eval "$(
   declare -f prepare build check package | \
     sed '
-      s/\(\${pkgname}\)-\${pkgver}/\132/g
+      s/\(\${pkgname}\)-/\132-v/g
     '
 )"