Update URL for some packagesHEADmaster

Signed-off-by: Mattias Andrée <m@maandree.se>

6 files changed, 48 insertions, 51 deletions

diff --git a/file2key-libpassphrase/PKGBUILD b/file2key-libpassphrase/PKGBUILD
index dc2691b..8ad79f5 100644
--- a/file2key-libpassphrase/PKGBUILD
+++ b/file2key-libpassphrase/PKGBUILD
@@ -2,30 +2,30 @@
 
 pkgname=file2key-libpassphrase
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple command that generates a key from a file and a passphrase, libpassphrase version"
 arch=(i686 x86_64)
-url="https://github.com/maandree/file2key"
+url="https://codeberg.org/maandree/file2key"
 license=('custom:ISC')
 conflicts=(file2key)
 provides=(file2key)
-depends=(glibc libkeccak libpassphrase)
-makedepends=(make coreutils gcc glibc libkeccak libpassphrase)
+depends=(libkeccak libpassphrase)
+makedepends=(libkeccak libpassphrase)
 source=(file2key-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
-sha256sums=(26e7eb716b46df4dabedbeecc596c0ae8ecc351be3ed6f1e13883e1c0bfe14e6)
+sha256sums=(4b3d9ea6b35eab38a76dac7f3560abe95ae271045104d2b96f568931b2b0a8aa)
 
 prepare() {
-  cd "${srcdir}/file2key-${pkgver}"
+  cd "${srcdir}/file2key"
   sed '/CPPFLAGS/s/$/ -DWITH_LIBPASSPHRASE/' < config.mk > config.mk.tmp
   sed '/LDFLAGS/s/$/ -lpassphrase/' < config.mk.tmp > config.mk
 }
 
 build() {
-  cd "$srcdir/file2key-$pkgver"
+  cd "$srcdir/file2key"
   make PREFIX=/usr
 }
 
 package() {
-  cd "$srcdir/file2key-$pkgver"
+  cd "$srcdir/file2key"
   make PREFIX=/usr DESTDIR="$pkgdir" install
 }
diff --git a/file2key/PKGBUILD b/file2key/PKGBUILD
index ae6657f..13790ca 100644
--- a/file2key/PKGBUILD
+++ b/file2key/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=file2key
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple command that generates a key from a file and a passphrase"
 arch=(i686 x86_64)
 url="https://codeberg.org/maandree/file2key"
 license=('custom:ISC')
-depends=(glibc libkeccak)
-makedepends=(make coreutils gcc glibc libkeccak)
+depends=(libkeccak)
+makedepends=(libkeccak)
 source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
 sha256sums=(4b3d9ea6b35eab38a76dac7f3560abe95ae271045104d2b96f568931b2b0a8aa)
 
diff --git a/libar2/PKGBUILD b/libar2/PKGBUILD
index 943a1c6..e49fd53 100644
--- a/libar2/PKGBUILD
+++ b/libar2/PKGBUILD
@@ -3,32 +3,32 @@
 pkgbase=libar2
 pkgname=($pkgbase $pkgbase-doc $pkgbase-musl)
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 _pkgdesc="Library for the Argon2-family of hashing functions"
 pkgdesc="${_pkgdesc}"
 arch=(i686 x86_64)
-url="https://github.com/maandree/libar2"
+url="https://codeberg.org/maandree/libar2"
 license=('custom:ISC')
 depends=()
 checkdepends=(glibc musl 'libblake>=3.0' 'libblake-musl>=3.0')
 _compiler=gcc
 makedepends=(glibc musl 'libblake>=3.0' 'libblake-musl>=3.0' ${_compiler})
 source=($pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
-sha256sums=(deb182d62a2e77b387db20145ab7337cfc4132d5f80dac98ffa120a557ab481e)
+sha256sums=(edb6cbce2ec35454b43658a33bbe256e9a46bad5c425f522de56042c1b67f9f5)
 
 build() {
   cd -- "$srcdir"
-  cp -r -- "$pkgbase-$pkgver" "$pkgbase-$pkgver-musl"
-  cd -- "$pkgbase-$pkgver"
+  cp -r -- "$pkgbase" "$pkgbase-musl"
+  cd -- "$pkgbase"
   make PREFIX=/usr
-  cd -- "../$pkgbase-$pkgver-musl"
+  cd -- "../$pkgbase-musl"
   make PREFIX=/usr/lib/musl CC="musl-${_compiler} -std=c11"
 }
 
 check() {
-  cd -- "$srcdir/$pkgbase-$pkgver"
+  cd -- "$srcdir/$pkgbase"
   make check
-  cd -- "../$pkgbase-$pkgver-musl"
+  cd -- "../$pkgbase-musl"
   make CC="musl-${_compiler} -std=c11" check
 }
 
@@ -36,7 +36,7 @@ package_libar2() {
   pkgdesc="${_pkgdesc}"
   depends=(glibc 'libblake>=3.0')
 
-  cd -- "$srcdir/$pkgbase-$pkgver"
+  cd -- "$srcdir/$pkgbase"
   make PREFIX=/usr DESTDIR="$pkgdir" install
   rm -r -- "${pkgdir}/usr/share"
 }
@@ -44,7 +44,7 @@ package_libar2() {
 package_libar2-doc() {
   pkgdesc="${_pkgdesc} (documentation)"
 
-  cd -- "$srcdir/$pkgbase-$pkgver"
+  cd -- "$srcdir/$pkgbase"
   make PREFIX=/usr DESTDIR="$pkgdir" install
   rm -r -- "${pkgdir}/usr/lib"
   rm -r -- "${pkgdir}/usr/include"
@@ -54,7 +54,7 @@ package_libar2-musl() {
   pkgdesc="${_pkgdesc} (musl version)"
   depends=(musl 'libblake-musl>=3.0')
 
-  cd -- "$srcdir/$pkgbase-$pkgver-musl"
+  cd -- "$srcdir/$pkgbase-musl"
   make PREFIX=/usr/lib/musl DESTDIR="$pkgdir" install
   rm -r -- "${pkgdir}/usr/lib/musl/share"
 }
diff --git a/libblake/PKGBUILD b/libblake/PKGBUILD
index 950e3ff..bfead0f 100644
--- a/libblake/PKGBUILD
+++ b/libblake/PKGBUILD
@@ -3,32 +3,32 @@
 pkgbase=libblake
 pkgname=($pkgbase $pkgbase-musl)
 pkgver=3.0
-pkgrel=1
+pkgrel=2
 _pkgdesc="Library for the BLAKE-family of hashing functions"
 pkgdesc="${_pkgdesc}"
 arch=(i686 x86_64)
-url="https://github.com/maandree/libblake"
+url="https://codeberg.org/maandree/libblake"
 license=('custom:ISC')
 depends=()
 checkdepends=(glibc musl)
 _compiler=gcc
 makedepends=(glibc musl ${_compiler})
 source=($pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
-sha256sums=(1b2a07aa398375eb5505e156577ab8df920ded99fb4a99fbae8559207e189f03)
+sha256sums=(b6c185f43dbbc58687c5f71ea356c6618fe0643e48cdc62d4d530339918a2114)
 
 build() {
   cd -- "$srcdir"
-  cp -r -- "$pkgbase-$pkgver" "$pkgbase-$pkgver-musl"
-  cd -- "$pkgbase-$pkgver"
+  cp -r -- "$pkgbase" "$pkgbase-musl"
+  cd -- "$pkgbase"
   make PREFIX=/usr
-  cd -- "../$pkgbase-$pkgver-musl"
+  cd -- "../$pkgbase-musl"
   make PREFIX=/usr/lib/musl CC="musl-${_compiler} -std=c11"
 }
 
 check() {
-  cd -- "$srcdir/$pkgbase-$pkgver"
+  cd -- "$srcdir/$pkgbase"
   make check
-  cd -- "../$pkgbase-$pkgver-musl"
+  cd -- "../$pkgbase-musl"
   make CC="musl-${_compiler} -std=c11" check
 }
 
@@ -36,7 +36,7 @@ package_libblake() {
   pkgdesc="${_pkgdesc}"
   depends=(glibc)
 
-  cd -- "$srcdir/$pkgbase-$pkgver"
+  cd -- "$srcdir/$pkgbase"
   make PREFIX=/usr DESTDIR="$pkgdir" install
 }
 
@@ -44,6 +44,6 @@ package_libblake-musl() {
   pkgdesc="${_pkgdesc} (musl version)"
   depends=(musl)
 
-  cd -- "$srcdir/$pkgbase-$pkgver-musl"
+  cd -- "$srcdir/$pkgbase-musl"
   make PREFIX=/usr/lib/musl DESTDIR="$pkgdir" install
 }
diff --git a/libcolour/PKGBUILD b/libcolour/PKGBUILD
index 0fe8fd8..bffeb59 100644
--- a/libcolour/PKGBUILD
+++ b/libcolour/PKGBUILD
@@ -2,25 +2,22 @@
 
 pkgname=libcolour
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A C colour space library"
 arch=(i686 x86_64)
-url="https://github.com/maandree/libcolour"
-license=('ISC')
-depends=(glibc)
-makedepends=(glibc make coreutils gcc sed python)
-source=($url/archive/$pkgver.tar.gz)
-sha256sums=(f207e89386db4056cf3cb7f3335adea59b433ae2b78f11dc2b4c79bdae6bb9d0)
-
+url="https://codeberg.org/maandree/libcolour"
+license=('custom:ISC')
+depends=()
+makedepends=(sed python)
+source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
+sha256sums=(6ed03efc496d475cfcd7619bb646ebec2f54cd0bf5e6305a53db99887e6b4de8)
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   make PREFIX=/usr
 }
 
-
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make install PREFIX=/usr DESTDIR="$pkgdir"
+  cd "$srcdir/$pkgname"
+  make PREFIX=/usr DESTDIR="$pkgdir" install
 }
-
diff --git a/read-quickly/PKGBUILD b/read-quickly/PKGBUILD
index 2df1326..2a1cfec 100644
--- a/read-quickly/PKGBUILD
+++ b/read-quickly/PKGBUILD
@@ -2,23 +2,23 @@
 
 pkgname=read-quickly
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Read plain-text files in blazing speed'
 arch=('i686' 'x86_64')
-url='https://github.com/maandree/read-quickly'
+url='https://codeberg.org/maandree/read-quickly'
 license=('custom:ISC')
 depends=()
 makedepends=()
-source=(https://github.com/maandree/read-quickly/archive/$pkgver.tar.gz)
-sha256sums=(1f7b755a61c19c995aa973ed22b5e662178c4e66252bd4a8345c968d4f45d699)
+source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
+sha256sums=(94fa8a112ecb56f3a041bea6ddb145878a35dd0ae24446a3d93b72d65ca97762)
 
 
 build() {
-  cd "$srcdir/read-quickly-$pkgver"
+  cd "$srcdir/$pkgname"
   make
 }
 
 package() {
-  cd "$srcdir/read-quickly-$pkgver"
+  cd "$srcdir/$pkgname"
   make DESTDIR="$pkgdir" install
 }