Merge branch 'master' into 'awilfox/bump/2021-09-system-abipreserve'

# Conflicts:
#   system/curl/APKBUILD

5 files changed, 5 insertions, 62 deletions

diff --git a/experimental/aqbanking/APKBUILD b/experimental/aqbanking/APKBUILD
index 409bc3d42..6a66aa41a 100644
--- a/experimental/aqbanking/APKBUILD
+++ b/experimental/aqbanking/APKBUILD
@@ -11,7 +11,7 @@ depends=""
 depends_dev=""
 makedepends="$depends_dev gmp-dev gwenhywfar-dev xmlsec-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="aqbanking-$pkgver.tar.gz::https://www.aquamaniac.de/sites/download/download.php?package=03&release=217&file=02&dummy=aqbanking-$pkgver.tar.gz"
+source="aqbanking-$pkgver.tar.gz::https://www.aquamaniac.de/rdm/attachments/download/277/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$builddir"
diff --git a/experimental/gwenhywfar/APKBUILD b/experimental/gwenhywfar/APKBUILD
index 3ec3fee13..2b56970e9 100644
--- a/experimental/gwenhywfar/APKBUILD
+++ b/experimental/gwenhywfar/APKBUILD
@@ -12,7 +12,7 @@ depends_dev="qt5-qtbase-dev"
 makedepends="$depends_dev gnutls-dev libgcrypt-dev libgpg-error-dev
 	cmd:which gtk+2.0-dev"
 subpackages="$pkgname-dev $pkgname-gtk2 $pkgname-qt5"
-source="gwenhywfar-$pkgver.tar.gz::https://www.aquamaniac.de/sites/download/download.php?package=01&release=208&file=02&dummy=gwenhywfar-$pkgver.tar.gz"
+source="gwenhywfar-$pkgver.tar.gz::https://www.aquamaniac.de/rdm/attachments/download/304/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$builddir"
diff --git a/experimental/hexchat/APKBUILD b/experimental/hexchat/APKBUILD
deleted file mode 100644
index 29119ddfb..000000000
--- a/experimental/hexchat/APKBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: 
-pkgname=hexchat
-pkgver=2.14.1
-pkgrel=0
-pkgdesc="Popular and easy to use graphical IRC (chat) client"
-url="https://hexchat.github.io"
-arch="all"
-license="GPL-2.0+"
-depends=""
-makedepends="dbus-glib-dev glib-dev gtk+2.0-dev iso-codes-dev libcanberra-dev
-	libnotify-dev libproxy-dev libsexy-dev meson ninja openssl-dev
-	perl-dev pciutils-dev python3-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-perl:_perl
-	$pkgname-py:_python"
-source="https://dl.hexchat.net/hexchat/hexchat-$pkgver.tar.xz"
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	mkdir -p _build
-}
-
-build() {
-	cd "$builddir"/_build
-	meson -Dprefix=/usr -Dwith-lua=false
-	ninja
-}
-
-check() {
-	cd "$builddir"/_build
-	ninja test
-}
-
-package() {
-	cd "$builddir"/_build
-	DESTDIR="$pkgdir" ninja install
-}
-
-_perl() {
-	pkgdesc="Perl plugin for HexChat"
-	depends="$pkgname=$pkgver-r$pkgrel"
-	install_if="$pkgname=$pkgver-r$pkgrel perl"
-	mkdir -p "$subpkgdir"/usr/lib/hexchat/plugins
-	mv "$pkgdir"/usr/lib/hexchat/plugins/perl.so \
-		"$subpkgdir"/usr/lib/hexchat/plugins
-}
-
-_python() {
-	pkgdesc="Python plugin for HexChat"
-	depends="$pkgname=$pkgver-r$pkgrel"
-	install_if="$pkgname=$pkgver-r$pkgrel perl3"
-	mkdir -p "$subpkgdir"/usr/lib/hexchat/plugins
-	mv "$pkgdir"/usr/lib/hexchat/plugins/python.so \
-		"$subpkgdir"/usr/lib/hexchat/plugins
-}
-
-sha512sums="2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd  hexchat-2.14.1.tar.xz"
diff --git a/experimental/zfs-utils/APKBUILD b/experimental/zfs-utils/APKBUILD
index 71213e3d6..b9221e20f 100644
--- a/experimental/zfs-utils/APKBUILD
+++ b/experimental/zfs-utils/APKBUILD
@@ -46,4 +46,4 @@ package() {
 	rm -r "$pkgdir/usr/share/zfs/zfs-tests"
 }
 
-sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 zfs-0.8.3.tar.gz"
+sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010  zfs-0.8.3.tar.gz"
diff --git a/experimental/zfs/APKBUILD b/experimental/zfs/APKBUILD
index db467f0c5..eec9aa6bd 100644
--- a/experimental/zfs/APKBUILD
+++ b/experimental/zfs/APKBUILD
@@ -61,8 +61,8 @@ dev() {
 	rm -r "$pkgdir/usr/src"
 }
 
-sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 zfs-0.8.3.tar.gz
+sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010  zfs-0.8.3.tar.gz
 47dc563fc1daa4c67096d2316ed2cea6aeaf4ca9e0daa41f2036a4ff3dcb542c88534ac25033a23e8fa97a9b82e56a8933f9fa56bae8a1fa07c1b15eb18f68f8  fix-autoconf-redirection-for-dash.patch
 a74bb30ef2e5f28fdc7b0cfe915f2841762ec8f6cd2368d2e4ba8627443e8e0754011a88b743e27519d191464e35e6c923510451f2a86d7e1a4ad3c5b737015f  Linux-5.6-compat-time_t-2c3a83701dd1.patch
 a791406265a6e1501e743b6f13764736439a14a9dfc1feaabc5fc82e27de1b2adf56b566c162fc42313f311fbf76c3213f7c2c05a518de36f96887e3d462e94a  Linux-5.6-compat-timestamp_truncate-795699a6cc28.patch
-9c78793a5840bc5fb5bb44a210124c1c8f09ce0ddfe88b91be8dbde5465763912308b89cd87300fd05b898076366528612c34a9c2f834d3b6573aa68eb442ec3  Linux-5.6-compat-ktime_get_raw_ts64-ff5587d65137.patch"
\ No newline at end of file
+9c78793a5840bc5fb5bb44a210124c1c8f09ce0ddfe88b91be8dbde5465763912308b89cd87300fd05b898076366528612c34a9c2f834d3b6573aa68eb442ec3  Linux-5.6-compat-ktime_get_raw_ts64-ff5587d65137.patch"