archlinux32: new download locations

5 files changed, 33 insertions, 19 deletions

diff --git a/archiso-dual/PKGBUILD b/archiso-dual/PKGBUILD
index ca5e849a..4a64edbe 100644
--- a/archiso-dual/PKGBUILD
+++ b/archiso-dual/PKGBUILD
@@ -17,12 +17,14 @@ url='https://git.archlinux32.org/archlinux32/archiso32'
 depends=('make' 'arch-install-scripts' 'squashfs-tools' 'libisoburn' 'dosfstools' 'lynx' 'pacman-mirrorlist32' 'archlinux32-keyring')
 conflicts=('archiso' 'archiso32')
 source=(
-  "https://git.archlinux32.org/archlinux32/${pkgname%-dual}32/archive/dual-v${pkgver}.tar.gz"
+  "https://sources.archlinux32.org/sources/archiso32-dual-v${pkgver}.tar.gz"{,.sig}
 )
 sha512sums=(
-  '42524f4c9f3b0d4e9ba3f164016b282b72ee2f9934c14029f448c38fe96779bb821c6152fcbffe3026ee44b9fab582b2b8515e27de89d223ffc52804a3cbd983'
+  'ecda1c901d420aa816aaa570c62a3426a55a811f75afa0656af13be05a9555c164856526fba5cc058461a909b1a9f783bfcf47ee164d4ca882405a8e57a3f05f'
+  'SKIP'
 )
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 package() {
-    make -C "${pkgname/-dual/32}" DESTDIR="${pkgdir}" install
+    make -C "archiso32-dual-v${pkgver}" DESTDIR="${pkgdir}" install
 }
diff --git a/archiso32/PKGBUILD b/archiso32/PKGBUILD
index a688bcef..69bd86ca 100644
--- a/archiso32/PKGBUILD
+++ b/archiso32/PKGBUILD
@@ -17,12 +17,13 @@ url='https://git.archlinux32.org/archlinux32/archiso32'
 depends=('make' 'arch-install-scripts' 'squashfs-tools' 'libisoburn' 'dosfstools' 'lynx' 'pacman-mirrorlist32' 'archlinux32-keyring')
 conflicts=('archiso' 'archiso-dual')
 source=(
-  "https://git.archlinux32.org/archlinux32/${pkgname}/archive/${_target_arch}-v${pkgver}.tar.gz"
+  "https://sources.archlinux32.org/sources/${pkgname}-${_target_arch}-v${pkgver}.tar.gz"{,.sig}
 )
 sha512sums=(
-  '88439b6cbdc24a330a2d95227ce60e8a7f5d50a081ed688ebae1f9292196c9036da8570264100504f6799b90977e43adc840668c3385f14ef93c41cba28b6d33'
-)
+  'cf84975a1abb075bee0010c7c27f5099a4bcb4fc47a91b6f365e0ba9236fdcce2a5143c43a64124c51c84dd30f62d1ad9b23f1dd694e2b15944e7edae3862ab3'
+  'SKIP')
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 package() {
-  make -C "${srcdir}/${pkgname}" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgname}-${_target_arch}-v${pkgver}" DESTDIR="${pkgdir}" install
 }
diff --git a/archlinux32-keyring/PKGBUILD b/archlinux32-keyring/PKGBUILD
index 8040cb71..f1c42fee 100644
--- a/archlinux32-keyring/PKGBUILD
+++ b/archlinux32-keyring/PKGBUILD
@@ -12,10 +12,13 @@ license=('GPL')
 install="${pkgname}.install"
 conflicts=('archlinux32-keyring-transition')
 replaces=('archlinux32-keyring-transition')
-source=("${pkgname}-${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/asp32/PKGBUILD b/asp32/PKGBUILD
index efc1a16f..e18aa9d4 100644
--- a/asp32/PKGBUILD
+++ b/asp32/PKGBUILD
@@ -13,14 +13,18 @@ license=(MIT)
 depends=(awk bash jq git libarchive)
 makedepends=(asciidoc)
 conflicts=('asp')
-source=("$pkgname-$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/$pkgname/archive/v$pkgver.tar.gz")
-sha512sums=('82b7129b75fa3c9d7f86f6f0e76b866ee6b0ef7457755830b710eb9149165748562e72e578f1a9c623baacf58671059af7293f7b8657f69cc63fe281ec7ce1a4')
+source=("https://sources.archlinux32.org/sources/${pkgname}-v${pkgver}.tar.gz"{,.sig})
+sha512sums=(
+  'eb51380220e47bfcb735ceae8c072c2a5798ccfb0a5f72a5c1d0788d6379a48b2197108c2ffad68c987c60412978929362969f4f7ea3fbd5916ec7e0f8d93f34'
+  'SKIP'
+)
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 build() {
-  make -C $pkgname
+  make -C "${pkgname}-v${pkgver}"
 }
 
 package() {
-  make -C $pkgname PREFIX=/usr DESTDIR="$pkgdir" install
-  install -Dm644 $pkgname/LICENSE "$pkgdir/usr/share/licenses/asp/LICENSE"
+  make -C "${pkgname}-v${pkgver}" PREFIX=/usr DESTDIR="$pkgdir" install
+  install -Dm644 "${pkgname}-v${pkgver}/LICENSE" "$pkgdir/usr/share/licenses/asp/LICENSE"
 }
diff --git a/devtools32/PKGBUILD b/devtools32/PKGBUILD
index bb7f6817..941e2108 100644
--- a/devtools32/PKGBUILD
+++ b/devtools32/PKGBUILD
@@ -15,17 +15,21 @@ depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts'
 	'pacman-mirrorlist32' 'archlinux32-keyring' 'git' 'mercurial' 'bzr')
 conflicts=('devtools')
 source=(
-  "$pkgname-$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/$pkgname/archive/v$pkgver.tar.gz"
+  "https://sources.archlinux32.org/sources/${pkgname}-v${pkgver}.tar.gz"{,.sig}
 )
-sha512sums=('f161b33ccc35da813326c868e0081b9e0ec611783755fbceedb77bf1990c42812c0b9bc678380445adead23ff82e3f742091752c4b5bec264a3fc7b780d28862')
+sha512sums=(
+  'b2d0aecbda25690922a00a154bc6e7c6f89a6ca1bb39b86cab0816e500ca3e2c8e01d8ca8f53ac436b98f7acbfff815fa78639c2c4dc851914cda4ffe1b3325e'
+  'SKIP'
+)
+validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
 
 build() {
-	cd "${pkgname}"
+	cd "${pkgname}-v${pkgver}"
 	make PREFIX=/usr
 }
 
 package() {
-	cd "${pkgname}"
+	cd "${pkgname}-v${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }