github.com -> git.archlinux32.org

5 files changed, 17 insertions, 38 deletions

diff --git a/archiso-dual/PKGBUILD b/archiso-dual/PKGBUILD
index 1b7668ba..ca5e849a 100644
--- a/archiso-dual/PKGBUILD
+++ b/archiso-dual/PKGBUILD
@@ -13,21 +13,16 @@ pkgrel=1
 pkgdesc='Tools for creating Arch Linux live and install iso images - for '"${_target_arch}"
 arch=('any')
 license=('GPL')
-url='https://github.com/archlinux32/archiso32'
+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://github.com/archlinux32/${pkgname%-dual}32/releases/download/dual-v${pkgver}/${pkgname%-dual}32-dual-v${pkgver}.tar.xz"{,.sig}
+  "https://git.archlinux32.org/archlinux32/${pkgname%-dual}32/archive/dual-v${pkgver}.tar.gz"
 )
 sha512sums=(
-  '92dea5d445c536e9bb0eecdc2f3f7af2b76c1ddf185542d5c0853103c77643566cca2ae11f6eb5d2f482263630c5bb0b9d2f0f2384a3710729e45fd0fd96cf56'
-  'SKIP'
-)
-validpgpkeys=(
-  '5FDCA472AB93292BC678FD59255A76DB9A12601A'
-  'DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A'
+  '42524f4c9f3b0d4e9ba3f164016b282b72ee2f9934c14029f448c38fe96779bb821c6152fcbffe3026ee44b9fab582b2b8515e27de89d223ffc52804a3cbd983'
 )
 
 package() {
-    make -C "${pkgname/-/32-}-v${pkgver}" DESTDIR="${pkgdir}" install
+    make -C "${pkgname/-dual/32}" DESTDIR="${pkgdir}" install
 }
diff --git a/archiso32/PKGBUILD b/archiso32/PKGBUILD
index 0748722a..a688bcef 100644
--- a/archiso32/PKGBUILD
+++ b/archiso32/PKGBUILD
@@ -13,22 +13,16 @@ pkgrel=1
 pkgdesc='Tools for creating Arch Linux live and install iso images - for '"${_target_arch}"
 arch=('any')
 license=('GPL')
-url='https://github.com/archlinux32/archiso32'
+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://github.com/archlinux32/${pkgname}/releases/download/${_target_arch}-v${pkgver}/${pkgname}-${_target_arch}-v${pkgver}.tar.xz"{,.sig}
+  "https://git.archlinux32.org/archlinux32/${pkgname}/archive/${_target_arch}-v${pkgver}.tar.gz"
 )
 sha512sums=(
-  '1f6488d08875451e39c3f45f00ac3427018dcf6791bb5f7389fced560efb0eb2d196181a02f748424d713a37b295405d263aacfa4abb4249231b3764a4615e65'
-  'SKIP'
-)
-validpgpkeys=(
-  '5FDCA472AB93292BC678FD59255A76DB9A12601A'
-  'DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A'
+  '88439b6cbdc24a330a2d95227ce60e8a7f5d50a081ed688ebae1f9292196c9036da8570264100504f6799b90977e43adc840668c3385f14ef93c41cba28b6d33'
 )
 
 package() {
-  ls -lA
-  make -C "${srcdir}/${pkgname}-${_target_arch}-v${pkgver}" DESTDIR="${pkgdir}" install
+  make -C "${srcdir}/${pkgname}" DESTDIR="${pkgdir}" install
 }
diff --git a/archlinux32-keyring/PKGBUILD b/archlinux32-keyring/PKGBUILD
index 28804340..8040cb71 100644
--- a/archlinux32-keyring/PKGBUILD
+++ b/archlinux32-keyring/PKGBUILD
@@ -12,15 +12,10 @@ license=('GPL')
 install="${pkgname}.install"
 conflicts=('archlinux32-keyring-transition')
 replaces=('archlinux32-keyring-transition')
-source=("https://github.com/archlinux32/${pkgname}/releases/download/v${pkgver}/${pkgname}-v${pkgver}.tar.xz"{,.sig})
-sha512sums=('486af8dc512cf1c53cf9a5e43d40982cc82e3b795a9a41f15770be7dc7366db944cb981fb374aa7b484c797142fd75aaf21222d5f6088e64d54d0a7ebab1eecc'
-            'SKIP')
-validpgpkeys=(
-  '5FDCA472AB93292BC678FD59255A76DB9A12601A'
-  'DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A'
-)
+source=("${pkgname}-${pkgver}.tar.gz::https://git.archlinux32.org/archlinux32/${pkgname}/archive/v${pkgver}.tar.gz")
+sha512sums=('dcd2c0d1e9fd99c8289fba6fe9bee5e7df62984594b52dbeac3d70d048dd1e482930f20414f0c354334641d22ecdb3ea127febcde4b63759170c7271bd562826')
 
 package() {
-    cd "${srcdir}/${pkgname}-v${pkgver}"
+    cd "${srcdir}/${pkgname}"
     make PREFIX=/usr DESTDIR=${pkgdir} install
 }
diff --git a/devtools32/PKGBUILD b/devtools32/PKGBUILD
index 2fffe262..bb7f6817 100644
--- a/devtools32/PKGBUILD
+++ b/devtools32/PKGBUILD
@@ -10,27 +10,22 @@ pkgrel=1
 pkgdesc='Tools for Arch Linux package maintainers, also for 32 bit'
 arch=('any')
 license=('GPL')
-url='https://github.com/archlinux32/devtools32/'
+url='https://git.archlinux32.org/archlinux32/devtools32/'
 depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts'
 	'pacman-mirrorlist32' 'archlinux32-keyring' 'git' 'mercurial' 'bzr')
 conflicts=('devtools')
 source=(
-  "https://github.com/archlinux32/$pkgname/releases/download/v$pkgver/$pkgname-v$pkgver.tar.xz"{,.sig}
-)
-sha512sums=('75ec36fb351d576ca1bb4db07b61f8b417e68c386220a3e63f13618aa6bae8d0e2b1552a60bad78d7b5872c57ccc66d27a8a29a2a56bdbdcbfdf00277467118e'
-            'SKIP')
-validpgpkeys=(
-  '5FDCA472AB93292BC678FD59255A76DB9A12601A'
-  'DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A'
+  "$pkgname-$pkgver.tar.gz::https://git.archlinux32.org/archlinux32/$pkgname/archive/v$pkgver.tar.gz"
 )
+sha512sums=('f161b33ccc35da813326c868e0081b9e0ec611783755fbceedb77bf1990c42812c0b9bc678380445adead23ff82e3f742091752c4b5bec264a3fc7b780d28862')
 
 build() {
-	cd "${pkgname}-v${pkgver}"
+	cd "${pkgname}"
 	make PREFIX=/usr
 }
 
 package() {
-	cd "${pkgname}-v${pkgver}"
+	cd "${pkgname}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
 
diff --git a/pacman-mirrorlist32/PKGBUILD b/pacman-mirrorlist32/PKGBUILD
index 53e1ae6a..93b5f1ce 100644
--- a/pacman-mirrorlist32/PKGBUILD
+++ b/pacman-mirrorlist32/PKGBUILD
@@ -10,7 +10,7 @@ arch=('any')
 url="https://www.archlinux32.org/"
 license=('GPL')
 backup=(etc/pacman.d/mirrorlist32)
-source=(archlinux32-packages::git+https://github.com/archlinux32/packages.git)
+source=(archlinux32-packages::git+https://git.archlinux32.org/archlinux32/packages.git)
 sha512sums=('SKIP')
 
 pkgver() {